From 07f11d3e0c46739bea93415fcd1439be35a6a266 Mon Sep 17 00:00:00 2001
From: bnewbold <bnewbold@robocracy.org>
Date: Tue, 14 Jan 2025 22:21:09 -0800
Subject: [PATCH 001/101] lexicon schema for lexicon schema records (meta)
 (#3286)

* lexicon schema for lexicon schema records (meta)

* defs are object/unknown, not array

* simplify just to 'lexicon' field

* codegen lexicon schema
---
 lexicons/com/atproto/lexicon/schema.json      | 21 +++++
 packages/api/src/client/index.ts              | 79 +++++++++++++++++++
 packages/api/src/client/lexicons.ts           | 24 ++++++
 .../types/com/atproto/lexicon/schema.ts       | 26 ++++++
 packages/bsky/src/lexicon/index.ts            | 10 +++
 packages/bsky/src/lexicon/lexicons.ts         | 24 ++++++
 .../types/com/atproto/lexicon/schema.ts       | 26 ++++++
 packages/ozone/src/lexicon/index.ts           | 10 +++
 packages/ozone/src/lexicon/lexicons.ts        | 24 ++++++
 .../types/com/atproto/lexicon/schema.ts       | 26 ++++++
 packages/pds/src/lexicon/index.ts             | 10 +++
 packages/pds/src/lexicon/lexicons.ts          | 24 ++++++
 .../types/com/atproto/lexicon/schema.ts       | 26 ++++++
 13 files changed, 330 insertions(+)
 create mode 100644 lexicons/com/atproto/lexicon/schema.json
 create mode 100644 packages/api/src/client/types/com/atproto/lexicon/schema.ts
 create mode 100644 packages/bsky/src/lexicon/types/com/atproto/lexicon/schema.ts
 create mode 100644 packages/ozone/src/lexicon/types/com/atproto/lexicon/schema.ts
 create mode 100644 packages/pds/src/lexicon/types/com/atproto/lexicon/schema.ts

diff --git a/lexicons/com/atproto/lexicon/schema.json b/lexicons/com/atproto/lexicon/schema.json
new file mode 100644
index 00000000000..e79337ba6dc
--- /dev/null
+++ b/lexicons/com/atproto/lexicon/schema.json
@@ -0,0 +1,21 @@
+{
+  "lexicon": 1,
+  "id": "com.atproto.lexicon.schema",
+  "defs": {
+    "main": {
+      "type": "record",
+      "description": "Representation of Lexicon schemas themselves, when published as atproto records. Note that the schema language is not defined in Lexicon; this meta schema currently only includes a single version field ('lexicon'). See the atproto specifications for description of the other expected top-level fields ('id', 'defs', etc).",
+      "key": "nsid",
+      "record": {
+        "type": "object",
+        "required": ["lexicon"],
+        "properties": {
+          "lexicon": {
+            "type": "integer",
+            "description": "Indicates the 'version' of the Lexicon language. Must be '1' for the current atproto/Lexicon schema system."
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/packages/api/src/client/index.ts b/packages/api/src/client/index.ts
index f9cd36fafae..fcced108ca1 100644
--- a/packages/api/src/client/index.ts
+++ b/packages/api/src/client/index.ts
@@ -28,6 +28,7 @@ import * as ComAtprotoIdentityUpdateHandle from './types/com/atproto/identity/up
 import * as ComAtprotoLabelDefs from './types/com/atproto/label/defs'
 import * as ComAtprotoLabelQueryLabels from './types/com/atproto/label/queryLabels'
 import * as ComAtprotoLabelSubscribeLabels from './types/com/atproto/label/subscribeLabels'
+import * as ComAtprotoLexiconSchema from './types/com/atproto/lexicon/schema'
 import * as ComAtprotoModerationCreateReport from './types/com/atproto/moderation/createReport'
 import * as ComAtprotoModerationDefs from './types/com/atproto/moderation/defs'
 import * as ComAtprotoRepoApplyWrites from './types/com/atproto/repo/applyWrites'
@@ -256,6 +257,7 @@ export * as ComAtprotoIdentityUpdateHandle from './types/com/atproto/identity/up
 export * as ComAtprotoLabelDefs from './types/com/atproto/label/defs'
 export * as ComAtprotoLabelQueryLabels from './types/com/atproto/label/queryLabels'
 export * as ComAtprotoLabelSubscribeLabels from './types/com/atproto/label/subscribeLabels'
+export * as ComAtprotoLexiconSchema from './types/com/atproto/lexicon/schema'
 export * as ComAtprotoModerationCreateReport from './types/com/atproto/moderation/createReport'
 export * as ComAtprotoModerationDefs from './types/com/atproto/moderation/defs'
 export * as ComAtprotoRepoApplyWrites from './types/com/atproto/repo/applyWrites'
@@ -535,6 +537,7 @@ export class ComAtprotoNS {
   admin: ComAtprotoAdminNS
   identity: ComAtprotoIdentityNS
   label: ComAtprotoLabelNS
+  lexicon: ComAtprotoLexiconNS
   moderation: ComAtprotoModerationNS
   repo: ComAtprotoRepoNS
   server: ComAtprotoServerNS
@@ -546,6 +549,7 @@ export class ComAtprotoNS {
     this.admin = new ComAtprotoAdminNS(client)
     this.identity = new ComAtprotoIdentityNS(client)
     this.label = new ComAtprotoLabelNS(client)
+    this.lexicon = new ComAtprotoLexiconNS(client)
     this.moderation = new ComAtprotoModerationNS(client)
     this.repo = new ComAtprotoRepoNS(client)
     this.server = new ComAtprotoServerNS(client)
@@ -830,6 +834,81 @@ export class ComAtprotoLabelNS {
   }
 }
 
+export class ComAtprotoLexiconNS {
+  _client: XrpcClient
+  schema: SchemaRecord
+
+  constructor(client: XrpcClient) {
+    this._client = client
+    this.schema = new SchemaRecord(client)
+  }
+}
+
+export class SchemaRecord {
+  _client: XrpcClient
+
+  constructor(client: XrpcClient) {
+    this._client = client
+  }
+
+  async list(
+    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+  ): Promise<{
+    cursor?: string
+    records: { uri: string; value: ComAtprotoLexiconSchema.Record }[]
+  }> {
+    const res = await this._client.call('com.atproto.repo.listRecords', {
+      collection: 'com.atproto.lexicon.schema',
+      ...params,
+    })
+    return res.data
+  }
+
+  async get(
+    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+  ): Promise<{
+    uri: string
+    cid: string
+    value: ComAtprotoLexiconSchema.Record
+  }> {
+    const res = await this._client.call('com.atproto.repo.getRecord', {
+      collection: 'com.atproto.lexicon.schema',
+      ...params,
+    })
+    return res.data
+  }
+
+  async create(
+    params: Omit<
+      ComAtprotoRepoCreateRecord.InputSchema,
+      'collection' | 'record'
+    >,
+    record: ComAtprotoLexiconSchema.Record,
+    headers?: Record<string, string>,
+  ): Promise<{ uri: string; cid: string }> {
+    record.$type = 'com.atproto.lexicon.schema'
+    const res = await this._client.call(
+      'com.atproto.repo.createRecord',
+      undefined,
+      { collection: 'com.atproto.lexicon.schema', ...params, record },
+      { encoding: 'application/json', headers },
+    )
+    return res.data
+  }
+
+  async delete(
+    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    headers?: Record<string, string>,
+  ): Promise<void> {
+    await this._client.call(
+      'com.atproto.repo.deleteRecord',
+      undefined,
+      { collection: 'com.atproto.lexicon.schema', ...params },
+      { headers },
+    )
+  }
+}
+
 export class ComAtprotoModerationNS {
   _client: XrpcClient
 
diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
index ececcfe4481..260fce3a522 100644
--- a/packages/api/src/client/lexicons.ts
+++ b/packages/api/src/client/lexicons.ts
@@ -1122,6 +1122,29 @@ export const schemaDict = {
       },
     },
   },
+  ComAtprotoLexiconSchema: {
+    lexicon: 1,
+    id: 'com.atproto.lexicon.schema',
+    defs: {
+      main: {
+        type: 'record',
+        description:
+          "Representation of Lexicon schemas themselves, when published as atproto records. Note that the schema language is not defined in Lexicon; this meta schema currently only includes a single version field ('lexicon'). See the atproto specifications for description of the other expected top-level fields ('id', 'defs', etc).",
+        key: 'nsid',
+        record: {
+          type: 'object',
+          required: ['lexicon'],
+          properties: {
+            lexicon: {
+              type: 'integer',
+              description:
+                "Indicates the 'version' of the Lexicon language. Must be '1' for the current atproto/Lexicon schema system.",
+            },
+          },
+        },
+      },
+    },
+  },
   ComAtprotoModerationCreateReport: {
     lexicon: 1,
     id: 'com.atproto.moderation.createReport',
@@ -13644,6 +13667,7 @@ export const ids = {
   ComAtprotoLabelDefs: 'com.atproto.label.defs',
   ComAtprotoLabelQueryLabels: 'com.atproto.label.queryLabels',
   ComAtprotoLabelSubscribeLabels: 'com.atproto.label.subscribeLabels',
+  ComAtprotoLexiconSchema: 'com.atproto.lexicon.schema',
   ComAtprotoModerationCreateReport: 'com.atproto.moderation.createReport',
   ComAtprotoModerationDefs: 'com.atproto.moderation.defs',
   ComAtprotoRepoApplyWrites: 'com.atproto.repo.applyWrites',
diff --git a/packages/api/src/client/types/com/atproto/lexicon/schema.ts b/packages/api/src/client/types/com/atproto/lexicon/schema.ts
new file mode 100644
index 00000000000..f2755960224
--- /dev/null
+++ b/packages/api/src/client/types/com/atproto/lexicon/schema.ts
@@ -0,0 +1,26 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { isObj, hasProp } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+import { CID } from 'multiformats/cid'
+
+export interface Record {
+  /** Indicates the 'version' of the Lexicon language. Must be '1' for the current atproto/Lexicon schema system. */
+  lexicon: number
+  [k: string]: unknown
+}
+
+export function isRecord(v: unknown): v is Record {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    (v.$type === 'com.atproto.lexicon.schema#main' ||
+      v.$type === 'com.atproto.lexicon.schema')
+  )
+}
+
+export function validateRecord(v: unknown): ValidationResult {
+  return lexicons.validate('com.atproto.lexicon.schema#main', v)
+}
diff --git a/packages/bsky/src/lexicon/index.ts b/packages/bsky/src/lexicon/index.ts
index 63c34ee6e8c..89ee5f3b2fa 100644
--- a/packages/bsky/src/lexicon/index.ts
+++ b/packages/bsky/src/lexicon/index.ts
@@ -227,6 +227,7 @@ export class ComAtprotoNS {
   admin: ComAtprotoAdminNS
   identity: ComAtprotoIdentityNS
   label: ComAtprotoLabelNS
+  lexicon: ComAtprotoLexiconNS
   moderation: ComAtprotoModerationNS
   repo: ComAtprotoRepoNS
   server: ComAtprotoServerNS
@@ -238,6 +239,7 @@ export class ComAtprotoNS {
     this.admin = new ComAtprotoAdminNS(server)
     this.identity = new ComAtprotoIdentityNS(server)
     this.label = new ComAtprotoLabelNS(server)
+    this.lexicon = new ComAtprotoLexiconNS(server)
     this.moderation = new ComAtprotoModerationNS(server)
     this.repo = new ComAtprotoRepoNS(server)
     this.server = new ComAtprotoServerNS(server)
@@ -516,6 +518,14 @@ export class ComAtprotoLabelNS {
   }
 }
 
+export class ComAtprotoLexiconNS {
+  _server: Server
+
+  constructor(server: Server) {
+    this._server = server
+  }
+}
+
 export class ComAtprotoModerationNS {
   _server: Server
 
diff --git a/packages/bsky/src/lexicon/lexicons.ts b/packages/bsky/src/lexicon/lexicons.ts
index 28191074e8c..66b737dc760 100644
--- a/packages/bsky/src/lexicon/lexicons.ts
+++ b/packages/bsky/src/lexicon/lexicons.ts
@@ -1122,6 +1122,29 @@ export const schemaDict = {
       },
     },
   },
+  ComAtprotoLexiconSchema: {
+    lexicon: 1,
+    id: 'com.atproto.lexicon.schema',
+    defs: {
+      main: {
+        type: 'record',
+        description:
+          "Representation of Lexicon schemas themselves, when published as atproto records. Note that the schema language is not defined in Lexicon; this meta schema currently only includes a single version field ('lexicon'). See the atproto specifications for description of the other expected top-level fields ('id', 'defs', etc).",
+        key: 'nsid',
+        record: {
+          type: 'object',
+          required: ['lexicon'],
+          properties: {
+            lexicon: {
+              type: 'integer',
+              description:
+                "Indicates the 'version' of the Lexicon language. Must be '1' for the current atproto/Lexicon schema system.",
+            },
+          },
+        },
+      },
+    },
+  },
   ComAtprotoModerationCreateReport: {
     lexicon: 1,
     id: 'com.atproto.moderation.createReport',
@@ -10844,6 +10867,7 @@ export const ids = {
   ComAtprotoLabelDefs: 'com.atproto.label.defs',
   ComAtprotoLabelQueryLabels: 'com.atproto.label.queryLabels',
   ComAtprotoLabelSubscribeLabels: 'com.atproto.label.subscribeLabels',
+  ComAtprotoLexiconSchema: 'com.atproto.lexicon.schema',
   ComAtprotoModerationCreateReport: 'com.atproto.moderation.createReport',
   ComAtprotoModerationDefs: 'com.atproto.moderation.defs',
   ComAtprotoRepoApplyWrites: 'com.atproto.repo.applyWrites',
diff --git a/packages/bsky/src/lexicon/types/com/atproto/lexicon/schema.ts b/packages/bsky/src/lexicon/types/com/atproto/lexicon/schema.ts
new file mode 100644
index 00000000000..fbb12809710
--- /dev/null
+++ b/packages/bsky/src/lexicon/types/com/atproto/lexicon/schema.ts
@@ -0,0 +1,26 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { lexicons } from '../../../../lexicons'
+import { isObj, hasProp } from '../../../../util'
+import { CID } from 'multiformats/cid'
+
+export interface Record {
+  /** Indicates the 'version' of the Lexicon language. Must be '1' for the current atproto/Lexicon schema system. */
+  lexicon: number
+  [k: string]: unknown
+}
+
+export function isRecord(v: unknown): v is Record {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    (v.$type === 'com.atproto.lexicon.schema#main' ||
+      v.$type === 'com.atproto.lexicon.schema')
+  )
+}
+
+export function validateRecord(v: unknown): ValidationResult {
+  return lexicons.validate('com.atproto.lexicon.schema#main', v)
+}
diff --git a/packages/ozone/src/lexicon/index.ts b/packages/ozone/src/lexicon/index.ts
index 951724c0fe9..e5015348f6c 100644
--- a/packages/ozone/src/lexicon/index.ts
+++ b/packages/ozone/src/lexicon/index.ts
@@ -270,6 +270,7 @@ export class ComAtprotoNS {
   admin: ComAtprotoAdminNS
   identity: ComAtprotoIdentityNS
   label: ComAtprotoLabelNS
+  lexicon: ComAtprotoLexiconNS
   moderation: ComAtprotoModerationNS
   repo: ComAtprotoRepoNS
   server: ComAtprotoServerNS
@@ -281,6 +282,7 @@ export class ComAtprotoNS {
     this.admin = new ComAtprotoAdminNS(server)
     this.identity = new ComAtprotoIdentityNS(server)
     this.label = new ComAtprotoLabelNS(server)
+    this.lexicon = new ComAtprotoLexiconNS(server)
     this.moderation = new ComAtprotoModerationNS(server)
     this.repo = new ComAtprotoRepoNS(server)
     this.server = new ComAtprotoServerNS(server)
@@ -559,6 +561,14 @@ export class ComAtprotoLabelNS {
   }
 }
 
+export class ComAtprotoLexiconNS {
+  _server: Server
+
+  constructor(server: Server) {
+    this._server = server
+  }
+}
+
 export class ComAtprotoModerationNS {
   _server: Server
 
diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
index ececcfe4481..260fce3a522 100644
--- a/packages/ozone/src/lexicon/lexicons.ts
+++ b/packages/ozone/src/lexicon/lexicons.ts
@@ -1122,6 +1122,29 @@ export const schemaDict = {
       },
     },
   },
+  ComAtprotoLexiconSchema: {
+    lexicon: 1,
+    id: 'com.atproto.lexicon.schema',
+    defs: {
+      main: {
+        type: 'record',
+        description:
+          "Representation of Lexicon schemas themselves, when published as atproto records. Note that the schema language is not defined in Lexicon; this meta schema currently only includes a single version field ('lexicon'). See the atproto specifications for description of the other expected top-level fields ('id', 'defs', etc).",
+        key: 'nsid',
+        record: {
+          type: 'object',
+          required: ['lexicon'],
+          properties: {
+            lexicon: {
+              type: 'integer',
+              description:
+                "Indicates the 'version' of the Lexicon language. Must be '1' for the current atproto/Lexicon schema system.",
+            },
+          },
+        },
+      },
+    },
+  },
   ComAtprotoModerationCreateReport: {
     lexicon: 1,
     id: 'com.atproto.moderation.createReport',
@@ -13644,6 +13667,7 @@ export const ids = {
   ComAtprotoLabelDefs: 'com.atproto.label.defs',
   ComAtprotoLabelQueryLabels: 'com.atproto.label.queryLabels',
   ComAtprotoLabelSubscribeLabels: 'com.atproto.label.subscribeLabels',
+  ComAtprotoLexiconSchema: 'com.atproto.lexicon.schema',
   ComAtprotoModerationCreateReport: 'com.atproto.moderation.createReport',
   ComAtprotoModerationDefs: 'com.atproto.moderation.defs',
   ComAtprotoRepoApplyWrites: 'com.atproto.repo.applyWrites',
diff --git a/packages/ozone/src/lexicon/types/com/atproto/lexicon/schema.ts b/packages/ozone/src/lexicon/types/com/atproto/lexicon/schema.ts
new file mode 100644
index 00000000000..fbb12809710
--- /dev/null
+++ b/packages/ozone/src/lexicon/types/com/atproto/lexicon/schema.ts
@@ -0,0 +1,26 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { lexicons } from '../../../../lexicons'
+import { isObj, hasProp } from '../../../../util'
+import { CID } from 'multiformats/cid'
+
+export interface Record {
+  /** Indicates the 'version' of the Lexicon language. Must be '1' for the current atproto/Lexicon schema system. */
+  lexicon: number
+  [k: string]: unknown
+}
+
+export function isRecord(v: unknown): v is Record {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    (v.$type === 'com.atproto.lexicon.schema#main' ||
+      v.$type === 'com.atproto.lexicon.schema')
+  )
+}
+
+export function validateRecord(v: unknown): ValidationResult {
+  return lexicons.validate('com.atproto.lexicon.schema#main', v)
+}
diff --git a/packages/pds/src/lexicon/index.ts b/packages/pds/src/lexicon/index.ts
index 951724c0fe9..e5015348f6c 100644
--- a/packages/pds/src/lexicon/index.ts
+++ b/packages/pds/src/lexicon/index.ts
@@ -270,6 +270,7 @@ export class ComAtprotoNS {
   admin: ComAtprotoAdminNS
   identity: ComAtprotoIdentityNS
   label: ComAtprotoLabelNS
+  lexicon: ComAtprotoLexiconNS
   moderation: ComAtprotoModerationNS
   repo: ComAtprotoRepoNS
   server: ComAtprotoServerNS
@@ -281,6 +282,7 @@ export class ComAtprotoNS {
     this.admin = new ComAtprotoAdminNS(server)
     this.identity = new ComAtprotoIdentityNS(server)
     this.label = new ComAtprotoLabelNS(server)
+    this.lexicon = new ComAtprotoLexiconNS(server)
     this.moderation = new ComAtprotoModerationNS(server)
     this.repo = new ComAtprotoRepoNS(server)
     this.server = new ComAtprotoServerNS(server)
@@ -559,6 +561,14 @@ export class ComAtprotoLabelNS {
   }
 }
 
+export class ComAtprotoLexiconNS {
+  _server: Server
+
+  constructor(server: Server) {
+    this._server = server
+  }
+}
+
 export class ComAtprotoModerationNS {
   _server: Server
 
diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
index ececcfe4481..260fce3a522 100644
--- a/packages/pds/src/lexicon/lexicons.ts
+++ b/packages/pds/src/lexicon/lexicons.ts
@@ -1122,6 +1122,29 @@ export const schemaDict = {
       },
     },
   },
+  ComAtprotoLexiconSchema: {
+    lexicon: 1,
+    id: 'com.atproto.lexicon.schema',
+    defs: {
+      main: {
+        type: 'record',
+        description:
+          "Representation of Lexicon schemas themselves, when published as atproto records. Note that the schema language is not defined in Lexicon; this meta schema currently only includes a single version field ('lexicon'). See the atproto specifications for description of the other expected top-level fields ('id', 'defs', etc).",
+        key: 'nsid',
+        record: {
+          type: 'object',
+          required: ['lexicon'],
+          properties: {
+            lexicon: {
+              type: 'integer',
+              description:
+                "Indicates the 'version' of the Lexicon language. Must be '1' for the current atproto/Lexicon schema system.",
+            },
+          },
+        },
+      },
+    },
+  },
   ComAtprotoModerationCreateReport: {
     lexicon: 1,
     id: 'com.atproto.moderation.createReport',
@@ -13644,6 +13667,7 @@ export const ids = {
   ComAtprotoLabelDefs: 'com.atproto.label.defs',
   ComAtprotoLabelQueryLabels: 'com.atproto.label.queryLabels',
   ComAtprotoLabelSubscribeLabels: 'com.atproto.label.subscribeLabels',
+  ComAtprotoLexiconSchema: 'com.atproto.lexicon.schema',
   ComAtprotoModerationCreateReport: 'com.atproto.moderation.createReport',
   ComAtprotoModerationDefs: 'com.atproto.moderation.defs',
   ComAtprotoRepoApplyWrites: 'com.atproto.repo.applyWrites',
diff --git a/packages/pds/src/lexicon/types/com/atproto/lexicon/schema.ts b/packages/pds/src/lexicon/types/com/atproto/lexicon/schema.ts
new file mode 100644
index 00000000000..fbb12809710
--- /dev/null
+++ b/packages/pds/src/lexicon/types/com/atproto/lexicon/schema.ts
@@ -0,0 +1,26 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { lexicons } from '../../../../lexicons'
+import { isObj, hasProp } from '../../../../util'
+import { CID } from 'multiformats/cid'
+
+export interface Record {
+  /** Indicates the 'version' of the Lexicon language. Must be '1' for the current atproto/Lexicon schema system. */
+  lexicon: number
+  [k: string]: unknown
+}
+
+export function isRecord(v: unknown): v is Record {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    (v.$type === 'com.atproto.lexicon.schema#main' ||
+      v.$type === 'com.atproto.lexicon.schema')
+  )
+}
+
+export function validateRecord(v: unknown): ValidationResult {
+  return lexicons.validate('com.atproto.lexicon.schema#main', v)
+}

From c6c8686de4e63d331a2b6cf19dcf22b157daaa89 Mon Sep 17 00:00:00 2001
From: devin ivy <devinivy@gmail.com>
Date: Wed, 15 Jan 2025 11:04:42 -0500
Subject: [PATCH 002/101] Appview: permit redirects during blob resolution
 (#3370)

appview: permit redirects during blob resolution
---
 packages/bsky/src/api/blob-resolver.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/bsky/src/api/blob-resolver.ts b/packages/bsky/src/api/blob-resolver.ts
index 89e4a3e716c..95dc8f7ba1b 100644
--- a/packages/bsky/src/api/blob-resolver.ts
+++ b/packages/bsky/src/api/blob-resolver.ts
@@ -193,6 +193,7 @@ export async function streamBlob(
         path: url.pathname + url.search,
         headers,
         signal: options.signal,
+        maxRedirections: 10,
       },
       (upstream) => {
         headersReceived = true

From 0832a377d269584a906d5062ebb5e2e6307f9c61 Mon Sep 17 00:00:00 2001
From: rafael <rafael@blueskyweb.xyz>
Date: Wed, 15 Jan 2025 13:43:16 -0300
Subject: [PATCH 003/101] Allow resetting a route's rate limits (#3348)

---
 .changeset/early-keys-fetch.md                |  5 ++
 packages/xrpc-server/src/rate-limiter.ts      | 25 +++++++
 packages/xrpc-server/src/server.ts            | 70 ++++++++++++-------
 packages/xrpc-server/src/types.ts             |  7 ++
 .../xrpc-server/tests/rate-limiter.test.ts    | 50 +++++++++++++
 5 files changed, 133 insertions(+), 24 deletions(-)
 create mode 100644 .changeset/early-keys-fetch.md

diff --git a/.changeset/early-keys-fetch.md b/.changeset/early-keys-fetch.md
new file mode 100644
index 00000000000..62e65092232
--- /dev/null
+++ b/.changeset/early-keys-fetch.md
@@ -0,0 +1,5 @@
+---
+"@atproto/xrpc-server": patch
+---
+
+Add resetRouteRateLimits to req context
diff --git a/packages/xrpc-server/src/rate-limiter.ts b/packages/xrpc-server/src/rate-limiter.ts
index fa7fd8b0987..d63458c92ad 100644
--- a/packages/xrpc-server/src/rate-limiter.ts
+++ b/packages/xrpc-server/src/rate-limiter.ts
@@ -10,6 +10,7 @@ import {
   CalcPointsFn,
   RateLimitExceededError,
   RateLimiterConsume,
+  RateLimiterReset,
   RateLimiterI,
   RateLimiterStatus,
   XRPCReqContext,
@@ -109,6 +110,22 @@ export class RateLimiter implements RateLimiterI {
       }
     }
   }
+
+  async reset(
+    ctx: XRPCReqContext,
+    opts?: { calcKey?: CalcKeyFn },
+  ): Promise<void> {
+    const key = opts?.calcKey ? opts.calcKey(ctx) : this.calcKey(ctx)
+    if (key === null) {
+      return
+    }
+
+    try {
+      await this.limiter.delete(key)
+    } catch (err) {
+      throw new Error(`rate limiter failed to reset key: ${key}`)
+    }
+  }
 }
 
 export const formatLimiterStatus = (
@@ -143,6 +160,14 @@ export const consumeMany = async (
   }
 }
 
+export const resetMany = async (
+  ctx: XRPCReqContext,
+  fns: RateLimiterReset[],
+): Promise<void> => {
+  if (fns.length === 0) return
+  await Promise.all(fns.map((fn) => fn(ctx)))
+}
+
 export const setResHeaders = (
   ctx: XRPCReqContext,
   status: RateLimiterStatus,
diff --git a/packages/xrpc-server/src/server.ts b/packages/xrpc-server/src/server.ts
index d3ca5d7ae19..0ccb8d9db3b 100644
--- a/packages/xrpc-server/src/server.ts
+++ b/packages/xrpc-server/src/server.ts
@@ -21,7 +21,7 @@ import { Readable } from 'node:stream'
 import { pipeline } from 'node:stream/promises'
 
 import log from './logger'
-import { consumeMany } from './rate-limiter'
+import { consumeMany, resetMany } from './rate-limiter'
 import { ErrorFrame, Frame, MessageFrame, XrpcStreamServer } from './stream'
 import {
   AuthVerifier,
@@ -37,7 +37,6 @@ import {
   MethodNotImplementedError,
   Options,
   Params,
-  RateLimiterConsume,
   RateLimiterI,
   RateLimitExceededError,
   XRPCError,
@@ -67,7 +66,7 @@ export class Server {
   middleware: Record<'json' | 'text', RequestHandler>
   globalRateLimiters: RateLimiterI[]
   sharedRateLimiters: Record<string, RateLimiterI>
-  routeRateLimiterFns: Record<string, RateLimiterConsume[]>
+  routeRateLimiters: Record<string, RateLimiterI[]>
 
   constructor(lexicons?: LexiconDoc[], opts?: Options) {
     if (lexicons) {
@@ -86,7 +85,7 @@ export class Server {
     }
     this.globalRateLimiters = []
     this.sharedRateLimiters = {}
-    this.routeRateLimiterFns = {}
+    this.routeRateLimiters = {}
     if (opts?.rateLimits?.global) {
       for (const limit of opts.rateLimits.global) {
         const rateLimiter = opts.rateLimits.creator({
@@ -195,6 +194,7 @@ export class Server {
             auth: undefined,
             params: {},
             input: undefined,
+            async resetRouteRateLimits() {},
           },
           this.globalRateLimiters.map(
             (rl) => (ctx: XRPCReqContext) => rl.consume(ctx),
@@ -250,9 +250,18 @@ export class Server {
             validateOutput(nsid, def, output, this.lex)
     const assertValidXrpcParams = (params: unknown) =>
       this.lex.assertValidXrpcParams(nsid, params)
-    const rlFns = this.routeRateLimiterFns[nsid] ?? []
+    const rls = this.routeRateLimiters[nsid] ?? []
     const consumeRateLimit = (reqCtx: XRPCReqContext) =>
-      consumeMany(reqCtx, rlFns)
+      consumeMany(
+        reqCtx,
+        rls.map((rl) => (ctx: XRPCReqContext) => rl.consume(ctx)),
+      )
+
+    const resetRateLimit = (reqCtx: XRPCReqContext) =>
+      resetMany(
+        reqCtx,
+        rls.map((rl) => (ctx: XRPCReqContext) => rl.reset(ctx)),
+      )
 
     return async function (req, res, next) {
       try {
@@ -273,6 +282,9 @@ export class Server {
           auth: locals.auth,
           req,
           res,
+          async resetRouteRateLimits() {
+            return resetRateLimit(this)
+          },
         }
 
         // handle rate limits
@@ -422,31 +434,36 @@ export class Server {
   }
 
   private setupRouteRateLimits(nsid: string, config: XRPCHandlerConfig) {
-    this.routeRateLimiterFns[nsid] = []
+    this.routeRateLimiters[nsid] = []
     for (const limit of this.globalRateLimiters) {
-      const consumeFn = async (ctx: XRPCReqContext) => {
-        return limit.consume(ctx)
-      }
-      this.routeRateLimiterFns[nsid].push(consumeFn)
+      this.routeRateLimiters[nsid].push({
+        consume: (ctx: XRPCReqContext) => limit.consume(ctx),
+        reset: (ctx: XRPCReqContext) => limit.reset(ctx),
+      })
     }
 
     if (config.rateLimit) {
       const limits = Array.isArray(config.rateLimit)
         ? config.rateLimit
         : [config.rateLimit]
-      this.routeRateLimiterFns[nsid] = []
+      this.routeRateLimiters[nsid] = []
       for (let i = 0; i < limits.length; i++) {
         const limit = limits[i]
         const { calcKey, calcPoints } = limit
         if (isShared(limit)) {
           const rateLimiter = this.sharedRateLimiters[limit.name]
           if (rateLimiter) {
-            const consumeFn = (ctx: XRPCReqContext) =>
-              rateLimiter.consume(ctx, {
-                calcKey,
-                calcPoints,
-              })
-            this.routeRateLimiterFns[nsid].push(consumeFn)
+            this.routeRateLimiters[nsid].push({
+              consume: (ctx: XRPCReqContext) =>
+                rateLimiter.consume(ctx, {
+                  calcKey,
+                  calcPoints,
+                }),
+              reset: (ctx: XRPCReqContext) =>
+                rateLimiter.reset(ctx, {
+                  calcKey,
+                }),
+            })
           }
         } else {
           const { durationMs, points } = limit
@@ -459,12 +476,17 @@ export class Server {
           })
           if (rateLimiter) {
             this.sharedRateLimiters[nsid] = rateLimiter
-            const consumeFn = (ctx: XRPCReqContext) =>
-              rateLimiter.consume(ctx, {
-                calcKey,
-                calcPoints,
-              })
-            this.routeRateLimiterFns[nsid].push(consumeFn)
+            this.routeRateLimiters[nsid].push({
+              consume: (ctx: XRPCReqContext) =>
+                rateLimiter.consume(ctx, {
+                  calcKey,
+                  calcPoints,
+                }),
+              reset: (ctx: XRPCReqContext) =>
+                rateLimiter.reset(ctx, {
+                  calcKey,
+                }),
+            })
           }
         }
       }
diff --git a/packages/xrpc-server/src/types.ts b/packages/xrpc-server/src/types.ts
index be56c392be9..afc68150328 100644
--- a/packages/xrpc-server/src/types.ts
+++ b/packages/xrpc-server/src/types.ts
@@ -99,6 +99,7 @@ export type XRPCReqContext = {
   input: HandlerInput | undefined
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 
 export type XRPCHandler = (
@@ -136,6 +137,7 @@ export type CalcPointsFn = (ctx: XRPCReqContext) => number
 
 export interface RateLimiterI {
   consume: RateLimiterConsume
+  reset: RateLimiterReset
 }
 
 export type RateLimiterConsume = (
@@ -143,6 +145,11 @@ export type RateLimiterConsume = (
   opts?: { calcKey?: CalcKeyFn; calcPoints?: CalcPointsFn },
 ) => Promise<RateLimiterStatus | RateLimitExceededError | null>
 
+export type RateLimiterReset = (
+  ctx: XRPCReqContext,
+  opts?: { calcKey?: CalcKeyFn },
+) => Promise<void>
+
 export type RateLimiterCreator = (opts: {
   keyPrefix: string
   durationMs: number
diff --git a/packages/xrpc-server/tests/rate-limiter.test.ts b/packages/xrpc-server/tests/rate-limiter.test.ts
index 08a59d85169..e2f9dc51d10 100644
--- a/packages/xrpc-server/tests/rate-limiter.test.ts
+++ b/packages/xrpc-server/tests/rate-limiter.test.ts
@@ -27,6 +27,25 @@ const LEXICONS: LexiconDoc[] = [
       },
     },
   },
+  {
+    lexicon: 1,
+    id: 'io.example.routeLimitReset',
+    defs: {
+      main: {
+        type: 'query',
+        parameters: {
+          type: 'params',
+          required: ['count'],
+          properties: {
+            count: { type: 'integer' },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+        },
+      },
+    },
+  },
   {
     lexicon: 1,
     id: 'io.example.sharedLimitOne',
@@ -145,7 +164,22 @@ describe('Parameters', () => {
       body: ctx.params,
     }),
   })
+  server.method('io.example.routeLimitReset', {
+    rateLimit: {
+      durationMs: 5 * MINUTE,
+      points: 2,
+    },
+    handler: (ctx: xrpcServer.XRPCReqContext) => {
+      if (ctx.params.count === 1) {
+        ctx.resetRouteRateLimits()
+      }
 
+      return {
+        encoding: 'json',
+        body: {},
+      }
+    },
+  })
   server.method('io.example.sharedLimitOne', {
     rateLimit: {
       name: 'shared-limit',
@@ -208,6 +242,22 @@ describe('Parameters', () => {
     await expect(makeCall).rejects.toThrow('Rate Limit Exceeded')
   })
 
+  it('can reset route rate limits', async () => {
+    // Limit is 2.
+    // Call 0 is OK (1/2).
+    // Call 1 is OK (2/2), and resets the limit.
+    // Call 2 is OK (1/2).
+    // Call 3 is OK (2/2).
+    for (let i = 0; i < 4; i++) {
+      await client.call('io.example.routeLimitReset', { count: i })
+    }
+
+    // Call 4 exceeds the limit (3/2).
+    await expect(
+      client.call('io.example.routeLimitReset', { count: 4 }),
+    ).rejects.toThrow('Rate Limit Exceeded')
+  })
+
   it('rate limits on a shared route', async () => {
     await client.call('io.example.sharedLimitOne', { points: 1 })
     await client.call('io.example.sharedLimitTwo', { points: 1 })

From fa96a997ecc5f2f515c2b8f5ac57a4bcf68efbfb Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 15 Jan 2025 13:58:19 -0300
Subject: [PATCH 004/101] Version packages (#3372)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/early-keys-fetch.md            |  5 -----
 packages/bsky/CHANGELOG.md                |  9 +++++++++
 packages/bsky/package.json                |  2 +-
 packages/dev-env/CHANGELOG.md             | 11 +++++++++++
 packages/dev-env/package.json             |  2 +-
 packages/internal/xrpc-utils/CHANGELOG.md |  7 +++++++
 packages/internal/xrpc-utils/package.json |  2 +-
 packages/ozone/CHANGELOG.md               |  7 +++++++
 packages/ozone/package.json               |  2 +-
 packages/pds/CHANGELOG.md                 |  8 ++++++++
 packages/pds/package.json                 |  2 +-
 packages/sync/CHANGELOG.md                |  7 +++++++
 packages/sync/package.json                |  2 +-
 packages/xrpc-server/CHANGELOG.md         |  6 ++++++
 packages/xrpc-server/package.json         |  2 +-
 15 files changed, 62 insertions(+), 12 deletions(-)
 delete mode 100644 .changeset/early-keys-fetch.md

diff --git a/.changeset/early-keys-fetch.md b/.changeset/early-keys-fetch.md
deleted file mode 100644
index 62e65092232..00000000000
--- a/.changeset/early-keys-fetch.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/xrpc-server": patch
----
-
-Add resetRouteRateLimits to req context
diff --git a/packages/bsky/CHANGELOG.md b/packages/bsky/CHANGELOG.md
index b30bbb22e6a..094443d3850 100644
--- a/packages/bsky/CHANGELOG.md
+++ b/packages/bsky/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @atproto/bsky
 
+## 0.0.107
+
+### Patch Changes
+
+- Updated dependencies [[`0832a377d`](https://github.com/bluesky-social/atproto/commit/0832a377d269584a906d5062ebb5e2e6307f9c61)]:
+  - @atproto/xrpc-server@0.7.7
+  - @atproto-labs/xrpc-utils@0.0.3
+  - @atproto/sync@0.1.10
+
 ## 0.0.106
 
 ### Patch Changes
diff --git a/packages/bsky/package.json b/packages/bsky/package.json
index 0f3e2032cb1..8975c6ead18 100644
--- a/packages/bsky/package.json
+++ b/packages/bsky/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.106",
+  "version": "0.0.107",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
diff --git a/packages/dev-env/CHANGELOG.md b/packages/dev-env/CHANGELOG.md
index a78e851c665..4da48580c6e 100644
--- a/packages/dev-env/CHANGELOG.md
+++ b/packages/dev-env/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @atproto/dev-env
 
+## 0.3.77
+
+### Patch Changes
+
+- Updated dependencies [[`0832a377d`](https://github.com/bluesky-social/atproto/commit/0832a377d269584a906d5062ebb5e2e6307f9c61)]:
+  - @atproto/xrpc-server@0.7.7
+  - @atproto/bsky@0.0.107
+  - @atproto/ozone@0.1.68
+  - @atproto/pds@0.4.85
+  - @atproto/sync@0.1.10
+
 ## 0.3.76
 
 ### Patch Changes
diff --git a/packages/dev-env/package.json b/packages/dev-env/package.json
index dbefc78fa25..02ac33ad3d0 100644
--- a/packages/dev-env/package.json
+++ b/packages/dev-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/dev-env",
-  "version": "0.3.76",
+  "version": "0.3.77",
   "license": "MIT",
   "description": "Local development environment helper for atproto development",
   "keywords": [
diff --git a/packages/internal/xrpc-utils/CHANGELOG.md b/packages/internal/xrpc-utils/CHANGELOG.md
index 01d8db20a22..96636b07e52 100644
--- a/packages/internal/xrpc-utils/CHANGELOG.md
+++ b/packages/internal/xrpc-utils/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto-labs/xrpc-utils
 
+## 0.0.3
+
+### Patch Changes
+
+- Updated dependencies [[`0832a377d`](https://github.com/bluesky-social/atproto/commit/0832a377d269584a906d5062ebb5e2e6307f9c61)]:
+  - @atproto/xrpc-server@0.7.7
+
 ## 0.0.2
 
 ### Patch Changes
diff --git a/packages/internal/xrpc-utils/package.json b/packages/internal/xrpc-utils/package.json
index 8608c6d0bb2..a4d17fa6700 100644
--- a/packages/internal/xrpc-utils/package.json
+++ b/packages/internal/xrpc-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto-labs/xrpc-utils",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "license": "MIT",
   "description": "XRPC server utilities for Node.JS",
   "keywords": [
diff --git a/packages/ozone/CHANGELOG.md b/packages/ozone/CHANGELOG.md
index 8d3a3f17cc5..8cc0d1d310c 100644
--- a/packages/ozone/CHANGELOG.md
+++ b/packages/ozone/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/ozone
 
+## 0.1.68
+
+### Patch Changes
+
+- Updated dependencies [[`0832a377d`](https://github.com/bluesky-social/atproto/commit/0832a377d269584a906d5062ebb5e2e6307f9c61)]:
+  - @atproto/xrpc-server@0.7.7
+
 ## 0.1.67
 
 ### Patch Changes
diff --git a/packages/ozone/package.json b/packages/ozone/package.json
index 7d45930b37d..56dc02b0be3 100644
--- a/packages/ozone/package.json
+++ b/packages/ozone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.1.67",
+  "version": "0.1.68",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
diff --git a/packages/pds/CHANGELOG.md b/packages/pds/CHANGELOG.md
index fa7455c5050..f042ffa12cc 100644
--- a/packages/pds/CHANGELOG.md
+++ b/packages/pds/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @atproto/pds
 
+## 0.4.85
+
+### Patch Changes
+
+- Updated dependencies [[`0832a377d`](https://github.com/bluesky-social/atproto/commit/0832a377d269584a906d5062ebb5e2e6307f9c61)]:
+  - @atproto/xrpc-server@0.7.7
+  - @atproto-labs/xrpc-utils@0.0.3
+
 ## 0.4.84
 
 ### Patch Changes
diff --git a/packages/pds/package.json b/packages/pds/package.json
index ab8d863b89c..67c5c987eeb 100644
--- a/packages/pds/package.json
+++ b/packages/pds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/pds",
-  "version": "0.4.84",
+  "version": "0.4.85",
   "license": "MIT",
   "description": "Reference implementation of atproto Personal Data Server (PDS)",
   "keywords": [
diff --git a/packages/sync/CHANGELOG.md b/packages/sync/CHANGELOG.md
index da16c3d9a8c..ded9e3892b9 100644
--- a/packages/sync/CHANGELOG.md
+++ b/packages/sync/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/sync
 
+## 0.1.10
+
+### Patch Changes
+
+- Updated dependencies [[`0832a377d`](https://github.com/bluesky-social/atproto/commit/0832a377d269584a906d5062ebb5e2e6307f9c61)]:
+  - @atproto/xrpc-server@0.7.7
+
 ## 0.1.9
 
 ### Patch Changes
diff --git a/packages/sync/package.json b/packages/sync/package.json
index a679b65cad9..eb83470c661 100644
--- a/packages/sync/package.json
+++ b/packages/sync/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/sync",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "license": "MIT",
   "description": "atproto sync library",
   "keywords": [
diff --git a/packages/xrpc-server/CHANGELOG.md b/packages/xrpc-server/CHANGELOG.md
index cc0a4c0a038..d99b9b5cfb9 100644
--- a/packages/xrpc-server/CHANGELOG.md
+++ b/packages/xrpc-server/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @atproto/xrpc-server
 
+## 0.7.7
+
+### Patch Changes
+
+- [#3348](https://github.com/bluesky-social/atproto/pull/3348) [`0832a377d`](https://github.com/bluesky-social/atproto/commit/0832a377d269584a906d5062ebb5e2e6307f9c61) Thanks [@rafaelbsky](https://github.com/rafaelbsky)! - Add resetRouteRateLimits to req context
+
 ## 0.7.6
 
 ### Patch Changes
diff --git a/packages/xrpc-server/package.json b/packages/xrpc-server/package.json
index 475f1357e7d..8417823aff1 100644
--- a/packages/xrpc-server/package.json
+++ b/packages/xrpc-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/xrpc-server",
-  "version": "0.7.6",
+  "version": "0.7.7",
   "license": "MIT",
   "description": "atproto HTTP API (XRPC) server library",
   "keywords": [

From 688ff00dded00e52e53806942de7c9088fb44dec Mon Sep 17 00:00:00 2001
From: rafael <rafael@blueskyweb.xyz>
Date: Wed, 15 Jan 2025 19:34:42 -0300
Subject: [PATCH 005/101] codegen un-codegen-ed stuff on main (#3374)

---
 packages/api/src/client/lexicons.ts    | 15 +++++++++++++++
 packages/bsky/src/lexicon/lexicons.ts  | 15 +++++++++++++++
 packages/ozone/src/lexicon/lexicons.ts | 15 +++++++++++++++
 packages/pds/src/lexicon/lexicons.ts   | 15 +++++++++++++++
 4 files changed, 60 insertions(+)

diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
index 260fce3a522..963fbee538b 100644
--- a/packages/api/src/client/lexicons.ts
+++ b/packages/api/src/client/lexicons.ts
@@ -4851,6 +4851,11 @@ export const schemaDict = {
                   ref: 'lex:app.bsky.actor.defs#profileView',
                 },
               },
+              recId: {
+                type: 'integer',
+                description:
+                  'Snowflake for this recommendation, use when submitting recommendation events.',
+              },
             },
           },
         },
@@ -8358,6 +8363,11 @@ export const schemaDict = {
                   'If true, response has fallen-back to generic results, and is not scoped using relativeToDid',
                 default: false,
               },
+              recId: {
+                type: 'integer',
+                description:
+                  'Snowflake for this recommendation, use when submitting recommendation events.',
+              },
             },
           },
         },
@@ -9429,6 +9439,11 @@ export const schemaDict = {
                 description:
                   'DID of the account these suggestions are relative to. If this is returned undefined, suggestions are based on the viewer.',
               },
+              recId: {
+                type: 'integer',
+                description:
+                  'Snowflake for this recommendation, use when submitting recommendation events.',
+              },
             },
           },
         },
diff --git a/packages/bsky/src/lexicon/lexicons.ts b/packages/bsky/src/lexicon/lexicons.ts
index 66b737dc760..d16b479f5ef 100644
--- a/packages/bsky/src/lexicon/lexicons.ts
+++ b/packages/bsky/src/lexicon/lexicons.ts
@@ -4851,6 +4851,11 @@ export const schemaDict = {
                   ref: 'lex:app.bsky.actor.defs#profileView',
                 },
               },
+              recId: {
+                type: 'integer',
+                description:
+                  'Snowflake for this recommendation, use when submitting recommendation events.',
+              },
             },
           },
         },
@@ -8358,6 +8363,11 @@ export const schemaDict = {
                   'If true, response has fallen-back to generic results, and is not scoped using relativeToDid',
                 default: false,
               },
+              recId: {
+                type: 'integer',
+                description:
+                  'Snowflake for this recommendation, use when submitting recommendation events.',
+              },
             },
           },
         },
@@ -9429,6 +9439,11 @@ export const schemaDict = {
                 description:
                   'DID of the account these suggestions are relative to. If this is returned undefined, suggestions are based on the viewer.',
               },
+              recId: {
+                type: 'integer',
+                description:
+                  'Snowflake for this recommendation, use when submitting recommendation events.',
+              },
             },
           },
         },
diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
index 260fce3a522..963fbee538b 100644
--- a/packages/ozone/src/lexicon/lexicons.ts
+++ b/packages/ozone/src/lexicon/lexicons.ts
@@ -4851,6 +4851,11 @@ export const schemaDict = {
                   ref: 'lex:app.bsky.actor.defs#profileView',
                 },
               },
+              recId: {
+                type: 'integer',
+                description:
+                  'Snowflake for this recommendation, use when submitting recommendation events.',
+              },
             },
           },
         },
@@ -8358,6 +8363,11 @@ export const schemaDict = {
                   'If true, response has fallen-back to generic results, and is not scoped using relativeToDid',
                 default: false,
               },
+              recId: {
+                type: 'integer',
+                description:
+                  'Snowflake for this recommendation, use when submitting recommendation events.',
+              },
             },
           },
         },
@@ -9429,6 +9439,11 @@ export const schemaDict = {
                 description:
                   'DID of the account these suggestions are relative to. If this is returned undefined, suggestions are based on the viewer.',
               },
+              recId: {
+                type: 'integer',
+                description:
+                  'Snowflake for this recommendation, use when submitting recommendation events.',
+              },
             },
           },
         },
diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
index 260fce3a522..963fbee538b 100644
--- a/packages/pds/src/lexicon/lexicons.ts
+++ b/packages/pds/src/lexicon/lexicons.ts
@@ -4851,6 +4851,11 @@ export const schemaDict = {
                   ref: 'lex:app.bsky.actor.defs#profileView',
                 },
               },
+              recId: {
+                type: 'integer',
+                description:
+                  'Snowflake for this recommendation, use when submitting recommendation events.',
+              },
             },
           },
         },
@@ -8358,6 +8363,11 @@ export const schemaDict = {
                   'If true, response has fallen-back to generic results, and is not scoped using relativeToDid',
                 default: false,
               },
+              recId: {
+                type: 'integer',
+                description:
+                  'Snowflake for this recommendation, use when submitting recommendation events.',
+              },
             },
           },
         },
@@ -9429,6 +9439,11 @@ export const schemaDict = {
                 description:
                   'DID of the account these suggestions are relative to. If this is returned undefined, suggestions are based on the viewer.',
               },
+              recId: {
+                type: 'integer',
+                description:
+                  'Snowflake for this recommendation, use when submitting recommendation events.',
+              },
             },
           },
         },

From 4e43cc0de14d272633fcf28b74fe856d5b44e032 Mon Sep 17 00:00:00 2001
From: rafael <rafael@blueskyweb.xyz>
Date: Thu, 16 Jan 2025 15:46:37 -0300
Subject: [PATCH 006/101] use ubuntu 22.04 on github actions (#3377)

---
 .github/workflows/build-and-push-bsky-aws.yaml   | 2 +-
 .github/workflows/build-and-push-bsky-ghcr.yaml  | 2 +-
 .github/workflows/build-and-push-bsync-aws.yaml  | 2 +-
 .github/workflows/build-and-push-bsync-ghcr.yaml | 2 +-
 .github/workflows/build-and-push-ozone-aws.yaml  | 2 +-
 .github/workflows/build-and-push-ozone-ghcr.yaml | 2 +-
 .github/workflows/build-and-push-pds-aws.yaml    | 2 +-
 .github/workflows/build-and-push-pds-ghcr.yaml   | 2 +-
 .github/workflows/publish.yaml                   | 2 +-
 .github/workflows/repo.yaml                      | 6 +++---
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build-and-push-bsky-aws.yaml b/.github/workflows/build-and-push-bsky-aws.yaml
index 36b1aa23cb3..e0526ac2241 100644
--- a/.github/workflows/build-and-push-bsky-aws.yaml
+++ b/.github/workflows/build-and-push-bsky-aws.yaml
@@ -12,7 +12,7 @@ env:
 jobs:
   bsky-container-aws:
     if: github.repository == 'bluesky-social/atproto'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       contents: read
       packages: write
diff --git a/.github/workflows/build-and-push-bsky-ghcr.yaml b/.github/workflows/build-and-push-bsky-ghcr.yaml
index 5d22cd9a389..facdd3a8d24 100644
--- a/.github/workflows/build-and-push-bsky-ghcr.yaml
+++ b/.github/workflows/build-and-push-bsky-ghcr.yaml
@@ -14,7 +14,7 @@ env:
 jobs:
   bsky-container-ghcr:
     if: github.repository == 'bluesky-social/atproto'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       contents: read
       packages: write
diff --git a/.github/workflows/build-and-push-bsync-aws.yaml b/.github/workflows/build-and-push-bsync-aws.yaml
index 7976e537325..cfd0970f573 100644
--- a/.github/workflows/build-and-push-bsync-aws.yaml
+++ b/.github/workflows/build-and-push-bsync-aws.yaml
@@ -12,7 +12,7 @@ env:
 jobs:
   bsync-container-aws:
     if: github.repository == 'bluesky-social/atproto'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       contents: read
       packages: write
diff --git a/.github/workflows/build-and-push-bsync-ghcr.yaml b/.github/workflows/build-and-push-bsync-ghcr.yaml
index dec359e020b..a22718cd00d 100644
--- a/.github/workflows/build-and-push-bsync-ghcr.yaml
+++ b/.github/workflows/build-and-push-bsync-ghcr.yaml
@@ -14,7 +14,7 @@ env:
 jobs:
   bsync-container-ghcr:
     if: github.repository == 'bluesky-social/atproto'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       contents: read
       packages: write
diff --git a/.github/workflows/build-and-push-ozone-aws.yaml b/.github/workflows/build-and-push-ozone-aws.yaml
index 4cce9a36c2d..84d42407794 100644
--- a/.github/workflows/build-and-push-ozone-aws.yaml
+++ b/.github/workflows/build-and-push-ozone-aws.yaml
@@ -13,7 +13,7 @@ env:
 jobs:
   ozone-container-aws:
     if: github.repository == 'bluesky-social/atproto'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       contents: read
       packages: write
diff --git a/.github/workflows/build-and-push-ozone-ghcr.yaml b/.github/workflows/build-and-push-ozone-ghcr.yaml
index ab37093963d..982f7af73d3 100644
--- a/.github/workflows/build-and-push-ozone-ghcr.yaml
+++ b/.github/workflows/build-and-push-ozone-ghcr.yaml
@@ -14,7 +14,7 @@ env:
 jobs:
   ozone-container-ghcr:
     if: github.repository == 'bluesky-social/atproto'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       contents: read
       packages: write
diff --git a/.github/workflows/build-and-push-pds-aws.yaml b/.github/workflows/build-and-push-pds-aws.yaml
index 097f782d88e..803a431cd92 100644
--- a/.github/workflows/build-and-push-pds-aws.yaml
+++ b/.github/workflows/build-and-push-pds-aws.yaml
@@ -12,7 +12,7 @@ env:
 jobs:
   pds-container-aws:
     if: github.repository == 'bluesky-social/atproto'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       contents: read
       packages: write
diff --git a/.github/workflows/build-and-push-pds-ghcr.yaml b/.github/workflows/build-and-push-pds-ghcr.yaml
index b11230ab531..b6bd6c38ad8 100644
--- a/.github/workflows/build-and-push-pds-ghcr.yaml
+++ b/.github/workflows/build-and-push-pds-ghcr.yaml
@@ -14,7 +14,7 @@ env:
 jobs:
   pds-container-ghcr:
     if: github.repository == 'bluesky-social/atproto'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       contents: read
       packages: write
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 34d817a652e..4a296476926 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -13,7 +13,7 @@ jobs:
   build:
     name: Build & Publish
     if: github.repository == 'bluesky-social/atproto'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       contents: write
       pull-requests: write
diff --git a/.github/workflows/repo.yaml b/.github/workflows/repo.yaml
index 85fb369462a..e8db4b20b8d 100644
--- a/.github/workflows/repo.yaml
+++ b/.github/workflows/repo.yaml
@@ -12,7 +12,7 @@ concurrency:
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - run: corepack enable && corepack prepare --activate
@@ -42,7 +42,7 @@ jobs:
     strategy:
       matrix:
         shard: [1/8, 2/8, 3/8, 4/8, 5/8, 6/8, 7/8, 8/8]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - run: corepack enable && corepack prepare --activate
@@ -66,7 +66,7 @@ jobs:
   verify:
     name: Verify
     needs: build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - run: corepack enable && corepack prepare --activate

From 4ab7075fdea282daaa27ebbd2c7a677f886188ce Mon Sep 17 00:00:00 2001
From: rafael <rafael@blueskyweb.xyz>
Date: Thu, 16 Jan 2025 16:38:28 -0300
Subject: [PATCH 007/101] small rate-limit improvements (#3376)

---
 packages/xrpc-server/src/rate-limiter.ts | 4 ++--
 packages/xrpc-server/src/server.ts       | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/xrpc-server/src/rate-limiter.ts b/packages/xrpc-server/src/rate-limiter.ts
index d63458c92ad..01b487f9c76 100644
--- a/packages/xrpc-server/src/rate-limiter.ts
+++ b/packages/xrpc-server/src/rate-limiter.ts
@@ -122,8 +122,8 @@ export class RateLimiter implements RateLimiterI {
 
     try {
       await this.limiter.delete(key)
-    } catch (err) {
-      throw new Error(`rate limiter failed to reset key: ${key}`)
+    } catch (cause) {
+      throw new Error(`rate limiter failed to reset key: ${key}`, { cause })
     }
   }
 }
diff --git a/packages/xrpc-server/src/server.ts b/packages/xrpc-server/src/server.ts
index 0ccb8d9db3b..ae0a5563c04 100644
--- a/packages/xrpc-server/src/server.ts
+++ b/packages/xrpc-server/src/server.ts
@@ -282,9 +282,7 @@ export class Server {
           auth: locals.auth,
           req,
           res,
-          async resetRouteRateLimits() {
-            return resetRateLimit(this)
-          },
+          resetRouteRateLimits: async () => resetRateLimit(reqCtx),
         }
 
         // handle rate limits

From 9c01281931a371304bcfa465005d7363c003bc5f Mon Sep 17 00:00:00 2001
From: devin ivy <devinivy@gmail.com>
Date: Thu, 16 Jan 2025 18:43:27 -0500
Subject: [PATCH 008/101] fetch-node: ensure unicast checks allow psl domains
 (#3379)

---
 .changeset/silver-birds-run.md              |  5 +++++
 packages/internal/fetch-node/src/unicast.ts | 10 +++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/silver-birds-run.md

diff --git a/.changeset/silver-birds-run.md b/.changeset/silver-birds-run.md
new file mode 100644
index 00000000000..2521fe33e1a
--- /dev/null
+++ b/.changeset/silver-birds-run.md
@@ -0,0 +1,5 @@
+---
+"@atproto-labs/fetch-node": patch
+---
+
+Unicast checks should permit PSL domains.
diff --git a/packages/internal/fetch-node/src/unicast.ts b/packages/internal/fetch-node/src/unicast.ts
index 92ca7416938..aae1f9ae33b 100644
--- a/packages/internal/fetch-node/src/unicast.ts
+++ b/packages/internal/fetch-node/src/unicast.ts
@@ -9,7 +9,7 @@ import {
   FetchRequestError,
 } from '@atproto-labs/fetch'
 import ipaddr from 'ipaddr.js'
-import { isValid as isValidDomain } from 'psl'
+import { parse as pslParse } from 'psl'
 import { Agent, Client } from 'undici'
 
 import { isUnicastIp } from './util.js'
@@ -185,6 +185,14 @@ export function unicastLookup(
   })
 }
 
+// see lupomontero/psl#258 for context on psl usage.
+// in short, this ensures a structurally valid domain
+// plus a "listed" tld.
+function isValidDomain(domain: string) {
+  const parsed = pslParse(domain)
+  return !parsed.error && parsed.listed
+}
+
 function isNotUnicast(ip: ipaddr.IPv4 | ipaddr.IPv6): boolean {
   return ip.range() !== 'unicast'
 }

From cbf17066f314fbc7f2e943127ee4a9f589f8bec2 Mon Sep 17 00:00:00 2001
From: rafael <rafael@blueskyweb.xyz>
Date: Fri, 17 Jan 2025 20:26:29 -0300
Subject: [PATCH 009/101] feed generator content mode (#3389)

---
 .changeset/dull-zebras-prove.md               |   6 +
 lexicons/app/bsky/feed/defs.json              |  15 +++
 lexicons/app/bsky/feed/generator.json         |   7 ++
 packages/api/src/client/index.ts              |   2 +
 packages/api/src/client/lexicons.ts           |  23 ++++
 .../src/client/types/app/bsky/feed/defs.ts    |   9 ++
 .../client/types/app/bsky/feed/generator.ts   |   4 +
 packages/bsky/src/lexicon/index.ts            |   2 +
 packages/bsky/src/lexicon/lexicons.ts         |  23 ++++
 .../src/lexicon/types/app/bsky/feed/defs.ts   |   9 ++
 .../lexicon/types/app/bsky/feed/generator.ts  |   4 +
 packages/bsky/src/views/index.ts              |   1 +
 .../feed-generation.test.ts.snap              | 113 ++++++++++++++++--
 packages/bsky/tests/feed-generation.test.ts   |  42 ++++++-
 packages/ozone/src/lexicon/index.ts           |   2 +
 packages/ozone/src/lexicon/lexicons.ts        |  23 ++++
 .../src/lexicon/types/app/bsky/feed/defs.ts   |   9 ++
 .../lexicon/types/app/bsky/feed/generator.ts  |   4 +
 packages/pds/src/lexicon/index.ts             |   2 +
 packages/pds/src/lexicon/lexicons.ts          |  23 ++++
 .../src/lexicon/types/app/bsky/feed/defs.ts   |   9 ++
 .../lexicon/types/app/bsky/feed/generator.ts  |   4 +
 22 files changed, 320 insertions(+), 16 deletions(-)
 create mode 100644 .changeset/dull-zebras-prove.md

diff --git a/.changeset/dull-zebras-prove.md b/.changeset/dull-zebras-prove.md
new file mode 100644
index 00000000000..ba8bc98a662
--- /dev/null
+++ b/.changeset/dull-zebras-prove.md
@@ -0,0 +1,6 @@
+---
+"@atproto/bsky": patch
+"@atproto/api": patch
+---
+
+add feedgen content mode lexicon spec
diff --git a/lexicons/app/bsky/feed/defs.json b/lexicons/app/bsky/feed/defs.json
index 341f7fbd02b..8aca402f830 100644
--- a/lexicons/app/bsky/feed/defs.json
+++ b/lexicons/app/bsky/feed/defs.json
@@ -162,6 +162,13 @@
           "items": { "type": "ref", "ref": "com.atproto.label.defs#label" }
         },
         "viewer": { "type": "ref", "ref": "#generatorViewerState" },
+        "contentMode": {
+          "type": "string",
+          "knownValues": [
+            "app.bsky.feed.defs#contentModeUnspecified",
+            "app.bsky.feed.defs#contentModeVideo"
+          ]
+        },
         "indexedAt": { "type": "string", "format": "datetime" }
       }
     },
@@ -262,6 +269,14 @@
       "type": "token",
       "description": "User clicked through to the embedded content of the feed item"
     },
+    "contentModeUnspecified": {
+      "type": "token",
+      "description": "Declares the feed generator returns any types of posts."
+    },
+    "contentModeVideo": {
+      "type": "token",
+      "description": "Declares the feed generator returns posts containing app.bsky.embed.video embeds."
+    },
     "interactionSeen": {
       "type": "token",
       "description": "Feed item was seen by user"
diff --git a/lexicons/app/bsky/feed/generator.json b/lexicons/app/bsky/feed/generator.json
index 1406d542fd1..fec0c0fafe7 100644
--- a/lexicons/app/bsky/feed/generator.json
+++ b/lexicons/app/bsky/feed/generator.json
@@ -39,6 +39,13 @@
             "description": "Self-label values",
             "refs": ["com.atproto.label.defs#selfLabels"]
           },
+          "contentMode": {
+            "type": "string",
+            "knownValues": [
+              "app.bsky.feed.defs#contentModeUnspecified",
+              "app.bsky.feed.defs#contentModeVideo"
+            ]
+          },
           "createdAt": { "type": "string", "format": "datetime" }
         }
       }
diff --git a/packages/api/src/client/index.ts b/packages/api/src/client/index.ts
index fcced108ca1..5f46b6b277c 100644
--- a/packages/api/src/client/index.ts
+++ b/packages/api/src/client/index.ts
@@ -478,6 +478,8 @@ export const APP_BSKY_FEED = {
   DefsClickthroughAuthor: 'app.bsky.feed.defs#clickthroughAuthor',
   DefsClickthroughReposter: 'app.bsky.feed.defs#clickthroughReposter',
   DefsClickthroughEmbed: 'app.bsky.feed.defs#clickthroughEmbed',
+  DefsContentModeUnspecified: 'app.bsky.feed.defs#contentModeUnspecified',
+  DefsContentModeVideo: 'app.bsky.feed.defs#contentModeVideo',
   DefsInteractionSeen: 'app.bsky.feed.defs#interactionSeen',
   DefsInteractionLike: 'app.bsky.feed.defs#interactionLike',
   DefsInteractionRepost: 'app.bsky.feed.defs#interactionRepost',
diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
index 963fbee538b..154f03f9aa1 100644
--- a/packages/api/src/client/lexicons.ts
+++ b/packages/api/src/client/lexicons.ts
@@ -5778,6 +5778,13 @@ export const schemaDict = {
             type: 'ref',
             ref: 'lex:app.bsky.feed.defs#generatorViewerState',
           },
+          contentMode: {
+            type: 'string',
+            knownValues: [
+              'app.bsky.feed.defs#contentModeUnspecified',
+              'app.bsky.feed.defs#contentModeVideo',
+            ],
+          },
           indexedAt: {
             type: 'string',
             format: 'datetime',
@@ -5912,6 +5919,15 @@ export const schemaDict = {
         description:
           'User clicked through to the embedded content of the feed item',
       },
+      contentModeUnspecified: {
+        type: 'token',
+        description: 'Declares the feed generator returns any types of posts.',
+      },
+      contentModeVideo: {
+        type: 'token',
+        description:
+          'Declares the feed generator returns posts containing app.bsky.embed.video embeds.',
+      },
       interactionSeen: {
         type: 'token',
         description: 'Feed item was seen by user',
@@ -6043,6 +6059,13 @@ export const schemaDict = {
               description: 'Self-label values',
               refs: ['lex:com.atproto.label.defs#selfLabels'],
             },
+            contentMode: {
+              type: 'string',
+              knownValues: [
+                'app.bsky.feed.defs#contentModeUnspecified',
+                'app.bsky.feed.defs#contentModeVideo',
+              ],
+            },
             createdAt: {
               type: 'string',
               format: 'datetime',
diff --git a/packages/api/src/client/types/app/bsky/feed/defs.ts b/packages/api/src/client/types/app/bsky/feed/defs.ts
index bc50067c1da..64c3f7247d8 100644
--- a/packages/api/src/client/types/app/bsky/feed/defs.ts
+++ b/packages/api/src/client/types/app/bsky/feed/defs.ts
@@ -247,6 +247,10 @@ export interface GeneratorView {
   acceptsInteractions?: boolean
   labels?: ComAtprotoLabelDefs.Label[]
   viewer?: GeneratorViewerState
+  contentMode?:
+    | 'app.bsky.feed.defs#contentModeUnspecified'
+    | 'app.bsky.feed.defs#contentModeVideo'
+    | (string & {})
   indexedAt: string
   [k: string]: unknown
 }
@@ -401,6 +405,11 @@ export const CLICKTHROUGHAUTHOR = 'app.bsky.feed.defs#clickthroughAuthor'
 export const CLICKTHROUGHREPOSTER = 'app.bsky.feed.defs#clickthroughReposter'
 /** User clicked through to the embedded content of the feed item */
 export const CLICKTHROUGHEMBED = 'app.bsky.feed.defs#clickthroughEmbed'
+/** Declares the feed generator returns any types of posts. */
+export const CONTENTMODEUNSPECIFIED =
+  'app.bsky.feed.defs#contentModeUnspecified'
+/** Declares the feed generator returns posts containing app.bsky.embed.video embeds. */
+export const CONTENTMODEVIDEO = 'app.bsky.feed.defs#contentModeVideo'
 /** Feed item was seen by user */
 export const INTERACTIONSEEN = 'app.bsky.feed.defs#interactionSeen'
 /** User liked the feed item */
diff --git a/packages/api/src/client/types/app/bsky/feed/generator.ts b/packages/api/src/client/types/app/bsky/feed/generator.ts
index b36796dd353..8e1dd9e9c80 100644
--- a/packages/api/src/client/types/app/bsky/feed/generator.ts
+++ b/packages/api/src/client/types/app/bsky/feed/generator.ts
@@ -19,6 +19,10 @@ export interface Record {
   labels?:
     | ComAtprotoLabelDefs.SelfLabels
     | { $type: string; [k: string]: unknown }
+  contentMode?:
+    | 'app.bsky.feed.defs#contentModeUnspecified'
+    | 'app.bsky.feed.defs#contentModeVideo'
+    | (string & {})
   createdAt: string
   [k: string]: unknown
 }
diff --git a/packages/bsky/src/lexicon/index.ts b/packages/bsky/src/lexicon/index.ts
index 89ee5f3b2fa..27ddc898f4d 100644
--- a/packages/bsky/src/lexicon/index.ts
+++ b/packages/bsky/src/lexicon/index.ts
@@ -181,6 +181,8 @@ export const APP_BSKY_FEED = {
   DefsClickthroughAuthor: 'app.bsky.feed.defs#clickthroughAuthor',
   DefsClickthroughReposter: 'app.bsky.feed.defs#clickthroughReposter',
   DefsClickthroughEmbed: 'app.bsky.feed.defs#clickthroughEmbed',
+  DefsContentModeUnspecified: 'app.bsky.feed.defs#contentModeUnspecified',
+  DefsContentModeVideo: 'app.bsky.feed.defs#contentModeVideo',
   DefsInteractionSeen: 'app.bsky.feed.defs#interactionSeen',
   DefsInteractionLike: 'app.bsky.feed.defs#interactionLike',
   DefsInteractionRepost: 'app.bsky.feed.defs#interactionRepost',
diff --git a/packages/bsky/src/lexicon/lexicons.ts b/packages/bsky/src/lexicon/lexicons.ts
index d16b479f5ef..397370e3bc3 100644
--- a/packages/bsky/src/lexicon/lexicons.ts
+++ b/packages/bsky/src/lexicon/lexicons.ts
@@ -5778,6 +5778,13 @@ export const schemaDict = {
             type: 'ref',
             ref: 'lex:app.bsky.feed.defs#generatorViewerState',
           },
+          contentMode: {
+            type: 'string',
+            knownValues: [
+              'app.bsky.feed.defs#contentModeUnspecified',
+              'app.bsky.feed.defs#contentModeVideo',
+            ],
+          },
           indexedAt: {
             type: 'string',
             format: 'datetime',
@@ -5912,6 +5919,15 @@ export const schemaDict = {
         description:
           'User clicked through to the embedded content of the feed item',
       },
+      contentModeUnspecified: {
+        type: 'token',
+        description: 'Declares the feed generator returns any types of posts.',
+      },
+      contentModeVideo: {
+        type: 'token',
+        description:
+          'Declares the feed generator returns posts containing app.bsky.embed.video embeds.',
+      },
       interactionSeen: {
         type: 'token',
         description: 'Feed item was seen by user',
@@ -6043,6 +6059,13 @@ export const schemaDict = {
               description: 'Self-label values',
               refs: ['lex:com.atproto.label.defs#selfLabels'],
             },
+            contentMode: {
+              type: 'string',
+              knownValues: [
+                'app.bsky.feed.defs#contentModeUnspecified',
+                'app.bsky.feed.defs#contentModeVideo',
+              ],
+            },
             createdAt: {
               type: 'string',
               format: 'datetime',
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/defs.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/defs.ts
index 1c6f6ce78f6..4472369375e 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/defs.ts
@@ -247,6 +247,10 @@ export interface GeneratorView {
   acceptsInteractions?: boolean
   labels?: ComAtprotoLabelDefs.Label[]
   viewer?: GeneratorViewerState
+  contentMode?:
+    | 'app.bsky.feed.defs#contentModeUnspecified'
+    | 'app.bsky.feed.defs#contentModeVideo'
+    | (string & {})
   indexedAt: string
   [k: string]: unknown
 }
@@ -401,6 +405,11 @@ export const CLICKTHROUGHAUTHOR = 'app.bsky.feed.defs#clickthroughAuthor'
 export const CLICKTHROUGHREPOSTER = 'app.bsky.feed.defs#clickthroughReposter'
 /** User clicked through to the embedded content of the feed item */
 export const CLICKTHROUGHEMBED = 'app.bsky.feed.defs#clickthroughEmbed'
+/** Declares the feed generator returns any types of posts. */
+export const CONTENTMODEUNSPECIFIED =
+  'app.bsky.feed.defs#contentModeUnspecified'
+/** Declares the feed generator returns posts containing app.bsky.embed.video embeds. */
+export const CONTENTMODEVIDEO = 'app.bsky.feed.defs#contentModeVideo'
 /** Feed item was seen by user */
 export const INTERACTIONSEEN = 'app.bsky.feed.defs#interactionSeen'
 /** User liked the feed item */
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/generator.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/generator.ts
index eb8e8d0f633..482c7a7444e 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/generator.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/generator.ts
@@ -19,6 +19,10 @@ export interface Record {
   labels?:
     | ComAtprotoLabelDefs.SelfLabels
     | { $type: string; [k: string]: unknown }
+  contentMode?:
+    | 'app.bsky.feed.defs#contentModeUnspecified'
+    | 'app.bsky.feed.defs#contentModeVideo'
+    | (string & {})
   createdAt: string
   [k: string]: unknown
 }
diff --git a/packages/bsky/src/views/index.ts b/packages/bsky/src/views/index.ts
index 7f61ec92a6b..ee511b3a9a4 100644
--- a/packages/bsky/src/views/index.ts
+++ b/packages/bsky/src/views/index.ts
@@ -572,6 +572,7 @@ export class Views {
             like: viewer.like,
           }
         : undefined,
+      contentMode: feedgen.record.contentMode,
       indexedAt: this.indexedAt(feedgen).toISOString(),
     }
   }
diff --git a/packages/bsky/tests/__snapshots__/feed-generation.test.ts.snap b/packages/bsky/tests/__snapshots__/feed-generation.test.ts.snap
index b69224bd3ce..da7a8fe5041 100644
--- a/packages/bsky/tests/__snapshots__/feed-generation.test.ts.snap
+++ b/packages/bsky/tests/__snapshots__/feed-generation.test.ts.snap
@@ -324,6 +324,7 @@ Array [
   },
   Object {
     "cid": "cids(3)",
+    "contentMode": "app.bsky.feed.defs#contentModeVideo",
     "creator": Object {
       "avatar": "https://bsky.public.url/img/avatar/plain/user(2)/cids(1)@jpeg",
       "createdAt": "1970-01-01T00:00:00.000Z",
@@ -355,9 +356,9 @@ Array [
         "muted": false,
       },
     },
-    "description": "Provides all feed candidates when authed",
+    "description": "Has a contentMode specified",
     "did": "user(0)",
-    "displayName": "Needs Auth",
+    "displayName": "Content mode video",
     "indexedAt": "1970-01-01T00:00:00.000Z",
     "labels": Array [],
     "likeCount": 0,
@@ -397,9 +398,9 @@ Array [
         "muted": false,
       },
     },
-    "description": "Echoes back the same cursor it received",
+    "description": "Provides all feed candidates when authed",
     "did": "user(0)",
-    "displayName": "Bad Pagination Cursor",
+    "displayName": "Needs Auth",
     "indexedAt": "1970-01-01T00:00:00.000Z",
     "labels": Array [],
     "likeCount": 0,
@@ -439,9 +440,9 @@ Array [
         "muted": false,
       },
     },
-    "description": "Provides all feed candidates, blindly ignoring pagination limit",
+    "description": "Echoes back the same cursor it received",
     "did": "user(0)",
-    "displayName": "Bad Pagination Limit",
+    "displayName": "Bad Pagination Cursor",
     "indexedAt": "1970-01-01T00:00:00.000Z",
     "labels": Array [],
     "likeCount": 0,
@@ -481,9 +482,9 @@ Array [
         "muted": false,
       },
     },
-    "description": "Provides even-indexed feed candidates",
+    "description": "Provides all feed candidates, blindly ignoring pagination limit",
     "did": "user(0)",
-    "displayName": "Even",
+    "displayName": "Bad Pagination Limit",
     "indexedAt": "1970-01-01T00:00:00.000Z",
     "labels": Array [],
     "likeCount": 0,
@@ -523,15 +524,57 @@ Array [
         "muted": false,
       },
     },
+    "description": "Provides even-indexed feed candidates",
+    "did": "user(0)",
+    "displayName": "Even",
+    "indexedAt": "1970-01-01T00:00:00.000Z",
+    "labels": Array [],
+    "likeCount": 0,
+    "uri": "record(8)",
+    "viewer": Object {},
+  },
+  Object {
+    "cid": "cids(8)",
+    "creator": Object {
+      "avatar": "https://bsky.public.url/img/avatar/plain/user(2)/cids(1)@jpeg",
+      "createdAt": "1970-01-01T00:00:00.000Z",
+      "description": "its me!",
+      "did": "user(1)",
+      "displayName": "ali",
+      "handle": "alice.test",
+      "indexedAt": "1970-01-01T00:00:00.000Z",
+      "labels": Array [
+        Object {
+          "cid": "cids(2)",
+          "cts": "1970-01-01T00:00:00.000Z",
+          "src": "user(1)",
+          "uri": "record(3)",
+          "val": "self-label-a",
+        },
+        Object {
+          "cid": "cids(2)",
+          "cts": "1970-01-01T00:00:00.000Z",
+          "src": "user(1)",
+          "uri": "record(3)",
+          "val": "self-label-b",
+        },
+      ],
+      "viewer": Object {
+        "blockedBy": false,
+        "followedBy": "record(2)",
+        "following": "record(1)",
+        "muted": false,
+      },
+    },
     "description": "Provides all feed candidates",
     "did": "user(0)",
     "displayName": "All",
     "indexedAt": "1970-01-01T00:00:00.000Z",
     "labels": Array [],
     "likeCount": 2,
-    "uri": "record(8)",
+    "uri": "record(9)",
     "viewer": Object {
-      "like": "record(9)",
+      "like": "record(10)",
     },
   },
 ]
@@ -1723,6 +1766,56 @@ Array [
 ]
 `;
 
+exports[`feed generation getFeedGenerator describes a feed gen & returns content mode 1`] = `
+Object {
+  "isOnline": true,
+  "isValid": true,
+  "view": Object {
+    "cid": "cids(0)",
+    "contentMode": "app.bsky.feed.defs#contentModeVideo",
+    "creator": Object {
+      "avatar": "https://bsky.public.url/img/avatar/plain/user(2)/cids(1)@jpeg",
+      "createdAt": "1970-01-01T00:00:00.000Z",
+      "description": "its me!",
+      "did": "user(1)",
+      "displayName": "ali",
+      "handle": "alice.test",
+      "indexedAt": "1970-01-01T00:00:00.000Z",
+      "labels": Array [
+        Object {
+          "cid": "cids(2)",
+          "cts": "1970-01-01T00:00:00.000Z",
+          "src": "user(1)",
+          "uri": "record(3)",
+          "val": "self-label-a",
+        },
+        Object {
+          "cid": "cids(2)",
+          "cts": "1970-01-01T00:00:00.000Z",
+          "src": "user(1)",
+          "uri": "record(3)",
+          "val": "self-label-b",
+        },
+      ],
+      "viewer": Object {
+        "blockedBy": false,
+        "followedBy": "record(2)",
+        "following": "record(1)",
+        "muted": false,
+      },
+    },
+    "description": "Has a contentMode specified",
+    "did": "user(0)",
+    "displayName": "Content mode video",
+    "indexedAt": "1970-01-01T00:00:00.000Z",
+    "labels": Array [],
+    "likeCount": 0,
+    "uri": "record(0)",
+    "viewer": Object {},
+  },
+}
+`;
+
 exports[`feed generation getFeedGenerator describes a feed gen & returns online status 1`] = `
 Object {
   "isOnline": true,
diff --git a/packages/bsky/tests/feed-generation.test.ts b/packages/bsky/tests/feed-generation.test.ts
index 105e11c19d9..47d144ea1b5 100644
--- a/packages/bsky/tests/feed-generation.test.ts
+++ b/packages/bsky/tests/feed-generation.test.ts
@@ -35,6 +35,7 @@ describe('feed generation', () => {
   let feedUriPrime: string // Taken-down
   let feedUriPrimeRef: RecordRef
   let feedUriNeedsAuth: string
+  let feedUriContentModeVideo: string
   let starterPackRef: { uri: string; cid: string }
 
   beforeAll(async () => {
@@ -173,6 +174,17 @@ describe('feed generation', () => {
       },
       sc.getHeaders(alice),
     )
+    const contentModeVideo = await pdsAgent.api.app.bsky.feed.generator.create(
+      { repo: alice, rkey: 'content-mode-video' },
+      {
+        did: gen.did,
+        displayName: 'Content mode video',
+        description: 'Has a contentMode specified',
+        createdAt: new Date().toISOString(),
+        contentMode: 'app.bsky.feed.defs#contentModeVideo',
+      },
+      sc.getHeaders(alice),
+    )
     await network.processAll()
     await network.bsky.ctx.dataplane.takedownRecord({
       recordUri: prime.uri,
@@ -187,6 +199,7 @@ describe('feed generation', () => {
     feedUriPrime = prime.uri
     feedUriPrimeRef = new RecordRef(prime.uri, prime.cid)
     feedUriNeedsAuth = needsAuth.uri
+    feedUriContentModeVideo = contentModeVideo.uri
   })
 
   it('feed gen records can be updated', async () => {
@@ -229,13 +242,14 @@ describe('feed generation', () => {
 
     const paginatedAll = results(await paginateAll(paginator))
 
-    expect(paginatedAll.length).toEqual(6)
+    expect(paginatedAll.length).toEqual(7)
     expect(paginatedAll[0].uri).toEqual(feedUriOdd)
-    expect(paginatedAll[1].uri).toEqual(feedUriNeedsAuth)
-    expect(paginatedAll[2].uri).toEqual(feedUriBadPaginationCursor)
-    expect(paginatedAll[3].uri).toEqual(feedUriBadPaginationLimit)
-    expect(paginatedAll[4].uri).toEqual(feedUriEven)
-    expect(paginatedAll[5].uri).toEqual(feedUriAll)
+    expect(paginatedAll[1].uri).toEqual(feedUriContentModeVideo)
+    expect(paginatedAll[2].uri).toEqual(feedUriNeedsAuth)
+    expect(paginatedAll[3].uri).toEqual(feedUriBadPaginationCursor)
+    expect(paginatedAll[4].uri).toEqual(feedUriBadPaginationLimit)
+    expect(paginatedAll[5].uri).toEqual(feedUriEven)
+    expect(paginatedAll[6].uri).toEqual(feedUriAll)
     expect(paginatedAll.map((fg) => fg.uri)).not.toContain(feedUriPrime) // taken-down
     expect(forSnapshot(paginatedAll)).toMatchSnapshot()
   })
@@ -399,6 +413,22 @@ describe('feed generation', () => {
       expect(resEven.data.isValid).toBe(true)
     })
 
+    it('describes a feed gen & returns content mode', async () => {
+      const resEven = await agent.api.app.bsky.feed.getFeedGenerator(
+        { feed: feedUriContentModeVideo },
+        {
+          headers: await network.serviceHeaders(
+            sc.dids.bob,
+            ids.AppBskyFeedGetFeedGenerator,
+          ),
+        },
+      )
+      expect(forSnapshot(resEven.data)).toMatchSnapshot()
+      expect(resEven.data.view.contentMode).toBe(
+        'app.bsky.feed.defs#contentModeVideo',
+      )
+    })
+
     it('does not describe taken-down feed', async () => {
       const tryGetFeed = agent.api.app.bsky.feed.getFeedGenerator(
         { feed: feedUriPrime },
diff --git a/packages/ozone/src/lexicon/index.ts b/packages/ozone/src/lexicon/index.ts
index e5015348f6c..dc68082677f 100644
--- a/packages/ozone/src/lexicon/index.ts
+++ b/packages/ozone/src/lexicon/index.ts
@@ -211,6 +211,8 @@ export const APP_BSKY_FEED = {
   DefsClickthroughAuthor: 'app.bsky.feed.defs#clickthroughAuthor',
   DefsClickthroughReposter: 'app.bsky.feed.defs#clickthroughReposter',
   DefsClickthroughEmbed: 'app.bsky.feed.defs#clickthroughEmbed',
+  DefsContentModeUnspecified: 'app.bsky.feed.defs#contentModeUnspecified',
+  DefsContentModeVideo: 'app.bsky.feed.defs#contentModeVideo',
   DefsInteractionSeen: 'app.bsky.feed.defs#interactionSeen',
   DefsInteractionLike: 'app.bsky.feed.defs#interactionLike',
   DefsInteractionRepost: 'app.bsky.feed.defs#interactionRepost',
diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
index 963fbee538b..154f03f9aa1 100644
--- a/packages/ozone/src/lexicon/lexicons.ts
+++ b/packages/ozone/src/lexicon/lexicons.ts
@@ -5778,6 +5778,13 @@ export const schemaDict = {
             type: 'ref',
             ref: 'lex:app.bsky.feed.defs#generatorViewerState',
           },
+          contentMode: {
+            type: 'string',
+            knownValues: [
+              'app.bsky.feed.defs#contentModeUnspecified',
+              'app.bsky.feed.defs#contentModeVideo',
+            ],
+          },
           indexedAt: {
             type: 'string',
             format: 'datetime',
@@ -5912,6 +5919,15 @@ export const schemaDict = {
         description:
           'User clicked through to the embedded content of the feed item',
       },
+      contentModeUnspecified: {
+        type: 'token',
+        description: 'Declares the feed generator returns any types of posts.',
+      },
+      contentModeVideo: {
+        type: 'token',
+        description:
+          'Declares the feed generator returns posts containing app.bsky.embed.video embeds.',
+      },
       interactionSeen: {
         type: 'token',
         description: 'Feed item was seen by user',
@@ -6043,6 +6059,13 @@ export const schemaDict = {
               description: 'Self-label values',
               refs: ['lex:com.atproto.label.defs#selfLabels'],
             },
+            contentMode: {
+              type: 'string',
+              knownValues: [
+                'app.bsky.feed.defs#contentModeUnspecified',
+                'app.bsky.feed.defs#contentModeVideo',
+              ],
+            },
             createdAt: {
               type: 'string',
               format: 'datetime',
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/defs.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/defs.ts
index 1c6f6ce78f6..4472369375e 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/defs.ts
@@ -247,6 +247,10 @@ export interface GeneratorView {
   acceptsInteractions?: boolean
   labels?: ComAtprotoLabelDefs.Label[]
   viewer?: GeneratorViewerState
+  contentMode?:
+    | 'app.bsky.feed.defs#contentModeUnspecified'
+    | 'app.bsky.feed.defs#contentModeVideo'
+    | (string & {})
   indexedAt: string
   [k: string]: unknown
 }
@@ -401,6 +405,11 @@ export const CLICKTHROUGHAUTHOR = 'app.bsky.feed.defs#clickthroughAuthor'
 export const CLICKTHROUGHREPOSTER = 'app.bsky.feed.defs#clickthroughReposter'
 /** User clicked through to the embedded content of the feed item */
 export const CLICKTHROUGHEMBED = 'app.bsky.feed.defs#clickthroughEmbed'
+/** Declares the feed generator returns any types of posts. */
+export const CONTENTMODEUNSPECIFIED =
+  'app.bsky.feed.defs#contentModeUnspecified'
+/** Declares the feed generator returns posts containing app.bsky.embed.video embeds. */
+export const CONTENTMODEVIDEO = 'app.bsky.feed.defs#contentModeVideo'
 /** Feed item was seen by user */
 export const INTERACTIONSEEN = 'app.bsky.feed.defs#interactionSeen'
 /** User liked the feed item */
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/generator.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/generator.ts
index eb8e8d0f633..482c7a7444e 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/generator.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/generator.ts
@@ -19,6 +19,10 @@ export interface Record {
   labels?:
     | ComAtprotoLabelDefs.SelfLabels
     | { $type: string; [k: string]: unknown }
+  contentMode?:
+    | 'app.bsky.feed.defs#contentModeUnspecified'
+    | 'app.bsky.feed.defs#contentModeVideo'
+    | (string & {})
   createdAt: string
   [k: string]: unknown
 }
diff --git a/packages/pds/src/lexicon/index.ts b/packages/pds/src/lexicon/index.ts
index e5015348f6c..dc68082677f 100644
--- a/packages/pds/src/lexicon/index.ts
+++ b/packages/pds/src/lexicon/index.ts
@@ -211,6 +211,8 @@ export const APP_BSKY_FEED = {
   DefsClickthroughAuthor: 'app.bsky.feed.defs#clickthroughAuthor',
   DefsClickthroughReposter: 'app.bsky.feed.defs#clickthroughReposter',
   DefsClickthroughEmbed: 'app.bsky.feed.defs#clickthroughEmbed',
+  DefsContentModeUnspecified: 'app.bsky.feed.defs#contentModeUnspecified',
+  DefsContentModeVideo: 'app.bsky.feed.defs#contentModeVideo',
   DefsInteractionSeen: 'app.bsky.feed.defs#interactionSeen',
   DefsInteractionLike: 'app.bsky.feed.defs#interactionLike',
   DefsInteractionRepost: 'app.bsky.feed.defs#interactionRepost',
diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
index 963fbee538b..154f03f9aa1 100644
--- a/packages/pds/src/lexicon/lexicons.ts
+++ b/packages/pds/src/lexicon/lexicons.ts
@@ -5778,6 +5778,13 @@ export const schemaDict = {
             type: 'ref',
             ref: 'lex:app.bsky.feed.defs#generatorViewerState',
           },
+          contentMode: {
+            type: 'string',
+            knownValues: [
+              'app.bsky.feed.defs#contentModeUnspecified',
+              'app.bsky.feed.defs#contentModeVideo',
+            ],
+          },
           indexedAt: {
             type: 'string',
             format: 'datetime',
@@ -5912,6 +5919,15 @@ export const schemaDict = {
         description:
           'User clicked through to the embedded content of the feed item',
       },
+      contentModeUnspecified: {
+        type: 'token',
+        description: 'Declares the feed generator returns any types of posts.',
+      },
+      contentModeVideo: {
+        type: 'token',
+        description:
+          'Declares the feed generator returns posts containing app.bsky.embed.video embeds.',
+      },
       interactionSeen: {
         type: 'token',
         description: 'Feed item was seen by user',
@@ -6043,6 +6059,13 @@ export const schemaDict = {
               description: 'Self-label values',
               refs: ['lex:com.atproto.label.defs#selfLabels'],
             },
+            contentMode: {
+              type: 'string',
+              knownValues: [
+                'app.bsky.feed.defs#contentModeUnspecified',
+                'app.bsky.feed.defs#contentModeVideo',
+              ],
+            },
             createdAt: {
               type: 'string',
               format: 'datetime',
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/defs.ts b/packages/pds/src/lexicon/types/app/bsky/feed/defs.ts
index 1c6f6ce78f6..4472369375e 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/defs.ts
@@ -247,6 +247,10 @@ export interface GeneratorView {
   acceptsInteractions?: boolean
   labels?: ComAtprotoLabelDefs.Label[]
   viewer?: GeneratorViewerState
+  contentMode?:
+    | 'app.bsky.feed.defs#contentModeUnspecified'
+    | 'app.bsky.feed.defs#contentModeVideo'
+    | (string & {})
   indexedAt: string
   [k: string]: unknown
 }
@@ -401,6 +405,11 @@ export const CLICKTHROUGHAUTHOR = 'app.bsky.feed.defs#clickthroughAuthor'
 export const CLICKTHROUGHREPOSTER = 'app.bsky.feed.defs#clickthroughReposter'
 /** User clicked through to the embedded content of the feed item */
 export const CLICKTHROUGHEMBED = 'app.bsky.feed.defs#clickthroughEmbed'
+/** Declares the feed generator returns any types of posts. */
+export const CONTENTMODEUNSPECIFIED =
+  'app.bsky.feed.defs#contentModeUnspecified'
+/** Declares the feed generator returns posts containing app.bsky.embed.video embeds. */
+export const CONTENTMODEVIDEO = 'app.bsky.feed.defs#contentModeVideo'
 /** Feed item was seen by user */
 export const INTERACTIONSEEN = 'app.bsky.feed.defs#interactionSeen'
 /** User liked the feed item */
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/generator.ts b/packages/pds/src/lexicon/types/app/bsky/feed/generator.ts
index eb8e8d0f633..482c7a7444e 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/generator.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/generator.ts
@@ -19,6 +19,10 @@ export interface Record {
   labels?:
     | ComAtprotoLabelDefs.SelfLabels
     | { $type: string; [k: string]: unknown }
+  contentMode?:
+    | 'app.bsky.feed.defs#contentModeUnspecified'
+    | 'app.bsky.feed.defs#contentModeVideo'
+    | (string & {})
   createdAt: string
   [k: string]: unknown
 }

From 5417476622ff5a97daaa00e2f57bae90dea2a22e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 17 Jan 2025 20:32:20 -0300
Subject: [PATCH 010/101] Version packages (#3380)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/dull-zebras-prove.md                     |  6 ------
 .changeset/silver-birds-run.md                      |  5 -----
 packages/api/CHANGELOG.md                           |  6 ++++++
 packages/api/package.json                           |  2 +-
 packages/bsky/CHANGELOG.md                          | 10 ++++++++++
 packages/bsky/package.json                          |  2 +-
 packages/dev-env/CHANGELOG.md                       | 10 ++++++++++
 packages/dev-env/package.json                       |  2 +-
 packages/internal/fetch-node/CHANGELOG.md           |  6 ++++++
 packages/internal/fetch-node/package.json           |  2 +-
 packages/internal/handle-resolver-node/CHANGELOG.md |  7 +++++++
 packages/internal/handle-resolver-node/package.json |  2 +-
 packages/oauth/oauth-client-node/CHANGELOG.md       |  7 +++++++
 packages/oauth/oauth-client-node/package.json       |  2 +-
 packages/oauth/oauth-provider/CHANGELOG.md          |  7 +++++++
 packages/oauth/oauth-provider/package.json          |  2 +-
 packages/ozone/CHANGELOG.md                         |  7 +++++++
 packages/ozone/package.json                         |  2 +-
 packages/pds/CHANGELOG.md                           |  9 +++++++++
 packages/pds/package.json                           |  2 +-
 20 files changed, 78 insertions(+), 20 deletions(-)
 delete mode 100644 .changeset/dull-zebras-prove.md
 delete mode 100644 .changeset/silver-birds-run.md

diff --git a/.changeset/dull-zebras-prove.md b/.changeset/dull-zebras-prove.md
deleted file mode 100644
index ba8bc98a662..00000000000
--- a/.changeset/dull-zebras-prove.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"@atproto/bsky": patch
-"@atproto/api": patch
----
-
-add feedgen content mode lexicon spec
diff --git a/.changeset/silver-birds-run.md b/.changeset/silver-birds-run.md
deleted file mode 100644
index 2521fe33e1a..00000000000
--- a/.changeset/silver-birds-run.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto-labs/fetch-node": patch
----
-
-Unicast checks should permit PSL domains.
diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md
index 10b4099374f..5de7eea7b3f 100644
--- a/packages/api/CHANGELOG.md
+++ b/packages/api/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @atproto/api
 
+## 0.13.28
+
+### Patch Changes
+
+- [#3389](https://github.com/bluesky-social/atproto/pull/3389) [`cbf17066f`](https://github.com/bluesky-social/atproto/commit/cbf17066f314fbc7f2e943127ee4a9f589f8bec2) Thanks [@rafaelbsky](https://github.com/rafaelbsky)! - add feedgen content mode lexicon spec
+
 ## 0.13.27
 
 ### Patch Changes
diff --git a/packages/api/package.json b/packages/api/package.json
index a59b20f9802..a3591f1a6d4 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/api",
-  "version": "0.13.27",
+  "version": "0.13.28",
   "license": "MIT",
   "description": "Client library for atproto and Bluesky",
   "keywords": [
diff --git a/packages/bsky/CHANGELOG.md b/packages/bsky/CHANGELOG.md
index 094443d3850..5daef0e68fa 100644
--- a/packages/bsky/CHANGELOG.md
+++ b/packages/bsky/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @atproto/bsky
 
+## 0.0.108
+
+### Patch Changes
+
+- [#3389](https://github.com/bluesky-social/atproto/pull/3389) [`cbf17066f`](https://github.com/bluesky-social/atproto/commit/cbf17066f314fbc7f2e943127ee4a9f589f8bec2) Thanks [@rafaelbsky](https://github.com/rafaelbsky)! - add feedgen content mode lexicon spec
+
+- Updated dependencies [[`cbf17066f`](https://github.com/bluesky-social/atproto/commit/cbf17066f314fbc7f2e943127ee4a9f589f8bec2), [`9c0128193`](https://github.com/bluesky-social/atproto/commit/9c01281931a371304bcfa465005d7363c003bc5f)]:
+  - @atproto/api@0.13.28
+  - @atproto-labs/fetch-node@0.1.6
+
 ## 0.0.107
 
 ### Patch Changes
diff --git a/packages/bsky/package.json b/packages/bsky/package.json
index 8975c6ead18..3fa14aa087e 100644
--- a/packages/bsky/package.json
+++ b/packages/bsky/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.107",
+  "version": "0.0.108",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
diff --git a/packages/dev-env/CHANGELOG.md b/packages/dev-env/CHANGELOG.md
index 4da48580c6e..6301d867f1f 100644
--- a/packages/dev-env/CHANGELOG.md
+++ b/packages/dev-env/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @atproto/dev-env
 
+## 0.3.78
+
+### Patch Changes
+
+- Updated dependencies [[`cbf17066f`](https://github.com/bluesky-social/atproto/commit/cbf17066f314fbc7f2e943127ee4a9f589f8bec2)]:
+  - @atproto/bsky@0.0.108
+  - @atproto/api@0.13.28
+  - @atproto/pds@0.4.86
+  - @atproto/ozone@0.1.69
+
 ## 0.3.77
 
 ### Patch Changes
diff --git a/packages/dev-env/package.json b/packages/dev-env/package.json
index 02ac33ad3d0..bacd2e20d7b 100644
--- a/packages/dev-env/package.json
+++ b/packages/dev-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/dev-env",
-  "version": "0.3.77",
+  "version": "0.3.78",
   "license": "MIT",
   "description": "Local development environment helper for atproto development",
   "keywords": [
diff --git a/packages/internal/fetch-node/CHANGELOG.md b/packages/internal/fetch-node/CHANGELOG.md
index 99cfaf36e7c..86840a86316 100644
--- a/packages/internal/fetch-node/CHANGELOG.md
+++ b/packages/internal/fetch-node/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @atproto-labs/fetch-node
 
+## 0.1.6
+
+### Patch Changes
+
+- [#3379](https://github.com/bluesky-social/atproto/pull/3379) [`9c0128193`](https://github.com/bluesky-social/atproto/commit/9c01281931a371304bcfa465005d7363c003bc5f) Thanks [@devinivy](https://github.com/devinivy)! - Unicast checks should permit PSL domains.
+
 ## 0.1.5
 
 ### Patch Changes
diff --git a/packages/internal/fetch-node/package.json b/packages/internal/fetch-node/package.json
index 8c40d202053..b24a7aa8b86 100644
--- a/packages/internal/fetch-node/package.json
+++ b/packages/internal/fetch-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto-labs/fetch-node",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "license": "MIT",
   "description": "SSRF protection for fetch() in Node.js",
   "keywords": [
diff --git a/packages/internal/handle-resolver-node/CHANGELOG.md b/packages/internal/handle-resolver-node/CHANGELOG.md
index a92ff9b329f..7167efbf0d3 100644
--- a/packages/internal/handle-resolver-node/CHANGELOG.md
+++ b/packages/internal/handle-resolver-node/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto-labs/handle-resolver-node
 
+## 0.1.11
+
+### Patch Changes
+
+- Updated dependencies [[`9c0128193`](https://github.com/bluesky-social/atproto/commit/9c01281931a371304bcfa465005d7363c003bc5f)]:
+  - @atproto-labs/fetch-node@0.1.6
+
 ## 0.1.10
 
 ### Patch Changes
diff --git a/packages/internal/handle-resolver-node/package.json b/packages/internal/handle-resolver-node/package.json
index 4875d73aa12..b32221d7ce3 100644
--- a/packages/internal/handle-resolver-node/package.json
+++ b/packages/internal/handle-resolver-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto-labs/handle-resolver-node",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "license": "MIT",
   "description": "Node specific ATProto handle to DID resolver",
   "keywords": [
diff --git a/packages/oauth/oauth-client-node/CHANGELOG.md b/packages/oauth/oauth-client-node/CHANGELOG.md
index b1c070b1183..63db2e9e6ad 100644
--- a/packages/oauth/oauth-client-node/CHANGELOG.md
+++ b/packages/oauth/oauth-client-node/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/oauth-client-node
 
+## 0.2.8
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atproto-labs/handle-resolver-node@0.1.11
+
 ## 0.2.7
 
 ### Patch Changes
diff --git a/packages/oauth/oauth-client-node/package.json b/packages/oauth/oauth-client-node/package.json
index 82e50c7a535..abd1f6efafb 100644
--- a/packages/oauth/oauth-client-node/package.json
+++ b/packages/oauth/oauth-client-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/oauth-client-node",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "license": "MIT",
   "description": "ATPROTO OAuth client for the NodeJS",
   "keywords": [
diff --git a/packages/oauth/oauth-provider/CHANGELOG.md b/packages/oauth/oauth-provider/CHANGELOG.md
index 4820f7f3064..88a84cf6375 100644
--- a/packages/oauth/oauth-provider/CHANGELOG.md
+++ b/packages/oauth/oauth-provider/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/oauth-provider
 
+## 0.2.13
+
+### Patch Changes
+
+- Updated dependencies [[`9c0128193`](https://github.com/bluesky-social/atproto/commit/9c01281931a371304bcfa465005d7363c003bc5f)]:
+  - @atproto-labs/fetch-node@0.1.6
+
 ## 0.2.12
 
 ### Patch Changes
diff --git a/packages/oauth/oauth-provider/package.json b/packages/oauth/oauth-provider/package.json
index bec58305f2b..2e6d0be16a4 100644
--- a/packages/oauth/oauth-provider/package.json
+++ b/packages/oauth/oauth-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/oauth-provider",
-  "version": "0.2.12",
+  "version": "0.2.13",
   "license": "MIT",
   "description": "Generic OAuth2 and OpenID Connect provider for Node.js. Currently only supports features needed for Atproto.",
   "keywords": [
diff --git a/packages/ozone/CHANGELOG.md b/packages/ozone/CHANGELOG.md
index 8cc0d1d310c..ad89cff2d77 100644
--- a/packages/ozone/CHANGELOG.md
+++ b/packages/ozone/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/ozone
 
+## 0.1.69
+
+### Patch Changes
+
+- Updated dependencies [[`cbf17066f`](https://github.com/bluesky-social/atproto/commit/cbf17066f314fbc7f2e943127ee4a9f589f8bec2)]:
+  - @atproto/api@0.13.28
+
 ## 0.1.68
 
 ### Patch Changes
diff --git a/packages/ozone/package.json b/packages/ozone/package.json
index 56dc02b0be3..4a5842a4e96 100644
--- a/packages/ozone/package.json
+++ b/packages/ozone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.1.68",
+  "version": "0.1.69",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
diff --git a/packages/pds/CHANGELOG.md b/packages/pds/CHANGELOG.md
index f042ffa12cc..b9700a226a7 100644
--- a/packages/pds/CHANGELOG.md
+++ b/packages/pds/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @atproto/pds
 
+## 0.4.86
+
+### Patch Changes
+
+- Updated dependencies [[`cbf17066f`](https://github.com/bluesky-social/atproto/commit/cbf17066f314fbc7f2e943127ee4a9f589f8bec2), [`9c0128193`](https://github.com/bluesky-social/atproto/commit/9c01281931a371304bcfa465005d7363c003bc5f)]:
+  - @atproto/api@0.13.28
+  - @atproto-labs/fetch-node@0.1.6
+  - @atproto/oauth-provider@0.2.13
+
 ## 0.4.85
 
 ### Patch Changes
diff --git a/packages/pds/package.json b/packages/pds/package.json
index 67c5c987eeb..6adaed06e1d 100644
--- a/packages/pds/package.json
+++ b/packages/pds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/pds",
-  "version": "0.4.85",
+  "version": "0.4.86",
   "license": "MIT",
   "description": "Reference implementation of atproto Personal Data Server (PDS)",
   "keywords": [

From ee9779d07405d991b6be1b1780dae7828ff9d619 Mon Sep 17 00:00:00 2001
From: Matthieu Sieben <matthieusieben@users.noreply.github.com>
Date: Mon, 20 Jan 2025 15:36:02 +0100
Subject: [PATCH 011/101] Add account details to queryStatuses (#3236)

* Moderation subjectStatusView with statistics

* add account stats to queue entries

* fix

* adapt

* review changes

* style

* review comments

* wip

* add indexes

* refresh materialized view

* use the background queue to refresh materialized views

* tidy

* fix verrify

* tidy

* Add filtering based on "minAccountSuspendCount"

* fix tests

* Update test snapshots

* update materialized views when running `processAll`

* tidy

* processAll sequentially

* tidy

* tidy

* fix dead lock
---
 lexicons/tools/ozone/moderation/defs.json     |  74 +++++
 .../tools/ozone/moderation/queryStatuses.json |  19 +-
 packages/api/src/client/lexicons.ts           | 101 +++++-
 .../types/tools/ozone/moderation/defs.ts      |  62 ++++
 .../tools/ozone/moderation/queryStatuses.ts   |  12 +-
 packages/dev-env/src/bin.ts                   |   1 +
 .../ozone/src/api/moderation/queryStatuses.ts |  64 +---
 packages/ozone/src/background.ts              | 154 ++++++++-
 packages/ozone/src/config/config.ts           |   2 +
 packages/ozone/src/config/env.ts              |   4 +
 packages/ozone/src/daemon/context.ts          |  48 ++-
 packages/ozone/src/daemon/index.ts            |   9 +-
 .../src/daemon/materialized-view-refresher.ts |  27 ++
 ...220T144630860Z-stats-materialized-views.ts | 218 +++++++++++++
 packages/ozone/src/db/migrations/index.ts     |   1 +
 .../src/db/schema/account_events_stats.ts     |  16 +
 .../db/schema/account_record_events_stats.ts  |  15 +
 .../db/schema/account_record_status_stats.ts  |  15 +
 packages/ozone/src/db/schema/index.ts         |  11 +-
 .../src/db/schema/record_events_stats.ts      |  15 +
 packages/ozone/src/index.ts                   |   8 +-
 packages/ozone/src/lexicon/lexicons.ts        | 101 +++++-
 .../types/tools/ozone/moderation/defs.ts      |  62 ++++
 .../tools/ozone/moderation/queryStatuses.ts   |  12 +-
 packages/ozone/src/mod-service/index.ts       | 299 +++++++++++-------
 packages/ozone/src/mod-service/status.ts      |  83 +++--
 packages/ozone/src/mod-service/types.ts       |  23 +-
 packages/ozone/src/mod-service/views.ts       | 114 ++++---
 packages/ozone/src/util.ts                    | 145 +++++++++
 .../__snapshots__/get-record.test.ts.snap     |  28 ++
 .../__snapshots__/get-records.test.ts.snap    |  14 +
 .../tests/__snapshots__/get-repo.test.ts.snap |  11 +
 .../__snapshots__/get-repos.test.ts.snap      |  11 +
 .../moderation-events.test.ts.snap            |  19 ++
 .../moderation-statuses.test.ts.snap          | 114 +++++++
 packages/ozone/tests/get-record.test.ts       |   4 +
 packages/ozone/tests/get-records.test.ts      |   4 +
 packages/ozone/tests/get-repo.test.ts         |   4 +
 packages/ozone/tests/get-repos.test.ts        |   4 +
 .../ozone/tests/moderation-events.test.ts     |   4 +
 .../ozone/tests/moderation-statuses.test.ts   |   4 +
 packages/ozone/tests/query-labels.test.ts     |   1 +
 packages/pds/src/lexicon/lexicons.ts          | 101 +++++-
 .../types/tools/ozone/moderation/defs.ts      |  62 ++++
 .../tools/ozone/moderation/queryStatuses.ts   |  12 +-
 .../takedown-appeal.test.ts.snap              |   6 +
 .../proxied/__snapshots__/admin.test.ts.snap  |  57 ++++
 packages/pds/tests/proxied/admin.test.ts      |   3 +
 48 files changed, 1878 insertions(+), 300 deletions(-)
 create mode 100644 packages/ozone/src/daemon/materialized-view-refresher.ts
 create mode 100644 packages/ozone/src/db/migrations/20241220T144630860Z-stats-materialized-views.ts
 create mode 100644 packages/ozone/src/db/schema/account_events_stats.ts
 create mode 100644 packages/ozone/src/db/schema/account_record_events_stats.ts
 create mode 100644 packages/ozone/src/db/schema/account_record_status_stats.ts
 create mode 100644 packages/ozone/src/db/schema/record_events_stats.ts

diff --git a/lexicons/tools/ozone/moderation/defs.json b/lexicons/tools/ozone/moderation/defs.json
index 7c590cddb3a..23bba198f24 100644
--- a/lexicons/tools/ozone/moderation/defs.json
+++ b/lexicons/tools/ozone/moderation/defs.json
@@ -182,6 +182,80 @@
         "tags": {
           "type": "array",
           "items": { "type": "string" }
+        },
+        "accountStats": {
+          "description": "Statistics related to the account subject",
+          "type": "ref",
+          "ref": "#accountStats"
+        },
+        "recordsStats": {
+          "description": "Statistics related to the record subjects authored by the subject's account",
+          "type": "ref",
+          "ref": "#recordsStats"
+        }
+      }
+    },
+    "accountStats": {
+      "description": "Statistics about a particular account subject",
+      "type": "object",
+      "properties": {
+        "reportCount": {
+          "description": "Total number of reports on the account",
+          "type": "integer"
+        },
+        "appealCount": {
+          "description": "Total number of appeals against a moderation action on the account",
+          "type": "integer"
+        },
+        "suspendCount": {
+          "description": "Number of times the account was suspended",
+          "type": "integer"
+        },
+        "escalateCount": {
+          "description": "Number of times the account was escalated",
+          "type": "integer"
+        },
+        "takedownCount": {
+          "description": "Number of times the account was taken down",
+          "type": "integer"
+        }
+      }
+    },
+    "recordsStats": {
+      "description": "Statistics about a set of record subject items",
+      "type": "object",
+      "properties": {
+        "totalReports": {
+          "description": "Cumulative sum of the number of reports on the items in the set",
+          "type": "integer"
+        },
+        "reportedCount": {
+          "description": "Number of items that were reported at least once",
+          "type": "integer"
+        },
+        "escalatedCount": {
+          "description": "Number of items that were escalated at least once",
+          "type": "integer"
+        },
+        "appealedCount": {
+          "description": "Number of items that were appealed at least once",
+          "type": "integer"
+        },
+        "subjectCount": {
+          "description": "Total number of item in the set",
+          "type": "integer"
+        },
+        "pendingCount": {
+          "description": "Number of item currently in \"reviewOpen\" or \"reviewEscalated\" state",
+          "type": "integer"
+        },
+        "processedCount": {
+          "description": "Number of item currently in \"reviewNone\" or \"reviewClosed\" state",
+          "type": "integer"
+        },
+        "takendownCount": {
+          "description": "Number of item currently taken down",
+          "type": "integer"
         }
       }
     },
diff --git a/lexicons/tools/ozone/moderation/queryStatuses.json b/lexicons/tools/ozone/moderation/queryStatuses.json
index a8ff110db84..c280b2ed61e 100644
--- a/lexicons/tools/ozone/moderation/queryStatuses.json
+++ b/lexicons/tools/ozone/moderation/queryStatuses.json
@@ -107,7 +107,12 @@
           "sortField": {
             "type": "string",
             "default": "lastReportedAt",
-            "enum": ["lastReviewedAt", "lastReportedAt"]
+            "enum": [
+              "lastReviewedAt",
+              "lastReportedAt",
+              "reportedRecordsCount",
+              "takendownRecordsCount"
+            ]
           },
           "sortDirection": {
             "type": "string",
@@ -158,6 +163,18 @@
             "type": "string",
             "description": "If specified, subjects of the given type (account or record) will be returned. When this is set to 'account' the 'collections' parameter will be ignored. When includeAllUserRecords or subject is set, this will be ignored.",
             "knownValues": ["account", "record"]
+          },
+          "minAccountSuspendCount": {
+            "type": "integer",
+            "description": "If specified, only subjects that belong to an account that has at least this many suspensions will be returned."
+          },
+          "minReportedRecordsCount": {
+            "type": "integer",
+            "description": "If specified, only subjects that belong to an account that has at least this many reported records will be returned."
+          },
+          "minTakendownRecordsCount": {
+            "type": "integer",
+            "description": "If specified, only subjects that belong to an account that has at least this many taken down records will be returned."
           }
         }
       },
diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
index 154f03f9aa1..40bfab70933 100644
--- a/packages/api/src/client/lexicons.ts
+++ b/packages/api/src/client/lexicons.ts
@@ -11322,6 +11322,85 @@ export const schemaDict = {
               type: 'string',
             },
           },
+          accountStats: {
+            description: 'Statistics related to the account subject',
+            type: 'ref',
+            ref: 'lex:tools.ozone.moderation.defs#accountStats',
+          },
+          recordsStats: {
+            description:
+              "Statistics related to the record subjects authored by the subject's account",
+            type: 'ref',
+            ref: 'lex:tools.ozone.moderation.defs#recordsStats',
+          },
+        },
+      },
+      accountStats: {
+        description: 'Statistics about a particular account subject',
+        type: 'object',
+        properties: {
+          reportCount: {
+            description: 'Total number of reports on the account',
+            type: 'integer',
+          },
+          appealCount: {
+            description:
+              'Total number of appeals against a moderation action on the account',
+            type: 'integer',
+          },
+          suspendCount: {
+            description: 'Number of times the account was suspended',
+            type: 'integer',
+          },
+          escalateCount: {
+            description: 'Number of times the account was escalated',
+            type: 'integer',
+          },
+          takedownCount: {
+            description: 'Number of times the account was taken down',
+            type: 'integer',
+          },
+        },
+      },
+      recordsStats: {
+        description: 'Statistics about a set of record subject items',
+        type: 'object',
+        properties: {
+          totalReports: {
+            description:
+              'Cumulative sum of the number of reports on the items in the set',
+            type: 'integer',
+          },
+          reportedCount: {
+            description: 'Number of items that were reported at least once',
+            type: 'integer',
+          },
+          escalatedCount: {
+            description: 'Number of items that were escalated at least once',
+            type: 'integer',
+          },
+          appealedCount: {
+            description: 'Number of items that were appealed at least once',
+            type: 'integer',
+          },
+          subjectCount: {
+            description: 'Total number of item in the set',
+            type: 'integer',
+          },
+          pendingCount: {
+            description:
+              'Number of item currently in "reviewOpen" or "reviewEscalated" state',
+            type: 'integer',
+          },
+          processedCount: {
+            description:
+              'Number of item currently in "reviewNone" or "reviewClosed" state',
+            type: 'integer',
+          },
+          takendownCount: {
+            description: 'Number of item currently taken down',
+            type: 'integer',
+          },
         },
       },
       subjectReviewState: {
@@ -12570,7 +12649,12 @@ export const schemaDict = {
             sortField: {
               type: 'string',
               default: 'lastReportedAt',
-              enum: ['lastReviewedAt', 'lastReportedAt'],
+              enum: [
+                'lastReviewedAt',
+                'lastReportedAt',
+                'reportedRecordsCount',
+                'takendownRecordsCount',
+              ],
             },
             sortDirection: {
               type: 'string',
@@ -12625,6 +12709,21 @@ export const schemaDict = {
                 "If specified, subjects of the given type (account or record) will be returned. When this is set to 'account' the 'collections' parameter will be ignored. When includeAllUserRecords or subject is set, this will be ignored.",
               knownValues: ['account', 'record'],
             },
+            minAccountSuspendCount: {
+              type: 'integer',
+              description:
+                'If specified, only subjects that belong to an account that has at least this many suspensions will be returned.',
+            },
+            minReportedRecordsCount: {
+              type: 'integer',
+              description:
+                'If specified, only subjects that belong to an account that has at least this many reported records will be returned.',
+            },
+            minTakendownRecordsCount: {
+              type: 'integer',
+              description:
+                'If specified, only subjects that belong to an account that has at least this many taken down records will be returned.',
+            },
           },
         },
         output: {
diff --git a/packages/api/src/client/types/tools/ozone/moderation/defs.ts b/packages/api/src/client/types/tools/ozone/moderation/defs.ts
index fd58278374b..df753c9cfc4 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/defs.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/defs.ts
@@ -136,6 +136,8 @@ export interface SubjectStatusView {
   appealed?: boolean
   suspendUntil?: string
   tags?: string[]
+  accountStats?: AccountStats
+  recordsStats?: RecordsStats
   [k: string]: unknown
 }
 
@@ -151,6 +153,66 @@ export function validateSubjectStatusView(v: unknown): ValidationResult {
   return lexicons.validate('tools.ozone.moderation.defs#subjectStatusView', v)
 }
 
+/** Statistics about a particular account subject */
+export interface AccountStats {
+  /** Total number of reports on the account */
+  reportCount?: number
+  /** Total number of appeals against a moderation action on the account */
+  appealCount?: number
+  /** Number of times the account was suspended */
+  suspendCount?: number
+  /** Number of times the account was escalated */
+  escalateCount?: number
+  /** Number of times the account was taken down */
+  takedownCount?: number
+  [k: string]: unknown
+}
+
+export function isAccountStats(v: unknown): v is AccountStats {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'tools.ozone.moderation.defs#accountStats'
+  )
+}
+
+export function validateAccountStats(v: unknown): ValidationResult {
+  return lexicons.validate('tools.ozone.moderation.defs#accountStats', v)
+}
+
+/** Statistics about a set of record subject items */
+export interface RecordsStats {
+  /** Cumulative sum of the number of reports on the items in the set */
+  totalReports?: number
+  /** Number of items that were reported at least once */
+  reportedCount?: number
+  /** Number of items that were escalated at least once */
+  escalatedCount?: number
+  /** Number of items that were appealed at least once */
+  appealedCount?: number
+  /** Total number of item in the set */
+  subjectCount?: number
+  /** Number of item currently in "reviewOpen" or "reviewEscalated" state */
+  pendingCount?: number
+  /** Number of item currently in "reviewNone" or "reviewClosed" state */
+  processedCount?: number
+  /** Number of item currently taken down */
+  takendownCount?: number
+  [k: string]: unknown
+}
+
+export function isRecordsStats(v: unknown): v is RecordsStats {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'tools.ozone.moderation.defs#recordsStats'
+  )
+}
+
+export function validateRecordsStats(v: unknown): ValidationResult {
+  return lexicons.validate('tools.ozone.moderation.defs#recordsStats', v)
+}
+
 export type SubjectReviewState =
   | 'lex:tools.ozone.moderation.defs#reviewOpen'
   | 'lex:tools.ozone.moderation.defs#reviewEscalated'
diff --git a/packages/api/src/client/types/tools/ozone/moderation/queryStatuses.ts b/packages/api/src/client/types/tools/ozone/moderation/queryStatuses.ts
index 2af6808ed19..97e22ff240c 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/queryStatuses.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/queryStatuses.ts
@@ -48,7 +48,11 @@ export interface QueryParams {
   ignoreSubjects?: string[]
   /** Get all subject statuses that were reviewed by a specific moderator */
   lastReviewedBy?: string
-  sortField?: 'lastReviewedAt' | 'lastReportedAt'
+  sortField?:
+    | 'lastReviewedAt'
+    | 'lastReportedAt'
+    | 'reportedRecordsCount'
+    | 'takendownRecordsCount'
   sortDirection?: 'asc' | 'desc'
   /** Get subjects that were taken down */
   takendown?: boolean
@@ -62,6 +66,12 @@ export interface QueryParams {
   collections?: string[]
   /** If specified, subjects of the given type (account or record) will be returned. When this is set to 'account' the 'collections' parameter will be ignored. When includeAllUserRecords or subject is set, this will be ignored. */
   subjectType?: 'account' | 'record' | (string & {})
+  /** If specified, only subjects that belong to an account that has at least this many suspensions will be returned. */
+  minAccountSuspendCount?: number
+  /** If specified, only subjects that belong to an account that has at least this many reported records will be returned. */
+  minReportedRecordsCount?: number
+  /** If specified, only subjects that belong to an account that has at least this many taken down records will be returned. */
+  minTakendownRecordsCount?: number
 }
 
 export type InputSchema = undefined
diff --git a/packages/dev-env/src/bin.ts b/packages/dev-env/src/bin.ts
index c0b8c5c7e2c..8f367b2cf8f 100644
--- a/packages/dev-env/src/bin.ts
+++ b/packages/dev-env/src/bin.ts
@@ -30,6 +30,7 @@ const run = async () => {
       port: 2587,
       chatUrl: 'http://localhost:2590', // must run separate chat service
       chatDid: 'did:example:chat',
+      dbMaterializedViewRefreshIntervalMs: 30_000,
     },
     introspect: { port: 2581 },
   })
diff --git a/packages/ozone/src/api/moderation/queryStatuses.ts b/packages/ozone/src/api/moderation/queryStatuses.ts
index c82fdee7091..a2f77560436 100644
--- a/packages/ozone/src/api/moderation/queryStatuses.ts
+++ b/packages/ozone/src/api/moderation/queryStatuses.ts
@@ -1,75 +1,13 @@
 import { Server } from '../../lexicon'
 import AppContext from '../../context'
-import { getReviewState } from '../util'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.moderation.queryStatuses({
     auth: ctx.authVerifier.modOrAdminToken,
     handler: async ({ params }) => {
-      const {
-        includeAllUserRecords,
-        subject,
-        takendown,
-        appealed,
-        reviewState,
-        reviewedAfter,
-        reviewedBefore,
-        reportedAfter,
-        reportedBefore,
-        ignoreSubjects,
-        lastReviewedBy,
-        hostingDeletedBefore,
-        hostingDeletedAfter,
-        hostingUpdatedBefore,
-        hostingUpdatedAfter,
-        hostingStatuses,
-        sortDirection = 'desc',
-        sortField = 'lastReportedAt',
-        includeMuted = false,
-        onlyMuted = false,
-        limit = 50,
-        cursor,
-        tags = [],
-        excludeTags = [],
-        collections = [],
-        subjectType,
-        queueCount,
-        queueIndex,
-        queueSeed,
-      } = params
       const db = ctx.db
       const modService = ctx.modService(db)
-      const results = await modService.getSubjectStatuses({
-        reviewState: getReviewState(reviewState),
-        includeAllUserRecords,
-        subject,
-        takendown,
-        appealed,
-        reviewedAfter,
-        reviewedBefore,
-        reportedAfter,
-        reportedBefore,
-        includeMuted,
-        hostingDeletedBefore,
-        hostingDeletedAfter,
-        hostingUpdatedBefore,
-        hostingUpdatedAfter,
-        hostingStatuses,
-        onlyMuted,
-        ignoreSubjects,
-        sortDirection,
-        lastReviewedBy,
-        sortField,
-        limit,
-        cursor,
-        tags,
-        excludeTags,
-        collections,
-        subjectType,
-        queueCount,
-        queueIndex,
-        queueSeed,
-      })
+      const results = await modService.getSubjectStatuses(params)
       const subjectStatuses = results.statuses.map((status) =>
         modService.views.formatSubjectStatus(status),
       )
diff --git a/packages/ozone/src/background.ts b/packages/ozone/src/background.ts
index 78cd790e779..5730dd3963c 100644
--- a/packages/ozone/src/background.ts
+++ b/packages/ozone/src/background.ts
@@ -1,35 +1,161 @@
 import PQueue from 'p-queue'
 import { Database } from './db'
 import { dbLogger } from './logger'
+import { boundAbortController, isCausedBySignal, startInterval } from './util'
 
-// A simple queue for in-process, out-of-band/backgrounded work
+type Task = (db: Database, signal: AbortSignal) => Promise<void>
 
+/**
+ * A simple queue for in-process, out-of-band/backgrounded work
+ */
 export class BackgroundQueue {
-  queue = new PQueue({ concurrency: 20 })
-  destroyed = false
-  constructor(public db: Database) {}
+  private abortController = new AbortController()
+  private queue = new PQueue({ concurrency: 20 })
 
-  add(task: Task) {
+  public get signal() {
+    return this.abortController.signal
+  }
+
+  public get destroyed() {
+    return this.signal.aborted
+  }
+
+  constructor(protected db: Database) {}
+
+  getStats() {
+    return {
+      runningCount: this.queue.pending,
+      waitingCount: this.queue.size,
+    }
+  }
+
+  /**
+   * Add a task that will be executed at some point in the future.
+   *
+   * The task will be executed even if the backgroundQueue is destroyed, unless
+   * the provided `signal` is aborted.
+   *
+   * The `signal` provided to the task will be aborted whenever either the
+   * backgroundQueue is destroyed or the provided `signal` is aborted.
+   */
+  async add(task: Task, signal?: AbortSignal): Promise<void> {
     if (this.destroyed) {
       return
     }
-    this.queue
-      .add(() => task(this.db))
-      .catch((err) => {
-        dbLogger.error(err, 'background queue task failed')
-      })
+
+    const abortController = boundAbortController(this.signal, signal)
+
+    return this.queue.add<void>(async () => {
+      try {
+        // Do not run the task if the signal provided to the task has become
+        // aborted. Do not use `abortController.signal` here since we do not
+        // want to abort the task if the backgroundQueue is being destroyed.
+        if (signal?.aborted) return
+
+        // The task will receive a "combined signal" allowing it to abort if
+        // either the backgroundQueue is destroyed or the provided signal is
+        // aborted.
+        await task(this.db, abortController.signal)
+      } catch (err) {
+        if (!isCausedBySignal(err, abortController.signal)) {
+          dbLogger.error(err, 'background queue task failed')
+        }
+      } finally {
+        abortController.abort()
+      }
+    })
   }
 
   async processAll() {
     await this.queue.onIdle()
   }
 
-  // On destroy we stop accepting new tasks, but complete all pending/in-progress tasks.
-  // The application calls this only once http connections have drained (tasks no longer being added).
+  /**
+   * On destroy we stop accepting new tasks, but complete all
+   * pending/in-progress tasks. Tasks can decide to abort their current
+   * operation based on the signal they received. The application calls this
+   * only once http connections have drained (tasks no longer being added).
+   */
   async destroy() {
-    this.destroyed = true
+    this.abortController.abort()
     await this.queue.onIdle()
   }
 }
 
-type Task = (db: Database) => Promise<void>
+/**
+ * A simple periodic background task runner. This class will schedule a task to
+ * run through a provided {@link BackgroundQueue} at a fixed interval. The task
+ * will never run more than once concurrently, and will wait at least `interval`
+ * milliseconds between the end of one run and the start of the next.
+ */
+export class PeriodicBackgroundTask {
+  private abortController: AbortController
+
+  private intervalPromise?: Promise<void>
+  private runningPromise?: Promise<void>
+
+  public get signal() {
+    return this.abortController.signal
+  }
+
+  public get destroyed() {
+    return this.signal.aborted
+  }
+
+  constructor(
+    protected backgroundQueue: BackgroundQueue,
+    protected interval: number,
+    protected task: Task,
+  ) {
+    if (!Number.isFinite(interval) || interval <= 0) {
+      throw new TypeError('interval must be a positive number')
+    }
+
+    // Bind this class's signal to the backgroundQueue's signal (destroying this
+    // instance if the backgroundQueue is destroyed)
+    this.abortController = boundAbortController(backgroundQueue.signal)
+  }
+
+  public run(signal?: AbortSignal): Promise<void> {
+    // `startInterval` already ensures that only one run is in progress at a
+    // time. However, we want to be able to expose a `run()` method that can be
+    // used to force a run, which could cause concurrent executions. We prevent
+    // this using the `runningPromise` property.
+
+    if (this.runningPromise) return this.runningPromise
+
+    // Combine the `this.signal` with the provided `signal`, if any.
+    const abortController = boundAbortController(this.signal, signal)
+
+    const promise = this.backgroundQueue.add(this.task, abortController.signal)
+
+    return (this.runningPromise = promise).finally(() => {
+      if (this.runningPromise === promise) this.runningPromise = undefined
+
+      // Cleanup the listeners added by `boundAbortController`
+      abortController.abort()
+    })
+  }
+
+  public start() {
+    // Noop if already started. Throws if this.signal is aborted (instance is
+    // destroyed).
+    this.intervalPromise ||= startInterval(
+      async (signal) => this.run(signal),
+      this.interval,
+      this.signal,
+    )
+  }
+
+  public async destroy() {
+    // @NOTE This instance does not "own" the backgroundQueue, so we do not
+    // destroy it here.
+
+    this.abortController.abort()
+    console.error('ABOOOORT')
+
+    await this.intervalPromise
+    this.intervalPromise = undefined
+    console.error('DONE -_-')
+  }
+}
diff --git a/packages/ozone/src/config/config.ts b/packages/ozone/src/config/config.ts
index a5eea6c5c1f..808163c15f1 100644
--- a/packages/ozone/src/config/config.ts
+++ b/packages/ozone/src/config/config.ts
@@ -24,6 +24,7 @@ export const envToCfg = (env: OzoneEnvironment): OzoneConfig => {
     poolSize: env.dbPoolSize,
     poolMaxUses: env.dbPoolMaxUses,
     poolIdleTimeoutMs: env.dbPoolIdleTimeoutMs,
+    materializedViewRefreshIntervalMs: env.dbMaterializedViewRefreshIntervalMs,
   }
 
   assert(env.appviewUrl, 'appviewUrl is required')
@@ -122,6 +123,7 @@ export type DatabaseConfig = {
   poolSize?: number
   poolMaxUses?: number
   poolIdleTimeoutMs?: number
+  materializedViewRefreshIntervalMs?: number
 }
 
 export type AppviewConfig = {
diff --git a/packages/ozone/src/config/env.ts b/packages/ozone/src/config/env.ts
index 173b874e78e..6d930c4e59c 100644
--- a/packages/ozone/src/config/env.ts
+++ b/packages/ozone/src/config/env.ts
@@ -20,6 +20,9 @@ export const readEnv = (): OzoneEnvironment => {
     dbPoolSize: envInt('OZONE_DB_POOL_SIZE'),
     dbPoolMaxUses: envInt('OZONE_DB_POOL_MAX_USES'),
     dbPoolIdleTimeoutMs: envInt('OZONE_DB_POOL_IDLE_TIMEOUT_MS'),
+    dbMaterializedViewRefreshIntervalMs: envInt(
+      'OZONE_DB_MATERIALIZED_VIEW_REFRESH_INTERVAL_MS',
+    ),
     didPlcUrl: envStr('OZONE_DID_PLC_URL'),
     didCacheStaleTTL: envInt('OZONE_DID_CACHE_STALE_TTL'),
     didCacheMaxTTL: envInt('OZONE_DID_CACHE_MAX_TTL'),
@@ -53,6 +56,7 @@ export type OzoneEnvironment = {
   dbPoolSize?: number
   dbPoolMaxUses?: number
   dbPoolIdleTimeoutMs?: number
+  dbMaterializedViewRefreshIntervalMs?: number
   didPlcUrl?: string
   didCacheStaleTTL?: number
   didCacheMaxTTL?: number
diff --git a/packages/ozone/src/daemon/context.ts b/packages/ozone/src/daemon/context.ts
index d81f3f4d78b..722ffa4655e 100644
--- a/packages/ozone/src/daemon/context.ts
+++ b/packages/ozone/src/daemon/context.ts
@@ -6,17 +6,20 @@ import { OzoneConfig, OzoneSecrets } from '../config'
 import { Database } from '../db'
 import { EventPusher } from './event-pusher'
 import { EventReverser } from './event-reverser'
-import { ModerationService, ModerationServiceCreator } from '../mod-service'
+import { ModerationService } from '../mod-service'
 import { BackgroundQueue } from '../background'
 import { getSigningKeyId } from '../util'
+import { MaterializedViewRefresher } from './materialized-view-refresher'
+import { allFulfilled } from '@atproto/common'
 
 export type DaemonContextOptions = {
   db: Database
   cfg: OzoneConfig
-  modService: ModerationServiceCreator
+  backgroundQueue: BackgroundQueue
   signingKey: Keypair
   eventPusher: EventPusher
   eventReverser: EventReverser
+  materializedViewRefresher: MaterializedViewRefresher
 }
 
 export class DaemonContext {
@@ -67,13 +70,19 @@ export class DaemonContext {
 
     const eventReverser = new EventReverser(db, modService)
 
+    const materializedViewRefresher = new MaterializedViewRefresher(
+      backgroundQueue,
+      cfg.db.materializedViewRefreshIntervalMs,
+    )
+
     return new DaemonContext({
       db,
       cfg,
-      modService,
+      backgroundQueue,
       signingKey,
       eventPusher,
       eventReverser,
+      materializedViewRefresher,
       ...(overrides ?? {}),
     })
   }
@@ -86,8 +95,8 @@ export class DaemonContext {
     return this.opts.cfg
   }
 
-  get modService(): ModerationServiceCreator {
-    return this.opts.modService
+  get backgroundQueue(): BackgroundQueue {
+    return this.opts.backgroundQueue
   }
 
   get eventPusher(): EventPusher {
@@ -97,6 +106,35 @@ export class DaemonContext {
   get eventReverser(): EventReverser {
     return this.opts.eventReverser
   }
+
+  get materializedViewRefresher(): MaterializedViewRefresher {
+    return this.opts.materializedViewRefresher
+  }
+
+  async start() {
+    this.eventPusher.start()
+    this.eventReverser.start()
+    this.materializedViewRefresher.start()
+  }
+
+  async processAll() {
+    // Sequential because the materialized view values depend on the events.
+    await this.eventPusher.processAll()
+    await this.materializedViewRefresher.run()
+  }
+
+  async destroy() {
+    try {
+      await allFulfilled([
+        this.eventReverser.destroy(),
+        this.eventPusher.destroy(),
+        this.materializedViewRefresher.destroy(),
+      ])
+    } finally {
+      await this.backgroundQueue.destroy()
+      await this.db.close()
+    }
+  }
 }
 
 export default DaemonContext
diff --git a/packages/ozone/src/daemon/index.ts b/packages/ozone/src/daemon/index.ts
index 501b8caad5c..e29305ba91f 100644
--- a/packages/ozone/src/daemon/index.ts
+++ b/packages/ozone/src/daemon/index.ts
@@ -18,17 +18,14 @@ export class OzoneDaemon {
   }
 
   async start() {
-    this.ctx.eventPusher.start()
-    this.ctx.eventReverser.start()
+    await this.ctx.start()
   }
 
   async processAll() {
-    await this.ctx.eventPusher.processAll()
+    await this.ctx.processAll()
   }
 
   async destroy() {
-    await this.ctx.eventReverser.destroy()
-    await this.ctx.eventPusher.destroy()
-    await this.ctx.db.close()
+    await this.ctx.destroy()
   }
 }
diff --git a/packages/ozone/src/daemon/materialized-view-refresher.ts b/packages/ozone/src/daemon/materialized-view-refresher.ts
new file mode 100644
index 00000000000..22c84cd8b53
--- /dev/null
+++ b/packages/ozone/src/daemon/materialized-view-refresher.ts
@@ -0,0 +1,27 @@
+import { MINUTE } from '@atproto/common'
+import { sql } from 'kysely'
+import { BackgroundQueue, PeriodicBackgroundTask } from '../background'
+
+export class MaterializedViewRefresher extends PeriodicBackgroundTask {
+  constructor(backgroundQueue: BackgroundQueue, interval = 30 * MINUTE) {
+    super(backgroundQueue, interval, async ({ db }, signal) => {
+      for (const view of [
+        'account_events_stats',
+        'record_events_stats',
+        'account_record_events_stats',
+        'account_record_status_stats',
+      ]) {
+        if (signal.aborted) break
+
+        // Kysely does not provide a way to cancel a running query. Because of
+        // this, killing the process during a refresh will cause the process to
+        // wait for the current refresh to finish before exiting. This is not
+        // ideal, but it is the best we can do until Kysely provides a way to
+        // cancel a query.
+        await sql`REFRESH MATERIALIZED VIEW CONCURRENTLY ${sql.id(view)}`.execute(
+          db,
+        )
+      }
+    })
+  }
+}
diff --git a/packages/ozone/src/db/migrations/20241220T144630860Z-stats-materialized-views.ts b/packages/ozone/src/db/migrations/20241220T144630860Z-stats-materialized-views.ts
new file mode 100644
index 00000000000..b961e61a7d0
--- /dev/null
+++ b/packages/ozone/src/db/migrations/20241220T144630860Z-stats-materialized-views.ts
@@ -0,0 +1,218 @@
+import { Kysely, sql } from 'kysely'
+
+import { REASONAPPEAL } from '../../lexicon/types/com/atproto/moderation/defs'
+import { DatabaseSchemaType } from '../schema'
+
+import {
+  REVIEWESCALATED,
+  REVIEWOPEN,
+} from '../../lexicon/types/tools/ozone/moderation/defs'
+import * as modEvent from '../schema/moderation_event'
+import * as modStatus from '../schema/moderation_subject_status'
+import * as recordEventsStats from '../schema/record_events_stats'
+
+export async function up(db: Kysely<any>): Promise<void> {
+  // Used by "tools.ozone.moderation.queryStatuses". Reduces query cost by two
+  // order of magnitudes when sorting using "reportedRecordsCount" or
+  // "takendownRecordsCount" and filtering by "reviewState".
+  await db.schema
+    .createIndex('moderation_subject_status_did_id_review_state_idx')
+    .on('moderation_subject_status')
+    .column('did')
+    .expression(sql`"id" ASC NULLS FIRST`)
+    .column('reviewState')
+    .execute()
+
+  // ~6sec for 16M events
+  await db.schema
+    .createView('account_events_stats')
+    .materialized()
+    .ifNotExists()
+    .as(
+      (db as Kysely<modEvent.PartialDB>)
+        .selectFrom('moderation_event')
+        .where('subjectType', '=', 'com.atproto.admin.defs#repoRef')
+        .where('subjectUri', 'is', null)
+        .select('subjectDid')
+        .select([
+          (eb) =>
+            sql<number>`COUNT(*) FILTER(
+              WHERE ${eb.ref('action')} = 'tools.ozone.moderation.defs#modEventTakedown'
+              AND ${eb.ref('durationInHours')} IS NULL
+            )`.as('takedownCount'),
+          (eb) =>
+            sql<number>`COUNT(*) FILTER(
+              WHERE ${eb.ref('action')} = 'tools.ozone.moderation.defs#modEventTakedown'
+              AND ${eb.ref('durationInHours')} IS NOT NULL
+            )`.as('suspendCount'),
+          (eb) =>
+            sql<number>`COUNT(*) FILTER(
+              WHERE ${eb.ref('action')} = 'tools.ozone.moderation.defs#modEventEscalate'
+            )`.as('escalateCount'),
+          (eb) =>
+            sql<number>`COUNT(*) FILTER(
+              WHERE ${eb.ref('action')} = 'tools.ozone.moderation.defs#modEventReport'
+              AND ${eb.ref('meta')} ->> 'reportType' != ${REASONAPPEAL}
+            )`.as('reportCount'),
+          (eb) =>
+            sql<number>`COUNT(*) FILTER(
+              WHERE ${eb.ref('action')} = 'tools.ozone.moderation.defs#modEventReport'
+              AND ${eb.ref('meta')} ->> 'reportType' = ${REASONAPPEAL}
+            )`.as('appealCount'),
+        ])
+        .groupBy('subjectDid'),
+    )
+    .execute()
+
+  await db.schema
+    .createIndex('account_events_stats_did_idx')
+    .unique()
+    .on('account_events_stats')
+    .column('subjectDid')
+    .execute()
+
+  await db.schema
+    .createIndex('account_events_stats_suspend_count_idx')
+    .on('account_events_stats')
+    .expression(sql`"suspendCount" ASC NULLS FIRST`)
+    .column('subjectDid')
+    .execute()
+
+  // ~50sec for 16M events
+  await db.schema
+    .createView('record_events_stats')
+    .materialized()
+    .ifNotExists()
+    .as(
+      (db as Kysely<modEvent.PartialDB>)
+        .selectFrom('moderation_event')
+        .select([
+          'subjectDid',
+          'subjectUri',
+          (eb) =>
+            sql<number>`COUNT(*) FILTER (WHERE ${eb.ref('action')} = 'tools.ozone.moderation.defs#modEventEscalate')`.as(
+              'escalateCount',
+            ),
+          (eb) =>
+            sql<number>`COUNT(*) FILTER (WHERE ${eb.ref('action')} = 'tools.ozone.moderation.defs#modEventReport' AND ${eb.ref('meta')} ->> 'reportType' != 'com.atproto.moderation.defs#reasonAppeal')`.as(
+              'reportCount',
+            ),
+          (eb) =>
+            sql<number>`COUNT(*) FILTER (WHERE ${eb.ref('action')} = 'tools.ozone.moderation.defs#modEventReport' AND ${eb.ref('meta')} ->> 'reportType' = 'com.atproto.moderation.defs#reasonAppeal')`.as(
+              'appealCount',
+            ),
+        ])
+        .where('subjectType', '=', 'com.atproto.repo.strongRef')
+        .where('subjectUri', 'is not', null)
+        .groupBy(['subjectDid', 'subjectUri']),
+    )
+    .execute()
+
+  await db.schema
+    .createIndex('record_events_stats_uri_idx')
+    .unique()
+    .on('record_events_stats')
+    .column('subjectUri')
+    .execute()
+
+  await db.schema
+    .createIndex('record_events_stats_did_idx')
+    .on('record_events_stats')
+    .column('subjectDid')
+    .execute()
+
+  await db.schema
+    .createView('account_record_events_stats')
+    .materialized()
+    .ifNotExists()
+    .as(
+      (db as Kysely<recordEventsStats.PartialDB>)
+        .selectFrom('record_events_stats')
+        .select([
+          'subjectDid',
+          (eb) =>
+            // Casting to "bigint" because "numeric" gets casted to a string
+            // by default by postgres-node.
+            sql<number>`SUM(${eb.ref('reportCount')})::bigint`.as(
+              'totalReports',
+            ),
+          (eb) =>
+            sql<number>`COUNT(*) FILTER (WHERE ${eb.ref('reportCount')} > 0)`.as(
+              'reportedCount',
+            ),
+          (eb) =>
+            sql<number>`COUNT(*) FILTER (WHERE ${eb.ref('escalateCount')} > 0)`.as(
+              'escalatedCount',
+            ),
+          (eb) =>
+            sql<number>`COUNT(*) FILTER (WHERE ${eb.ref('appealCount')} > 0)`.as(
+              'appealedCount',
+            ),
+        ])
+        .groupBy('subjectDid'),
+    )
+    .execute()
+
+  await db.schema
+    .createIndex('account_record_events_stats_did_idx')
+    .unique()
+    .on('account_record_events_stats')
+    .column('subjectDid')
+    .execute()
+
+  await db.schema
+    .createIndex('account_record_events_stats_reported_count_idx')
+    .on('account_record_events_stats')
+    .expression(sql`"reportedCount" ASC NULLS FIRST`)
+    .column('subjectDid')
+    .execute()
+
+  await db.schema
+    .createView('account_record_status_stats')
+    .materialized()
+    .ifNotExists()
+    .as(
+      (db as Kysely<modStatus.PartialDB>)
+        .selectFrom('moderation_subject_status')
+        .select('did')
+        .select([
+          sql<number>`COUNT(*)`.as('subjectCount'),
+          (eb) =>
+            sql<number>`COUNT(*) FILTER (WHERE ${eb.ref('reviewState')} IN (${REVIEWOPEN}, ${REVIEWESCALATED}))`.as(
+              'pendingCount',
+            ),
+          (eb) =>
+            sql<number>`COUNT(*) FILTER (WHERE ${eb.ref('reviewState')} NOT IN (${REVIEWOPEN}, ${REVIEWESCALATED}))`.as(
+              'processedCount',
+            ),
+          (eb) =>
+            sql<number>`COUNT(*) FILTER (WHERE ${eb.ref('takendown')})`.as(
+              'takendownCount',
+            ),
+        ])
+        .where('recordPath', '!=', '')
+        .groupBy('did'),
+    )
+    .execute()
+
+  await db.schema
+    .createIndex('account_record_status_stats_did_idx')
+    .unique()
+    .on('account_record_status_stats')
+    .column('did')
+    .execute()
+
+  await db.schema
+    .createIndex('account_record_status_stats_takendown_count_idx')
+    .on('account_record_status_stats')
+    .expression(sql`"takendownCount" ASC NULLS FIRST`)
+    .column('did')
+    .execute()
+}
+
+export async function down(db: Kysely<DatabaseSchemaType>): Promise<void> {
+  db.schema.dropView('account_record_status_stats').materialized().execute()
+  db.schema.dropView('account_record_events_stats').materialized().execute()
+  db.schema.dropView('record_events_stats').materialized().execute()
+  db.schema.dropView('account_events_stats').materialized().execute()
+}
diff --git a/packages/ozone/src/db/migrations/index.ts b/packages/ozone/src/db/migrations/index.ts
index be299b76edb..08103249701 100644
--- a/packages/ozone/src/db/migrations/index.ts
+++ b/packages/ozone/src/db/migrations/index.ts
@@ -17,3 +17,4 @@ export * as _20241001T205730722Z from './20241001T205730722Z-subject-status-revi
 export * as _20241008T205730722Z from './20241008T205730722Z-sets'
 export * as _20241018T205730722Z from './20241018T205730722Z-setting'
 export * as _20241026T205730722Z from './20241026T205730722Z-add-hosting-status-to-subject-status'
+export * as _20241220T144630860Z from './20241220T144630860Z-stats-materialized-views'
diff --git a/packages/ozone/src/db/schema/account_events_stats.ts b/packages/ozone/src/db/schema/account_events_stats.ts
new file mode 100644
index 00000000000..e0848c29a9f
--- /dev/null
+++ b/packages/ozone/src/db/schema/account_events_stats.ts
@@ -0,0 +1,16 @@
+import { GeneratedAlways, Selectable } from 'kysely'
+
+export const tableName = 'account_events_stats'
+
+export type AccountEventsStats = {
+  subjectDid: GeneratedAlways<string>
+  takedownCount: GeneratedAlways<number>
+  suspendCount: GeneratedAlways<number>
+  escalateCount: GeneratedAlways<number>
+  reportCount: GeneratedAlways<number>
+  appealCount: GeneratedAlways<number>
+}
+
+export type AccountEventsStatsRow = Selectable<AccountEventsStats>
+
+export type PartialDB = { [tableName]: AccountEventsStats }
diff --git a/packages/ozone/src/db/schema/account_record_events_stats.ts b/packages/ozone/src/db/schema/account_record_events_stats.ts
new file mode 100644
index 00000000000..0af4d5b2aaa
--- /dev/null
+++ b/packages/ozone/src/db/schema/account_record_events_stats.ts
@@ -0,0 +1,15 @@
+import { GeneratedAlways, Selectable } from 'kysely'
+
+export const tableName = 'account_record_events_stats'
+
+type AccountRecordEventsStats = {
+  subjectDid: GeneratedAlways<string>
+  totalReports: GeneratedAlways<number>
+  reportedCount: GeneratedAlways<number>
+  escalatedCount: GeneratedAlways<number>
+  appealedCount: GeneratedAlways<number>
+}
+
+export type AccountRecordEventsStatsRow = Selectable<AccountRecordEventsStats>
+
+export type PartialDB = { [tableName]: AccountRecordEventsStats }
diff --git a/packages/ozone/src/db/schema/account_record_status_stats.ts b/packages/ozone/src/db/schema/account_record_status_stats.ts
new file mode 100644
index 00000000000..7c333209007
--- /dev/null
+++ b/packages/ozone/src/db/schema/account_record_status_stats.ts
@@ -0,0 +1,15 @@
+import { GeneratedAlways, Selectable } from 'kysely'
+
+export const tableName = 'account_record_status_stats'
+
+type AccountRecordStatusStats = {
+  did: GeneratedAlways<string>
+  subjectCount: GeneratedAlways<number>
+  pendingCount: GeneratedAlways<number>
+  processedCount: GeneratedAlways<number>
+  takendownCount: GeneratedAlways<number>
+}
+
+export type AccountRecordStatusStatsRow = Selectable<AccountRecordStatusStats>
+
+export type PartialDB = { [tableName]: AccountRecordStatusStats }
diff --git a/packages/ozone/src/db/schema/index.ts b/packages/ozone/src/db/schema/index.ts
index ba403c802b8..36a1b3ae376 100644
--- a/packages/ozone/src/db/schema/index.ts
+++ b/packages/ozone/src/db/schema/index.ts
@@ -11,6 +11,11 @@ import * as set from './ozone_set'
 import * as member from './member'
 import * as setting from './setting'
 
+import * as recordEventsStats from './record_events_stats'
+import * as accountEventsStats from './account_events_stats'
+import * as accountRecordEventsStats from './account_record_events_stats'
+import * as accountRecordStatusStats from './account_record_status_stats'
+
 export type DatabaseSchemaType = modEvent.PartialDB &
   modSubjectStatus.PartialDB &
   label.PartialDB &
@@ -21,7 +26,11 @@ export type DatabaseSchemaType = modEvent.PartialDB &
   communicationTemplate.PartialDB &
   set.PartialDB &
   member.PartialDB &
-  setting.PartialDB
+  setting.PartialDB &
+  accountEventsStats.PartialDB &
+  recordEventsStats.PartialDB &
+  accountRecordEventsStats.PartialDB &
+  accountRecordStatusStats.PartialDB
 
 export type DatabaseSchema = Kysely<DatabaseSchemaType>
 
diff --git a/packages/ozone/src/db/schema/record_events_stats.ts b/packages/ozone/src/db/schema/record_events_stats.ts
new file mode 100644
index 00000000000..951b7773500
--- /dev/null
+++ b/packages/ozone/src/db/schema/record_events_stats.ts
@@ -0,0 +1,15 @@
+import { GeneratedAlways, Selectable } from 'kysely'
+
+export const tableName = 'record_events_stats'
+
+export type RecordEventsStats = {
+  subjectDid: GeneratedAlways<string>
+  subjectUri: GeneratedAlways<string>
+  escalateCount: GeneratedAlways<number>
+  reportCount: GeneratedAlways<number>
+  appealCount: GeneratedAlways<number>
+}
+
+export type RecordEventsStatsRow = Selectable<RecordEventsStats>
+
+export type PartialDB = { [tableName]: RecordEventsStats }
diff --git a/packages/ozone/src/index.ts b/packages/ozone/src/index.ts
index eb31f58b973..743f181bdee 100644
--- a/packages/ozone/src/index.ts
+++ b/packages/ozone/src/index.ts
@@ -114,13 +114,7 @@ export class OzoneService {
         },
         'db pool stats',
       )
-      dbLogger.info(
-        {
-          runningCount: backgroundQueue.queue.pending,
-          waitingCount: backgroundQueue.queue.size,
-        },
-        'background queue stats',
-      )
+      dbLogger.info(backgroundQueue.getStats(), 'background queue stats')
     }, 10000)
     await this.ctx.sequencer.start()
     const server = this.app.listen(this.ctx.cfg.service.port)
diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
index 154f03f9aa1..40bfab70933 100644
--- a/packages/ozone/src/lexicon/lexicons.ts
+++ b/packages/ozone/src/lexicon/lexicons.ts
@@ -11322,6 +11322,85 @@ export const schemaDict = {
               type: 'string',
             },
           },
+          accountStats: {
+            description: 'Statistics related to the account subject',
+            type: 'ref',
+            ref: 'lex:tools.ozone.moderation.defs#accountStats',
+          },
+          recordsStats: {
+            description:
+              "Statistics related to the record subjects authored by the subject's account",
+            type: 'ref',
+            ref: 'lex:tools.ozone.moderation.defs#recordsStats',
+          },
+        },
+      },
+      accountStats: {
+        description: 'Statistics about a particular account subject',
+        type: 'object',
+        properties: {
+          reportCount: {
+            description: 'Total number of reports on the account',
+            type: 'integer',
+          },
+          appealCount: {
+            description:
+              'Total number of appeals against a moderation action on the account',
+            type: 'integer',
+          },
+          suspendCount: {
+            description: 'Number of times the account was suspended',
+            type: 'integer',
+          },
+          escalateCount: {
+            description: 'Number of times the account was escalated',
+            type: 'integer',
+          },
+          takedownCount: {
+            description: 'Number of times the account was taken down',
+            type: 'integer',
+          },
+        },
+      },
+      recordsStats: {
+        description: 'Statistics about a set of record subject items',
+        type: 'object',
+        properties: {
+          totalReports: {
+            description:
+              'Cumulative sum of the number of reports on the items in the set',
+            type: 'integer',
+          },
+          reportedCount: {
+            description: 'Number of items that were reported at least once',
+            type: 'integer',
+          },
+          escalatedCount: {
+            description: 'Number of items that were escalated at least once',
+            type: 'integer',
+          },
+          appealedCount: {
+            description: 'Number of items that were appealed at least once',
+            type: 'integer',
+          },
+          subjectCount: {
+            description: 'Total number of item in the set',
+            type: 'integer',
+          },
+          pendingCount: {
+            description:
+              'Number of item currently in "reviewOpen" or "reviewEscalated" state',
+            type: 'integer',
+          },
+          processedCount: {
+            description:
+              'Number of item currently in "reviewNone" or "reviewClosed" state',
+            type: 'integer',
+          },
+          takendownCount: {
+            description: 'Number of item currently taken down',
+            type: 'integer',
+          },
         },
       },
       subjectReviewState: {
@@ -12570,7 +12649,12 @@ export const schemaDict = {
             sortField: {
               type: 'string',
               default: 'lastReportedAt',
-              enum: ['lastReviewedAt', 'lastReportedAt'],
+              enum: [
+                'lastReviewedAt',
+                'lastReportedAt',
+                'reportedRecordsCount',
+                'takendownRecordsCount',
+              ],
             },
             sortDirection: {
               type: 'string',
@@ -12625,6 +12709,21 @@ export const schemaDict = {
                 "If specified, subjects of the given type (account or record) will be returned. When this is set to 'account' the 'collections' parameter will be ignored. When includeAllUserRecords or subject is set, this will be ignored.",
               knownValues: ['account', 'record'],
             },
+            minAccountSuspendCount: {
+              type: 'integer',
+              description:
+                'If specified, only subjects that belong to an account that has at least this many suspensions will be returned.',
+            },
+            minReportedRecordsCount: {
+              type: 'integer',
+              description:
+                'If specified, only subjects that belong to an account that has at least this many reported records will be returned.',
+            },
+            minTakendownRecordsCount: {
+              type: 'integer',
+              description:
+                'If specified, only subjects that belong to an account that has at least this many taken down records will be returned.',
+            },
           },
         },
         output: {
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts
index 7397fafc19d..572d323a298 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts
@@ -136,6 +136,8 @@ export interface SubjectStatusView {
   appealed?: boolean
   suspendUntil?: string
   tags?: string[]
+  accountStats?: AccountStats
+  recordsStats?: RecordsStats
   [k: string]: unknown
 }
 
@@ -151,6 +153,66 @@ export function validateSubjectStatusView(v: unknown): ValidationResult {
   return lexicons.validate('tools.ozone.moderation.defs#subjectStatusView', v)
 }
 
+/** Statistics about a particular account subject */
+export interface AccountStats {
+  /** Total number of reports on the account */
+  reportCount?: number
+  /** Total number of appeals against a moderation action on the account */
+  appealCount?: number
+  /** Number of times the account was suspended */
+  suspendCount?: number
+  /** Number of times the account was escalated */
+  escalateCount?: number
+  /** Number of times the account was taken down */
+  takedownCount?: number
+  [k: string]: unknown
+}
+
+export function isAccountStats(v: unknown): v is AccountStats {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'tools.ozone.moderation.defs#accountStats'
+  )
+}
+
+export function validateAccountStats(v: unknown): ValidationResult {
+  return lexicons.validate('tools.ozone.moderation.defs#accountStats', v)
+}
+
+/** Statistics about a set of record subject items */
+export interface RecordsStats {
+  /** Cumulative sum of the number of reports on the items in the set */
+  totalReports?: number
+  /** Number of items that were reported at least once */
+  reportedCount?: number
+  /** Number of items that were escalated at least once */
+  escalatedCount?: number
+  /** Number of items that were appealed at least once */
+  appealedCount?: number
+  /** Total number of item in the set */
+  subjectCount?: number
+  /** Number of item currently in "reviewOpen" or "reviewEscalated" state */
+  pendingCount?: number
+  /** Number of item currently in "reviewNone" or "reviewClosed" state */
+  processedCount?: number
+  /** Number of item currently taken down */
+  takendownCount?: number
+  [k: string]: unknown
+}
+
+export function isRecordsStats(v: unknown): v is RecordsStats {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'tools.ozone.moderation.defs#recordsStats'
+  )
+}
+
+export function validateRecordsStats(v: unknown): ValidationResult {
+  return lexicons.validate('tools.ozone.moderation.defs#recordsStats', v)
+}
+
 export type SubjectReviewState =
   | 'lex:tools.ozone.moderation.defs#reviewOpen'
   | 'lex:tools.ozone.moderation.defs#reviewEscalated'
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
index 0ccd1030c0b..28270425304 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
@@ -49,7 +49,11 @@ export interface QueryParams {
   ignoreSubjects?: string[]
   /** Get all subject statuses that were reviewed by a specific moderator */
   lastReviewedBy?: string
-  sortField: 'lastReviewedAt' | 'lastReportedAt'
+  sortField:
+    | 'lastReviewedAt'
+    | 'lastReportedAt'
+    | 'reportedRecordsCount'
+    | 'takendownRecordsCount'
   sortDirection: 'asc' | 'desc'
   /** Get subjects that were taken down */
   takendown?: boolean
@@ -63,6 +67,12 @@ export interface QueryParams {
   collections?: string[]
   /** If specified, subjects of the given type (account or record) will be returned. When this is set to 'account' the 'collections' parameter will be ignored. When includeAllUserRecords or subject is set, this will be ignored. */
   subjectType?: 'account' | 'record' | (string & {})
+  /** If specified, only subjects that belong to an account that has at least this many suspensions will be returned. */
+  minAccountSuspendCount?: number
+  /** If specified, only subjects that belong to an account that has at least this many reported records will be returned. */
+  minReportedRecordsCount?: number
+  /** If specified, only subjects that belong to an account that has at least this many taken down records will be returned. */
+  minTakendownRecordsCount?: number
 }
 
 export type InputSchema = undefined
diff --git a/packages/ozone/src/mod-service/index.ts b/packages/ozone/src/mod-service/index.ts
index cfc4bf76fa9..a1fd403fa2f 100644
--- a/packages/ozone/src/mod-service/index.ts
+++ b/packages/ozone/src/mod-service/index.ts
@@ -1,5 +1,5 @@
 import net from 'node:net'
-import { Insertable, SelectQueryBuilder, sql } from 'kysely'
+import { Insertable, sql } from 'kysely'
 import { CID } from 'multiformats/cid'
 import { AtUri, INVALID_HANDLE } from '@atproto/syntax'
 import { InvalidRequestError } from '@atproto/xrpc-server'
@@ -29,16 +29,19 @@ import { RepoRef, RepoBlobRef } from '../lexicon/types/com/atproto/admin/defs'
 import {
   adjustModerationSubjectStatus,
   getStatusIdentifierFromSubject,
+  moderationSubjectStatusQueryBuilder,
 } from './status'
 import {
   ModEventType,
   ModerationEventRow,
   ModerationSubjectStatusRow,
+  ModerationSubjectStatusRowWithHandle,
   ReversibleModerationEvent,
 } from './types'
 import { ModerationEvent } from '../db/schema/moderation_event'
 import { StatusKeyset, TimeIdKeyset, paginate } from '../db/pagination'
 import { Label } from '../lexicon/types/com/atproto/label/defs'
+import { QueryParams as QueryStatusParams } from '../lexicon/types/tools/ozone/moderation/queryStatuses'
 import {
   ModSubject,
   RecordSubject,
@@ -56,6 +59,7 @@ import { httpLogger as log } from '../logger'
 import { OzoneConfig } from '../config'
 import { LABELER_HEADER_NAME, ParsedLabelers } from '../util'
 import { ids } from '../lexicon/lexicons'
+import { getReviewState } from '../api/util'
 
 export type ModerationServiceCreator = (db: Database) => ModerationService
 
@@ -805,45 +809,6 @@ export class ModerationService {
     return result
   }
 
-  applyTagFilter = (
-    builder: SelectQueryBuilder<any, any, any>,
-    tags: string[],
-  ) => {
-    const { ref } = this.db.db.dynamic
-    // Build an array of conditions
-    const conditions = tags
-      .map((tag) => {
-        if (tag.includes('&&')) {
-          // Split by '&&' for AND logic
-          const subTags = tag
-            .split('&&')
-            // Make sure spaces on either sides of '&&' are trimmed
-            .map((subTag) => subTag.trim())
-            // Remove empty strings after trimming is applied
-            .filter(Boolean)
-
-          if (!subTags.length) return null
-
-          return sql`(${sql.join(
-            subTags.map(
-              (subTag) =>
-                sql`${ref('moderation_subject_status.tags')} ? ${subTag}`,
-            ),
-            sql` AND `,
-          )})`
-        } else {
-          // Single tag condition
-          return sql`${ref('moderation_subject_status.tags')} ? ${tag}`
-        }
-      })
-      .filter(Boolean)
-
-    if (!conditions.length) return builder
-
-    // Combine all conditions with OR
-    return builder.where(sql`(${sql.join(conditions, sql` OR `)})`)
-  }
-
   async getSubjectStatuses({
     queueCount,
     queueIndex,
@@ -858,54 +823,31 @@ export class ModerationService {
     reviewedBefore,
     reportedAfter,
     reportedBefore,
-    includeMuted,
+    includeMuted = false,
     hostingDeletedBefore,
     hostingDeletedAfter,
     hostingUpdatedBefore,
     hostingUpdatedAfter,
     hostingStatuses,
-    onlyMuted,
+    onlyMuted = false,
     ignoreSubjects,
-    sortDirection,
+    sortDirection = 'desc',
     lastReviewedBy,
-    sortField,
+    sortField = 'lastReportedAt',
     subject,
     tags,
     excludeTags,
     collections,
     subjectType,
-  }: {
-    queueCount?: number
-    queueIndex?: number
-    queueSeed?: string
-    includeAllUserRecords?: boolean
+    minAccountSuspendCount,
+    minReportedRecordsCount,
+    minTakendownRecordsCount,
+  }: QueryStatusParams): Promise<{
+    statuses: ModerationSubjectStatusRowWithHandle[]
     cursor?: string
-    limit?: number
-    takendown?: boolean
-    appealed?: boolean
-    reviewedBefore?: string
-    reviewState?: ModerationSubjectStatusRow['reviewState']
-    reviewedAfter?: string
-    reportedAfter?: string
-    reportedBefore?: string
-    includeMuted?: boolean
-    hostingDeletedBefore?: string
-    hostingDeletedAfter?: string
-    hostingUpdatedBefore?: string
-    hostingUpdatedAfter?: string
-    hostingStatuses?: string[]
-    onlyMuted?: boolean
-    subject?: string
-    ignoreSubjects?: string[]
-    sortDirection: 'asc' | 'desc'
-    lastReviewedBy?: string
-    sortField: 'lastReviewedAt' | 'lastReportedAt'
-    tags: string[]
-    excludeTags: string[]
-    collections: string[]
-    subjectType?: string
-  }) {
-    let builder = this.db.db.selectFrom('moderation_subject_status').selectAll()
+  }> {
+    let builder = moderationSubjectStatusQueryBuilder(this.db.db)
+
     const { ref } = this.db.db.dynamic
 
     if (subject) {
@@ -919,14 +861,18 @@ export class ModerationService {
       if (!includeAllUserRecords) {
         builder = builder.where((qb) =>
           subjectInfo.recordPath
-            ? qb.where('recordPath', '=', subjectInfo.recordPath)
-            : qb.where('recordPath', '=', ''),
+            ? qb.where(
+                'moderation_subject_status.recordPath',
+                '=',
+                subjectInfo.recordPath,
+              )
+            : qb.where('moderation_subject_status.recordPath', '=', ''),
         )
       }
     } else if (subjectType === 'account') {
-      builder = builder.where('recordPath', '=', '')
+      builder = builder.where('moderation_subject_status.recordPath', '=', '')
     } else if (subjectType === 'record') {
-      builder = builder.where('recordPath', '!=', '')
+      builder = builder.where('moderation_subject_status.recordPath', '!=', '')
     }
 
     // Only fetch items that belongs to the specified queue when specified
@@ -948,110 +894,216 @@ export class ModerationService {
     }
 
     // If subjectType is set to 'account' let that take priority and ignore collections filter
-    if (collections.length && subjectType !== 'account') {
-      builder = builder.where('recordPath', '!=', '').where((qb) => {
-        collections.forEach((collection) => {
-          qb = qb.orWhere('recordPath', 'like', `${collection}/%`)
+    if (subjectType !== 'account' && collections?.length) {
+      builder = builder
+        .where('moderation_subject_status.recordPath', '!=', '')
+        .where((qb) => {
+          for (const collection of collections) {
+            qb = qb.orWhere(
+              'moderation_subject_status.recordPath',
+              'like',
+              `${collection}/%`,
+            )
+          }
+          return qb
         })
-        return qb
-      })
     }
 
     if (ignoreSubjects?.length) {
       builder = builder
-        .where('did', 'not in', ignoreSubjects)
-        .where('recordPath', 'not in', ignoreSubjects)
+        .where('moderation_subject_status.did', 'not in', ignoreSubjects)
+        .where('moderation_subject_status.recordPath', 'not in', ignoreSubjects)
     }
 
-    if (reviewState) {
-      builder = builder.where('reviewState', '=', reviewState)
+    const reviewStateNormalized = getReviewState(reviewState)
+    if (reviewStateNormalized) {
+      builder = builder.where(
+        'moderation_subject_status.reviewState',
+        '=',
+        reviewStateNormalized,
+      )
     }
 
     if (lastReviewedBy) {
-      builder = builder.where('lastReviewedBy', '=', lastReviewedBy)
+      builder = builder.where(
+        'moderation_subject_status.lastReviewedBy',
+        '=',
+        lastReviewedBy,
+      )
     }
 
     if (reviewedAfter) {
-      builder = builder.where('lastReviewedAt', '>', reviewedAfter)
+      builder = builder.where(
+        'moderation_subject_status.lastReviewedAt',
+        '>',
+        reviewedAfter,
+      )
     }
 
     if (reviewedBefore) {
-      builder = builder.where('lastReviewedAt', '<', reviewedBefore)
+      builder = builder.where(
+        'moderation_subject_status.lastReviewedAt',
+        '<',
+        reviewedBefore,
+      )
     }
 
     if (hostingUpdatedAfter) {
-      builder = builder.where('hostingUpdatedAt', '>', hostingUpdatedAfter)
+      builder = builder.where(
+        'moderation_subject_status.hostingUpdatedAt',
+        '>',
+        hostingUpdatedAfter,
+      )
     }
 
     if (hostingUpdatedBefore) {
-      builder = builder.where('hostingUpdatedAt', '<', hostingUpdatedBefore)
+      builder = builder.where(
+        'moderation_subject_status.hostingUpdatedAt',
+        '<',
+        hostingUpdatedBefore,
+      )
     }
 
     if (hostingDeletedAfter) {
-      builder = builder.where('hostingDeletedAt', '>', hostingDeletedAfter)
+      builder = builder.where(
+        'moderation_subject_status.hostingDeletedAt',
+        '>',
+        hostingDeletedAfter,
+      )
     }
 
     if (hostingDeletedBefore) {
-      builder = builder.where('hostingDeletedAt', '<', hostingDeletedBefore)
+      builder = builder.where(
+        'moderation_subject_status.hostingDeletedAt',
+        '<',
+        hostingDeletedBefore,
+      )
     }
 
     if (hostingStatuses?.length) {
-      builder = builder.where('hostingStatus', 'in', hostingStatuses)
+      builder = builder.where(
+        'moderation_subject_status.hostingStatus',
+        'in',
+        hostingStatuses,
+      )
     }
 
     if (reportedAfter) {
-      builder = builder.where('lastReviewedAt', '>', reportedAfter)
+      builder = builder.where(
+        'moderation_subject_status.lastReviewedAt',
+        '>',
+        reportedAfter,
+      )
     }
 
     if (reportedBefore) {
-      builder = builder.where('lastReportedAt', '<', reportedBefore)
+      builder = builder.where(
+        'moderation_subject_status.lastReportedAt',
+        '<',
+        reportedBefore,
+      )
     }
 
     if (takendown) {
-      builder = builder.where('takendown', '=', true)
+      builder = builder.where('moderation_subject_status.takendown', '=', true)
     }
 
     if (appealed !== undefined) {
       builder =
         appealed === false
-          ? builder.where('appealed', 'is', null)
-          : builder.where('appealed', '=', appealed)
+          ? builder.where('moderation_subject_status.appealed', 'is', null)
+          : builder.where('moderation_subject_status.appealed', '=', appealed)
     }
 
     if (!includeMuted) {
       builder = builder.where((qb) =>
         qb
-          .where('muteUntil', '<', new Date().toISOString())
-          .orWhere('muteUntil', 'is', null),
+          .where(
+            'moderation_subject_status.muteUntil',
+            '<',
+            new Date().toISOString(),
+          )
+          .orWhere('moderation_subject_status.muteUntil', 'is', null),
       )
     }
 
     if (onlyMuted) {
       builder = builder.where((qb) =>
         qb
-          .where('muteUntil', '>', new Date().toISOString())
-          .orWhere('muteReportingUntil', '>', new Date().toISOString()),
+          .where(
+            'moderation_subject_status.muteUntil',
+            '>',
+            new Date().toISOString(),
+          )
+          .orWhere(
+            'moderation_subject_status.muteReportingUntil',
+            '>',
+            new Date().toISOString(),
+          ),
       )
     }
 
-    if (tags.length) {
-      builder = this.applyTagFilter(builder, tags)
+    // ["tag1", "tag2 && tag3", "tag4"] => [["tag1"], ["tag2", "tag3"], ["tag4"]]
+    const conditions = parseTags(tags)
+    if (conditions?.length) {
+      // [["tag1"], ["tag2", "tag3"], ["tag4"]] => (tags ? 'tag1') OR (tags ? 'tag2' AND tags ? 'tag3') OR (tags ? 'tag4')
+      builder = builder.where((qb) => {
+        for (const subTags of conditions) {
+          // OR between every conditions items (subTags)
+          qb = qb.orWhere((qb) => {
+            // AND between every subTags items (subTag)
+            for (const subTag of subTags) {
+              qb = qb.where(
+                sql`${ref('moderation_subject_status.tags')} ? ${subTag}`,
+              )
+            }
+            return qb
+          })
+        }
+        return qb
+      })
     }
 
-    if (excludeTags.length) {
+    if (excludeTags?.length) {
       builder = builder.where((qb) =>
         qb
           .where(
-            sql`NOT(${ref(
-              'moderation_subject_status.tags',
-            )} ?| array[${sql.join(excludeTags)}]::TEXT[])`,
+            sql`NOT(${ref('moderation_subject_status.tags')} ?| array[${sql.join(excludeTags)}]::TEXT[])`,
           )
           .orWhere('tags', 'is', null),
       )
     }
 
+    if (minAccountSuspendCount != null && minAccountSuspendCount > 0) {
+      builder = builder.where(
+        'account_events_stats.suspendCount',
+        '>=',
+        minAccountSuspendCount,
+      )
+    }
+
+    if (minTakendownRecordsCount != null && minTakendownRecordsCount > 0) {
+      builder = builder.where(
+        'account_record_status_stats.takendownCount',
+        '>=',
+        minTakendownRecordsCount,
+      )
+    }
+
+    if (minReportedRecordsCount != null && minReportedRecordsCount > 0) {
+      builder = builder.where(
+        'account_record_events_stats.reportedCount',
+        '>=',
+        minReportedRecordsCount,
+      )
+    }
+
     const keyset = new StatusKeyset(
-      ref(`moderation_subject_status.${sortField}`),
+      sortField === 'reportedRecordsCount'
+        ? ref(`account_record_events_stats.reportedCount`)
+        : sortField === 'takendownRecordsCount'
+          ? ref(`account_record_status_stats.takendownCount`)
+          : ref(`moderation_subject_status.${sortField}`),
       ref('moderation_subject_status.id'),
     )
     const paginatedBuilder = paginate(builder, {
@@ -1067,13 +1119,12 @@ export class ModerationService {
     const infos = await this.views.getAccoutInfosByDid(
       results.map((r) => r.did),
     )
-    const resultsWithHandles = results.map((r) => ({
-      ...r,
-      handle: infos.get(r.did)?.handle ?? INVALID_HANDLE,
-    }))
 
     return {
-      statuses: resultsWithHandles,
+      statuses: results.map((r) => ({
+        ...r,
+        handle: infos.get(r.did)?.handle ?? INVALID_HANDLE,
+      })),
       cursor: keyset.packFromResult(results),
     }
   }
@@ -1195,6 +1246,18 @@ export class ModerationService {
   }
 }
 
+const parseTags = (tags?: string[]) =>
+  tags
+    ?.map((tag) =>
+      tag
+        .split(/\s*&&\s*/g)
+        .map((subTag) => subTag.trim())
+        // Ignore invalid syntax ("", "tag1 &&", "&& tag2", "tag1 && && tag2", etc.)
+        .filter(Boolean),
+    )
+    // Ignore invalid items
+    .filter((subTags): subTags is [string, ...string[]] => subTags.length > 0)
+
 const isSafeUrl = (url: URL) => {
   if (url.protocol !== 'https:') return false
   if (!url.hostname || url.hostname === 'localhost') return false
diff --git a/packages/ozone/src/mod-service/status.ts b/packages/ozone/src/mod-service/status.ts
index cc3539e7728..67fb3b4a20c 100644
--- a/packages/ozone/src/mod-service/status.ts
+++ b/packages/ozone/src/mod-service/status.ts
@@ -1,18 +1,18 @@
 // This may require better organization but for now, just dumping functions here containing DB queries for moderation status
 
+import { HOUR } from '@atproto/common'
 import { AtUri } from '@atproto/syntax'
 import { Database } from '../db'
-import { ModerationSubjectStatus } from '../db/schema/moderation_subject_status'
+import DatabaseSchema from '../db/schema'
+import { jsonb } from '../db/types'
+import { REASONAPPEAL } from '../lexicon/types/com/atproto/moderation/defs'
 import {
-  REVIEWOPEN,
   REVIEWCLOSED,
   REVIEWESCALATED,
   REVIEWNONE,
+  REVIEWOPEN,
 } from '../lexicon/types/tools/ozone/moderation/defs'
 import { ModerationEventRow, ModerationSubjectStatusRow } from './types'
-import { HOUR } from '@atproto/common'
-import { REASONAPPEAL } from '../lexicon/types/com/atproto/moderation/defs'
-import { jsonb } from '../db/types'
 
 const getSubjectStatusForModerationEvent = ({
   currentStatus,
@@ -203,6 +203,56 @@ const getSubjectStatusForRecordEvent = ({
   return {}
 }
 
+export const moderationSubjectStatusQueryBuilder = (db: DatabaseSchema) => {
+  // @NOTE: Using select() instead of selectAll() below because the materialized
+  // views might be incomplete, and we don't want the null `did` columns to
+  // interfere with the (never null) `did` column from the
+  // `moderation_subject_status` table in the results
+  return db
+    .selectFrom('moderation_subject_status')
+    .selectAll('moderation_subject_status')
+    .leftJoin('account_events_stats', (join) =>
+      join.onRef(
+        'moderation_subject_status.did',
+        '=',
+        'account_events_stats.subjectDid',
+      ),
+    )
+    .select([
+      'account_events_stats.takedownCount',
+      'account_events_stats.suspendCount',
+      'account_events_stats.escalateCount',
+      'account_events_stats.reportCount',
+      'account_events_stats.appealCount',
+    ])
+    .leftJoin('account_record_events_stats', (join) =>
+      join.onRef(
+        'moderation_subject_status.did',
+        '=',
+        'account_record_events_stats.subjectDid',
+      ),
+    )
+    .select([
+      'account_record_events_stats.totalReports',
+      'account_record_events_stats.reportedCount',
+      'account_record_events_stats.escalatedCount',
+      'account_record_events_stats.appealedCount',
+    ])
+    .leftJoin('account_record_status_stats', (join) =>
+      join.onRef(
+        'moderation_subject_status.did',
+        '=',
+        'account_record_status_stats.did',
+      ),
+    )
+    .select([
+      'account_record_status_stats.subjectCount',
+      'account_record_status_stats.pendingCount',
+      'account_record_status_stats.processedCount',
+      'account_record_status_stats.takendownCount',
+    ])
+}
+
 // Based on a given moderation action event, this function will update the moderation status of the subject
 // If there's no existing status, it will create one
 // If the action event does not affect the status, it will do nothing
@@ -393,29 +443,6 @@ export const adjustModerationSubjectStatus = async (
   return status || null
 }
 
-type ModerationSubjectStatusFilter =
-  | Pick<ModerationSubjectStatus, 'did'>
-  | Pick<ModerationSubjectStatus, 'did' | 'recordPath'>
-  | Pick<ModerationSubjectStatus, 'did' | 'recordPath' | 'recordCid'>
-export const getModerationSubjectStatus = async (
-  db: Database,
-  filters: ModerationSubjectStatusFilter,
-) => {
-  let builder = db.db
-    .selectFrom('moderation_subject_status')
-    // DID will always be passed at the very least
-    .where('did', '=', filters.did)
-    .where('recordPath', '=', 'recordPath' in filters ? filters.recordPath : '')
-
-  if ('recordCid' in filters) {
-    builder = builder.where('recordCid', '=', filters.recordCid)
-  } else {
-    builder = builder.where('recordCid', 'is', null)
-  }
-
-  return builder.executeTakeFirst()
-}
-
 export const getStatusIdentifierFromSubject = (
   subject: string | AtUri,
 ): { did: string; recordPath: string } => {
diff --git a/packages/ozone/src/mod-service/types.ts b/packages/ozone/src/mod-service/types.ts
index 29a63d3e019..42d6c7115f3 100644
--- a/packages/ozone/src/mod-service/types.ts
+++ b/packages/ozone/src/mod-service/types.ts
@@ -18,8 +18,29 @@ export type ModerationEventRowWithHandle = ModerationEventRow & {
   creatorHandle?: string | null
 }
 export type ModerationSubjectStatusRow = Selectable<ModerationSubjectStatus>
+export type ModerationSubjectStatusRowWithStats = ModerationSubjectStatusRow & {
+  // account_events_stats
+  takedownCount: number | null
+  suspendCount: number | null
+  escalateCount: number | null
+  reportCount: number | null
+  appealCount: number | null
+
+  // account_record_events_stats
+  totalReports: number | null
+  reportedCount: number | null
+  escalatedCount: number | null
+  appealedCount: number | null
+
+  // account_record_status_stats
+  subjectCount: number | null
+  pendingCount: number | null
+  processedCount: number | null
+  takendownCount: number | null
+}
+
 export type ModerationSubjectStatusRowWithHandle =
-  ModerationSubjectStatusRow & { handle: string | null }
+  ModerationSubjectStatusRowWithStats & { handle: string | null }
 
 export type ModEventType =
   | ToolsOzoneModerationDefs.ModEventTakedown
diff --git a/packages/ozone/src/mod-service/views.ts b/packages/ozone/src/mod-service/views.ts
index 7fde08ca470..12a3d9f018c 100644
--- a/packages/ozone/src/mod-service/views.ts
+++ b/packages/ozone/src/mod-service/views.ts
@@ -1,10 +1,6 @@
 import { sql } from 'kysely'
 import { AtUri, INVALID_HANDLE, normalizeDatetimeAlways } from '@atproto/syntax'
-import {
-  AtpAgent,
-  AppBskyFeedDefs,
-  ToolsOzoneModerationDefs,
-} from '@atproto/api'
+import { AtpAgent, AppBskyFeedDefs } from '@atproto/api'
 import { dedupeStrs } from '@atproto/common'
 import { BlobRef } from '@atproto/lexicon'
 import { Keypair } from '@atproto/crypto'
@@ -12,7 +8,6 @@ import { Database } from '../db'
 import {
   ModEventView,
   RepoView,
-  RepoViewDetail,
   RecordView,
   RecordViewDetail,
   BlobView,
@@ -34,6 +29,7 @@ import { dbLogger } from '../logger'
 import { httpLogger } from '../logger'
 import { ParsedLabelers } from '../util'
 import { ids } from '../lexicon/lexicons'
+import { moderationSubjectStatusQueryBuilder } from './status'
 
 export type AuthHeaders = {
   headers: {
@@ -481,8 +477,9 @@ export class ModerationViews {
   async blob(blobs: BlobRef[]): Promise<BlobView[]> {
     if (!blobs.length) return []
     const { ref } = this.db.db.dynamic
-    const modStatusResults = await this.db.db
-      .selectFrom('moderation_subject_status')
+    const modStatusResults = await moderationSubjectStatusQueryBuilder(
+      this.db.db,
+    )
       .where(
         sql<string>`${ref(
           'moderation_subject_status.blobCids',
@@ -529,10 +526,10 @@ export class ModerationViews {
     await Promise.all(
       res.map(async (labelRow) => {
         const signedLabel = await this.formatLabelAndEnsureSig(labelRow)
-        if (!labels.has(labelRow.uri)) {
-          labels.set(labelRow.uri, [])
-        }
-        labels.get(labelRow.uri)?.push(signedLabel)
+
+        const current = labels.get(labelRow.uri)
+        if (current) current.push(signedLabel)
+        else labels.set(labelRow.uri, [signedLabel])
       }),
     )
     return labels
@@ -559,51 +556,39 @@ export class ModerationViews {
   async getSubjectStatus(
     subjects: string[],
   ): Promise<Map<string, ModerationSubjectStatusRowWithHandle>> {
-    const parsedSubjects = subjects.map((subject) => parseSubjectId(subject))
-    const filterForSubject = (did: string, recordPath?: string) => {
-      return (clause: any) => {
-        clause = clause
-          .where('moderation_subject_status.did', '=', did)
-          .where('moderation_subject_status.recordPath', '=', recordPath || '')
-        return clause
-      }
-      // TODO: Fix the typing here?
-    }
-
-    const builder = this.db.db
-      .selectFrom('moderation_subject_status')
-      .where((clause) => {
-        parsedSubjects.forEach((subject, i) => {
-          const applySubjectFilter = filterForSubject(
-            subject.did,
-            subject.recordPath,
+    if (!subjects.length) return new Map()
+
+    const parsedSubjects = subjects.map(parseSubjectId)
+
+    const builder = moderationSubjectStatusQueryBuilder(this.db.db)
+      //
+      .where((qb) => {
+        for (const sub of parsedSubjects) {
+          qb = qb.orWhere((qb) =>
+            qb
+              .where('moderation_subject_status.did', '=', sub.did)
+              .where(
+                'moderation_subject_status.recordPath',
+                '=',
+                sub.recordPath ?? '',
+              ),
           )
-          if (i === 0) {
-            clause = clause.where(applySubjectFilter)
-          } else {
-            clause = clause.orWhere(applySubjectFilter)
-          }
-        })
-
-        return clause
+        }
+        return qb
       })
-      .selectAll()
 
     const [statusRes, accountsByDid] = await Promise.all([
       builder.execute(),
       this.getAccoutInfosByDid(parsedSubjects.map((s) => s.did)),
     ])
 
-    return statusRes.reduce((acc, cur) => {
-      const subject = cur.recordPath
-        ? formatSubjectId(cur.did, cur.recordPath)
-        : cur.did
-      const handle = accountsByDid.get(cur.did)?.handle
-      return acc.set(subject, {
-        ...cur,
-        handle: handle ?? INVALID_HANDLE,
-      })
-    }, new Map<string, ModerationSubjectStatusRowWithHandle>())
+    return new Map(
+      statusRes.map((row): [string, ModerationSubjectStatusRowWithHandle] => {
+        const subjectId = formatSubjectId(row.did, row.recordPath)
+        const handle = accountsByDid.get(row.did)?.handle ?? INVALID_HANDLE
+        return [subjectId, { ...row, handle }]
+      }),
+    )
   }
 
   formatSubjectStatus(
@@ -628,6 +613,35 @@ export class ModerationViews {
       subjectBlobCids: status.blobCids || [],
       tags: status.tags || [],
       subject: subjectFromStatusRow(status).lex(),
+
+      accountStats: {
+        // Explicitly typing to allow for easy manipulation (e.g. to strip from tests snapshots)
+        $type: 'tools.ozone.moderation.defs#accountStats',
+
+        // account_events_stats
+        reportCount: status.reportCount ?? undefined,
+        appealCount: status.appealCount ?? undefined,
+        suspendCount: status.suspendCount ?? undefined,
+        takedownCount: status.takedownCount ?? undefined,
+        escalateCount: status.escalateCount ?? undefined,
+      },
+
+      recordsStats: {
+        // Explicitly typing to allow for easy manipulation (e.g. to strip from tests snapshots)
+        $type: 'tools.ozone.moderation.defs#recordStats',
+
+        // account_record_events_stats
+        totalReports: status.totalReports ?? undefined,
+        reportedCount: status.reportedCount ?? undefined,
+        escalatedCount: status.escalatedCount ?? undefined,
+        appealedCount: status.appealedCount ?? undefined,
+
+        // account_record_status_stats
+        subjectCount: status.subjectCount ?? undefined,
+        pendingCount: status.pendingCount ?? undefined,
+        processedCount: status.processedCount ?? undefined,
+        takendownCount: status.takendownCount ?? undefined,
+      },
     }
 
     if (status.recordPath !== '') {
@@ -677,7 +691,7 @@ type RecordInfo = {
   indexedAt: string
 }
 
-function parseSubjectId(subject: string) {
+function parseSubjectId(subject: string): { did: string; recordPath?: string } {
   if (subject.startsWith('did:')) {
     return { did: subject }
   }
diff --git a/packages/ozone/src/util.ts b/packages/ozone/src/util.ts
index 717316f5c96..3a87eaa934f 100644
--- a/packages/ozone/src/util.ts
+++ b/packages/ozone/src/util.ts
@@ -1,3 +1,4 @@
+import assert from 'node:assert'
 import { createRetryable } from '@atproto/common'
 import { ResponseType, XRPCError } from '@atproto/xrpc'
 import { parseList } from 'structured-headers'
@@ -83,3 +84,147 @@ export const formatLabelerHeader = (parsed: ParsedLabelers): string => {
   )
   return parts.join(',')
 }
+
+/**
+ * Utility function similar to `setInterval()`. The main difference is that the
+ * execution is controlled through a signal and that the function will wait for
+ * `interval` milliseconds *between* the end of the previous execution and the
+ * start of the next one (instead of starting the execution every `interval`
+ * milliseconds), ensuring that the function is not running concurrently.
+ *
+ * @param fn The function to execute. That function must not throw any error
+ * other than {@link signal}'s {@link AbortSignal.reason} or an {@link Error}
+ * that has the {@link signal}'s {@link AbortSignal.reason} as its
+ * {@link Error.cause}.
+ *
+ * @returns A promise that resolves when the signal is aborted, and the last
+ * execution is done.
+ *
+ * @throws {AbortSignal['reason']} if the {@link signal} is already aborted.
+ * @throws {TypeError} if {@link fn} throws an unexpected error (with the
+ * unexpected error as the {@link Error.cause}).
+ */
+export async function startInterval(
+  fn: (signal: AbortSignal) => void | Promise<void>,
+  interval: number,
+  signal: AbortSignal,
+  runImmediately = false,
+) {
+  signal.throwIfAborted()
+
+  // Renaming for clarity
+  const inputSignal = signal
+
+  const intervalController = new AbortController()
+  const intervalSignal = intervalController.signal
+
+  return new Promise<void>((resolve, reject) => {
+    let timer: NodeJS.Timeout | undefined
+
+    const run = async () => {
+      // Cloning the signal for this particular run to prevent memory leaks
+      const runController = boundAbortController(intervalSignal)
+      const runSignal = runController.signal
+
+      try {
+        await fn(runSignal)
+      } catch (err) {
+        if (err != null && isCausedBySignal(err, runSignal)) {
+          // Silently ignore the error if it is caused by the signal. At this
+          // point, the interval controller was aborted, which will cause the
+          // promise to resolve in the "finally" block bellow.
+        } else {
+          // Invalid behavior: stop the interval and reject the promise.
+          const error = new TypeError('Unexpected error', { cause: err })
+
+          // Rejecting here will make `resolve()` in the "finally" block to be a
+          // no-op. Rejecting before aborting the controller to ensure the
+          // promise does not get resolved by the `abort` event listeners.
+          reject(error)
+
+          // Using `error` as abort reason to avoid creating an AbortError.
+          intervalController.abort(error)
+        }
+      } finally {
+        // Cleanup the listeners added by `boundAbortController`
+        runController.abort()
+
+        if (intervalSignal.aborted) resolve()
+        else schedule()
+      }
+    }
+
+    const schedule = () => {
+      assert(timer === undefined, 'unexpected state')
+      timer = setTimeout(() => {
+        timer = undefined // "running" state
+        void run()
+      }, interval)
+    }
+
+    inputSignal.addEventListener(
+      'abort',
+      // This function will only be called if the `inputSignal` is aborted
+      // before the interval controller is aborted.
+      () => {
+        // Stop the interval, using the input signal's reason
+        intervalController.abort(inputSignal.reason)
+
+        if (timer === undefined) {
+          // `fn` is currently running; `run`'s finally block will resolve the
+          // promise.
+        } else {
+          // The execution was scheduled but not started yet. Clear the timer
+          // and resolve the promise.
+          clearTimeout(timer)
+          resolve()
+        }
+      },
+      // Remove the listener whenever the interval is aborted.
+      { signal: intervalSignal },
+    )
+
+    if (runImmediately) void run()
+    else schedule()
+  })
+}
+
+/**
+ * Determines whether the cause of an error is a signal's reason
+ */
+export function isCausedBySignal(err: unknown, signal: AbortSignal) {
+  if (!signal.aborted) return false
+  if (signal.reason == null) return false // Ignore nullish reasons
+  return (
+    err === signal.reason ||
+    (err instanceof Error && err.cause === signal.reason)
+  )
+}
+
+/**
+ * Creates an AbortController that will be aborted when any of the given signals
+ * is aborted.
+ *
+ * @note Make sure to call `abortController.abort()` when you are done with
+ * the controller to avoid memory leaks.
+ *
+ * @throws if any of the input signals is already aborted.
+ */
+export function boundAbortController(
+  ...signals: readonly (AbortSignal | undefined | null)[]
+): AbortController {
+  for (const signal of signals) {
+    signal?.throwIfAborted()
+  }
+
+  const abortController = new AbortController()
+  const abort = function (event: Event) {
+    abortController.abort((event.target as AbortSignal)?.reason)
+  }
+
+  for (const signal of signals) {
+    signal?.addEventListener('abort', abort, { signal: abortController.signal })
+  }
+
+  return abortController
+}
diff --git a/packages/ozone/tests/__snapshots__/get-record.test.ts.snap b/packages/ozone/tests/__snapshots__/get-record.test.ts.snap
index d24b9d76106..bed827aced6 100644
--- a/packages/ozone/tests/__snapshots__/get-record.test.ts.snap
+++ b/packages/ozone/tests/__snapshots__/get-record.test.ts.snap
@@ -28,6 +28,9 @@ Object {
   ],
   "moderation": Object {
     "subjectStatus": Object {
+      "accountStats": Object {
+        "$type": "tools.ozone.moderation.defs#accountStats",
+      },
       "createdAt": "1970-01-01T00:00:00.000Z",
       "hosting": Object {
         "$type": "tools.ozone.moderation.defs#recordHosting",
@@ -37,6 +40,17 @@ Object {
       "lastReportedAt": "1970-01-01T00:00:00.000Z",
       "lastReviewedAt": "1970-01-01T00:00:00.000Z",
       "lastReviewedBy": "user(1)",
+      "recordsStats": Object {
+        "$type": "tools.ozone.moderation.defs#recordStats",
+        "appealedCount": 0,
+        "escalatedCount": 0,
+        "pendingCount": 0,
+        "processedCount": 1,
+        "reportedCount": 1,
+        "subjectCount": 1,
+        "takendownCount": 1,
+        "totalReports": 2,
+      },
       "reviewState": "tools.ozone.moderation.defs#reviewClosed",
       "subject": Object {
         "$type": "com.atproto.repo.strongRef",
@@ -134,6 +148,9 @@ Object {
   ],
   "moderation": Object {
     "subjectStatus": Object {
+      "accountStats": Object {
+        "$type": "tools.ozone.moderation.defs#accountStats",
+      },
       "createdAt": "1970-01-01T00:00:00.000Z",
       "hosting": Object {
         "$type": "tools.ozone.moderation.defs#recordHosting",
@@ -143,6 +160,17 @@ Object {
       "lastReportedAt": "1970-01-01T00:00:00.000Z",
       "lastReviewedAt": "1970-01-01T00:00:00.000Z",
       "lastReviewedBy": "user(1)",
+      "recordsStats": Object {
+        "$type": "tools.ozone.moderation.defs#recordStats",
+        "appealedCount": 0,
+        "escalatedCount": 0,
+        "pendingCount": 0,
+        "processedCount": 1,
+        "reportedCount": 1,
+        "subjectCount": 1,
+        "takendownCount": 1,
+        "totalReports": 2,
+      },
       "reviewState": "tools.ozone.moderation.defs#reviewClosed",
       "subject": Object {
         "$type": "com.atproto.repo.strongRef",
diff --git a/packages/ozone/tests/__snapshots__/get-records.test.ts.snap b/packages/ozone/tests/__snapshots__/get-records.test.ts.snap
index 38d0efdebca..05f6f6f3273 100644
--- a/packages/ozone/tests/__snapshots__/get-records.test.ts.snap
+++ b/packages/ozone/tests/__snapshots__/get-records.test.ts.snap
@@ -31,6 +31,9 @@ Object {
       ],
       "moderation": Object {
         "subjectStatus": Object {
+          "accountStats": Object {
+            "$type": "tools.ozone.moderation.defs#accountStats",
+          },
           "createdAt": "1970-01-01T00:00:00.000Z",
           "hosting": Object {
             "$type": "tools.ozone.moderation.defs#recordHosting",
@@ -40,6 +43,17 @@ Object {
           "lastReportedAt": "1970-01-01T00:00:00.000Z",
           "lastReviewedAt": "1970-01-01T00:00:00.000Z",
           "lastReviewedBy": "user(1)",
+          "recordsStats": Object {
+            "$type": "tools.ozone.moderation.defs#recordStats",
+            "appealedCount": 0,
+            "escalatedCount": 0,
+            "pendingCount": 0,
+            "processedCount": 1,
+            "reportedCount": 1,
+            "subjectCount": 1,
+            "takendownCount": 1,
+            "totalReports": 2,
+          },
           "reviewState": "tools.ozone.moderation.defs#reviewClosed",
           "subject": Object {
             "$type": "com.atproto.repo.strongRef",
diff --git a/packages/ozone/tests/__snapshots__/get-repo.test.ts.snap b/packages/ozone/tests/__snapshots__/get-repo.test.ts.snap
index 397a817ec0b..d548cd9d844 100644
--- a/packages/ozone/tests/__snapshots__/get-repo.test.ts.snap
+++ b/packages/ozone/tests/__snapshots__/get-repo.test.ts.snap
@@ -22,6 +22,14 @@ Object {
   ],
   "moderation": Object {
     "subjectStatus": Object {
+      "accountStats": Object {
+        "$type": "tools.ozone.moderation.defs#accountStats",
+        "appealCount": 0,
+        "escalateCount": 0,
+        "reportCount": 2,
+        "suspendCount": 0,
+        "takedownCount": 1,
+      },
       "createdAt": "1970-01-01T00:00:00.000Z",
       "hosting": Object {
         "$type": "tools.ozone.moderation.defs#accountHosting",
@@ -31,6 +39,9 @@ Object {
       "lastReportedAt": "1970-01-01T00:00:00.000Z",
       "lastReviewedAt": "1970-01-01T00:00:00.000Z",
       "lastReviewedBy": "user(1)",
+      "recordsStats": Object {
+        "$type": "tools.ozone.moderation.defs#recordStats",
+      },
       "reviewState": "tools.ozone.moderation.defs#reviewClosed",
       "subject": Object {
         "$type": "com.atproto.admin.defs#repoRef",
diff --git a/packages/ozone/tests/__snapshots__/get-repos.test.ts.snap b/packages/ozone/tests/__snapshots__/get-repos.test.ts.snap
index d0db4fcf9de..1da0c8ab0fb 100644
--- a/packages/ozone/tests/__snapshots__/get-repos.test.ts.snap
+++ b/packages/ozone/tests/__snapshots__/get-repos.test.ts.snap
@@ -25,6 +25,14 @@ Object {
       ],
       "moderation": Object {
         "subjectStatus": Object {
+          "accountStats": Object {
+            "$type": "tools.ozone.moderation.defs#accountStats",
+            "appealCount": 0,
+            "escalateCount": 0,
+            "reportCount": 2,
+            "suspendCount": 0,
+            "takedownCount": 1,
+          },
           "createdAt": "1970-01-01T00:00:00.000Z",
           "hosting": Object {
             "$type": "tools.ozone.moderation.defs#accountHosting",
@@ -34,6 +42,9 @@ Object {
           "lastReportedAt": "1970-01-01T00:00:00.000Z",
           "lastReviewedAt": "1970-01-01T00:00:00.000Z",
           "lastReviewedBy": "user(1)",
+          "recordsStats": Object {
+            "$type": "tools.ozone.moderation.defs#recordStats",
+          },
           "reviewState": "tools.ozone.moderation.defs#reviewClosed",
           "subject": Object {
             "$type": "com.atproto.admin.defs#repoRef",
diff --git a/packages/ozone/tests/__snapshots__/moderation-events.test.ts.snap b/packages/ozone/tests/__snapshots__/moderation-events.test.ts.snap
index 8e4b5a62c84..3aaf889373b 100644
--- a/packages/ozone/tests/__snapshots__/moderation-events.test.ts.snap
+++ b/packages/ozone/tests/__snapshots__/moderation-events.test.ts.snap
@@ -18,6 +18,14 @@ Object {
     "indexedAt": "1970-01-01T00:00:00.000Z",
     "moderation": Object {
       "subjectStatus": Object {
+        "accountStats": Object {
+          "$type": "tools.ozone.moderation.defs#accountStats",
+          "appealCount": 0,
+          "escalateCount": 1,
+          "reportCount": 4,
+          "suspendCount": 0,
+          "takedownCount": 0,
+        },
         "createdAt": "1970-01-01T00:00:00.000Z",
         "hosting": Object {
           "$type": "tools.ozone.moderation.defs#accountHosting",
@@ -27,6 +35,17 @@ Object {
         "lastReportedAt": "1970-01-01T00:00:00.000Z",
         "lastReviewedAt": "1970-01-01T00:00:00.000Z",
         "lastReviewedBy": "user(1)",
+        "recordsStats": Object {
+          "$type": "tools.ozone.moderation.defs#recordStats",
+          "appealedCount": 0,
+          "escalatedCount": 0,
+          "pendingCount": 2,
+          "processedCount": 0,
+          "reportedCount": 2,
+          "subjectCount": 2,
+          "takendownCount": 0,
+          "totalReports": 3,
+        },
         "reviewState": "tools.ozone.moderation.defs#reviewEscalated",
         "subject": Object {
           "$type": "com.atproto.admin.defs#repoRef",
diff --git a/packages/ozone/tests/__snapshots__/moderation-statuses.test.ts.snap b/packages/ozone/tests/__snapshots__/moderation-statuses.test.ts.snap
index 92b4646c120..9e1258212db 100644
--- a/packages/ozone/tests/__snapshots__/moderation-statuses.test.ts.snap
+++ b/packages/ozone/tests/__snapshots__/moderation-statuses.test.ts.snap
@@ -3,6 +3,14 @@
 exports[`moderation-statuses query statuses returns statuses filtered by subject language 1`] = `
 Array [
   Object {
+    "accountStats": Object {
+      "$type": "tools.ozone.moderation.defs#accountStats",
+      "appealCount": 0,
+      "escalateCount": 0,
+      "reportCount": 2,
+      "suspendCount": 0,
+      "takedownCount": 0,
+    },
     "createdAt": "1970-01-01T00:00:00.000Z",
     "hosting": Object {
       "$type": "tools.ozone.moderation.defs#recordHosting",
@@ -10,6 +18,17 @@ Array [
     },
     "id": 7,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
+    "recordsStats": Object {
+      "$type": "tools.ozone.moderation.defs#recordStats",
+      "appealedCount": 0,
+      "escalatedCount": 0,
+      "pendingCount": 1,
+      "processedCount": 0,
+      "reportedCount": 1,
+      "subjectCount": 1,
+      "takendownCount": 0,
+      "totalReports": 2,
+    },
     "reviewState": "tools.ozone.moderation.defs#reviewOpen",
     "subject": Object {
       "$type": "com.atproto.repo.strongRef",
@@ -27,6 +46,14 @@ Array [
     "updatedAt": "1970-01-01T00:00:00.000Z",
   },
   Object {
+    "accountStats": Object {
+      "$type": "tools.ozone.moderation.defs#accountStats",
+      "appealCount": 0,
+      "escalateCount": 0,
+      "reportCount": 2,
+      "suspendCount": 0,
+      "takedownCount": 0,
+    },
     "createdAt": "1970-01-01T00:00:00.000Z",
     "hosting": Object {
       "$type": "tools.ozone.moderation.defs#accountHosting",
@@ -34,6 +61,17 @@ Array [
     },
     "id": 5,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
+    "recordsStats": Object {
+      "$type": "tools.ozone.moderation.defs#recordStats",
+      "appealedCount": 0,
+      "escalatedCount": 0,
+      "pendingCount": 1,
+      "processedCount": 0,
+      "reportedCount": 1,
+      "subjectCount": 1,
+      "takendownCount": 0,
+      "totalReports": 2,
+    },
     "reviewState": "tools.ozone.moderation.defs#reviewOpen",
     "subject": Object {
       "$type": "com.atproto.admin.defs#repoRef",
@@ -55,6 +93,14 @@ Array [
 exports[`moderation-statuses query statuses returns statuses for subjects that received moderation events 1`] = `
 Array [
   Object {
+    "accountStats": Object {
+      "$type": "tools.ozone.moderation.defs#accountStats",
+      "appealCount": 0,
+      "escalateCount": 0,
+      "reportCount": 2,
+      "suspendCount": 0,
+      "takedownCount": 0,
+    },
     "createdAt": "1970-01-01T00:00:00.000Z",
     "hosting": Object {
       "$type": "tools.ozone.moderation.defs#recordHosting",
@@ -62,6 +108,17 @@ Array [
     },
     "id": 7,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
+    "recordsStats": Object {
+      "$type": "tools.ozone.moderation.defs#recordStats",
+      "appealedCount": 0,
+      "escalatedCount": 0,
+      "pendingCount": 1,
+      "processedCount": 0,
+      "reportedCount": 1,
+      "subjectCount": 1,
+      "takendownCount": 0,
+      "totalReports": 2,
+    },
     "reviewState": "tools.ozone.moderation.defs#reviewOpen",
     "subject": Object {
       "$type": "com.atproto.repo.strongRef",
@@ -79,6 +136,14 @@ Array [
     "updatedAt": "1970-01-01T00:00:00.000Z",
   },
   Object {
+    "accountStats": Object {
+      "$type": "tools.ozone.moderation.defs#accountStats",
+      "appealCount": 0,
+      "escalateCount": 0,
+      "reportCount": 2,
+      "suspendCount": 0,
+      "takedownCount": 0,
+    },
     "createdAt": "1970-01-01T00:00:00.000Z",
     "hosting": Object {
       "$type": "tools.ozone.moderation.defs#accountHosting",
@@ -86,6 +151,17 @@ Array [
     },
     "id": 5,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
+    "recordsStats": Object {
+      "$type": "tools.ozone.moderation.defs#recordStats",
+      "appealedCount": 0,
+      "escalatedCount": 0,
+      "pendingCount": 1,
+      "processedCount": 0,
+      "reportedCount": 1,
+      "subjectCount": 1,
+      "takendownCount": 0,
+      "totalReports": 2,
+    },
     "reviewState": "tools.ozone.moderation.defs#reviewOpen",
     "subject": Object {
       "$type": "com.atproto.admin.defs#repoRef",
@@ -102,6 +178,14 @@ Array [
     "updatedAt": "1970-01-01T00:00:00.000Z",
   },
   Object {
+    "accountStats": Object {
+      "$type": "tools.ozone.moderation.defs#accountStats",
+      "appealCount": 0,
+      "escalateCount": 0,
+      "reportCount": 2,
+      "suspendCount": 0,
+      "takedownCount": 0,
+    },
     "createdAt": "1970-01-01T00:00:00.000Z",
     "hosting": Object {
       "$type": "tools.ozone.moderation.defs#recordHosting",
@@ -109,6 +193,17 @@ Array [
     },
     "id": 3,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
+    "recordsStats": Object {
+      "$type": "tools.ozone.moderation.defs#recordStats",
+      "appealedCount": 0,
+      "escalatedCount": 0,
+      "pendingCount": 1,
+      "processedCount": 0,
+      "reportedCount": 1,
+      "subjectCount": 1,
+      "takendownCount": 0,
+      "totalReports": 2,
+    },
     "reviewState": "tools.ozone.moderation.defs#reviewOpen",
     "subject": Object {
       "$type": "com.atproto.repo.strongRef",
@@ -125,6 +220,14 @@ Array [
     "updatedAt": "1970-01-01T00:00:00.000Z",
   },
   Object {
+    "accountStats": Object {
+      "$type": "tools.ozone.moderation.defs#accountStats",
+      "appealCount": 0,
+      "escalateCount": 0,
+      "reportCount": 2,
+      "suspendCount": 0,
+      "takedownCount": 0,
+    },
     "createdAt": "1970-01-01T00:00:00.000Z",
     "hosting": Object {
       "$type": "tools.ozone.moderation.defs#accountHosting",
@@ -132,6 +235,17 @@ Array [
     },
     "id": 1,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
+    "recordsStats": Object {
+      "$type": "tools.ozone.moderation.defs#recordStats",
+      "appealedCount": 0,
+      "escalatedCount": 0,
+      "pendingCount": 1,
+      "processedCount": 0,
+      "reportedCount": 1,
+      "subjectCount": 1,
+      "takendownCount": 0,
+      "totalReports": 2,
+    },
     "reviewState": "tools.ozone.moderation.defs#reviewOpen",
     "subject": Object {
       "$type": "com.atproto.admin.defs#repoRef",
diff --git a/packages/ozone/tests/get-record.test.ts b/packages/ozone/tests/get-record.test.ts
index 8d4dbbb2527..0e289b550fb 100644
--- a/packages/ozone/tests/get-record.test.ts
+++ b/packages/ozone/tests/get-record.test.ts
@@ -33,6 +33,10 @@ describe('admin get record view', () => {
     await network.processAll()
   })
 
+  beforeEach(async () => {
+    await network.processAll()
+  })
+
   afterAll(async () => {
     await network.close()
   })
diff --git a/packages/ozone/tests/get-records.test.ts b/packages/ozone/tests/get-records.test.ts
index 7098ae6510d..3b3e63e1bd2 100644
--- a/packages/ozone/tests/get-records.test.ts
+++ b/packages/ozone/tests/get-records.test.ts
@@ -32,6 +32,10 @@ describe('admin get records view', () => {
     await network.processAll()
   })
 
+  beforeEach(async () => {
+    await network.processAll()
+  })
+
   afterAll(async () => {
     await network.close()
   })
diff --git a/packages/ozone/tests/get-repo.test.ts b/packages/ozone/tests/get-repo.test.ts
index c122dc3a001..6ededcbe00e 100644
--- a/packages/ozone/tests/get-repo.test.ts
+++ b/packages/ozone/tests/get-repo.test.ts
@@ -38,6 +38,10 @@ describe('admin get repo view', () => {
     await network.processAll()
   })
 
+  beforeEach(async () => {
+    await network.processAll()
+  })
+
   afterAll(async () => {
     await network.close()
   })
diff --git a/packages/ozone/tests/get-repos.test.ts b/packages/ozone/tests/get-repos.test.ts
index 52028d9230d..a56c7b54426 100644
--- a/packages/ozone/tests/get-repos.test.ts
+++ b/packages/ozone/tests/get-repos.test.ts
@@ -38,6 +38,10 @@ describe('admin get multiple repos', () => {
     await network.processAll()
   })
 
+  beforeEach(async () => {
+    await network.processAll()
+  })
+
   afterAll(async () => {
     await network.close()
   })
diff --git a/packages/ozone/tests/moderation-events.test.ts b/packages/ozone/tests/moderation-events.test.ts
index 181f7e9f3f4..9758f7c0759 100644
--- a/packages/ozone/tests/moderation-events.test.ts
+++ b/packages/ozone/tests/moderation-events.test.ts
@@ -68,6 +68,10 @@ describe('moderation-events', () => {
     await seedEvents()
   })
 
+  beforeEach(async () => {
+    await network.processAll()
+  })
+
   afterAll(async () => {
     await network.close()
   })
diff --git a/packages/ozone/tests/moderation-statuses.test.ts b/packages/ozone/tests/moderation-statuses.test.ts
index a8b4de52d00..dfe3cd9add3 100644
--- a/packages/ozone/tests/moderation-statuses.test.ts
+++ b/packages/ozone/tests/moderation-statuses.test.ts
@@ -73,6 +73,10 @@ describe('moderation-statuses', () => {
     await seedEvents()
   })
 
+  beforeEach(async () => {
+    await network.processAll()
+  })
+
   afterAll(async () => {
     await network.close()
   })
diff --git a/packages/ozone/tests/query-labels.test.ts b/packages/ozone/tests/query-labels.test.ts
index f1e47c48fd7..66157fb9ba7 100644
--- a/packages/ozone/tests/query-labels.test.ts
+++ b/packages/ozone/tests/query-labels.test.ts
@@ -156,6 +156,7 @@ describe('ozone query labels', () => {
         newSigningKey,
         newSigningKeyId,
         ctx.cfg,
+        // @ts-ignore
         modSrvc.backgroundQueue,
         ctx.idResolver,
         // @ts-ignore
diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
index 154f03f9aa1..40bfab70933 100644
--- a/packages/pds/src/lexicon/lexicons.ts
+++ b/packages/pds/src/lexicon/lexicons.ts
@@ -11322,6 +11322,85 @@ export const schemaDict = {
               type: 'string',
             },
           },
+          accountStats: {
+            description: 'Statistics related to the account subject',
+            type: 'ref',
+            ref: 'lex:tools.ozone.moderation.defs#accountStats',
+          },
+          recordsStats: {
+            description:
+              "Statistics related to the record subjects authored by the subject's account",
+            type: 'ref',
+            ref: 'lex:tools.ozone.moderation.defs#recordsStats',
+          },
+        },
+      },
+      accountStats: {
+        description: 'Statistics about a particular account subject',
+        type: 'object',
+        properties: {
+          reportCount: {
+            description: 'Total number of reports on the account',
+            type: 'integer',
+          },
+          appealCount: {
+            description:
+              'Total number of appeals against a moderation action on the account',
+            type: 'integer',
+          },
+          suspendCount: {
+            description: 'Number of times the account was suspended',
+            type: 'integer',
+          },
+          escalateCount: {
+            description: 'Number of times the account was escalated',
+            type: 'integer',
+          },
+          takedownCount: {
+            description: 'Number of times the account was taken down',
+            type: 'integer',
+          },
+        },
+      },
+      recordsStats: {
+        description: 'Statistics about a set of record subject items',
+        type: 'object',
+        properties: {
+          totalReports: {
+            description:
+              'Cumulative sum of the number of reports on the items in the set',
+            type: 'integer',
+          },
+          reportedCount: {
+            description: 'Number of items that were reported at least once',
+            type: 'integer',
+          },
+          escalatedCount: {
+            description: 'Number of items that were escalated at least once',
+            type: 'integer',
+          },
+          appealedCount: {
+            description: 'Number of items that were appealed at least once',
+            type: 'integer',
+          },
+          subjectCount: {
+            description: 'Total number of item in the set',
+            type: 'integer',
+          },
+          pendingCount: {
+            description:
+              'Number of item currently in "reviewOpen" or "reviewEscalated" state',
+            type: 'integer',
+          },
+          processedCount: {
+            description:
+              'Number of item currently in "reviewNone" or "reviewClosed" state',
+            type: 'integer',
+          },
+          takendownCount: {
+            description: 'Number of item currently taken down',
+            type: 'integer',
+          },
         },
       },
       subjectReviewState: {
@@ -12570,7 +12649,12 @@ export const schemaDict = {
             sortField: {
               type: 'string',
               default: 'lastReportedAt',
-              enum: ['lastReviewedAt', 'lastReportedAt'],
+              enum: [
+                'lastReviewedAt',
+                'lastReportedAt',
+                'reportedRecordsCount',
+                'takendownRecordsCount',
+              ],
             },
             sortDirection: {
               type: 'string',
@@ -12625,6 +12709,21 @@ export const schemaDict = {
                 "If specified, subjects of the given type (account or record) will be returned. When this is set to 'account' the 'collections' parameter will be ignored. When includeAllUserRecords or subject is set, this will be ignored.",
               knownValues: ['account', 'record'],
             },
+            minAccountSuspendCount: {
+              type: 'integer',
+              description:
+                'If specified, only subjects that belong to an account that has at least this many suspensions will be returned.',
+            },
+            minReportedRecordsCount: {
+              type: 'integer',
+              description:
+                'If specified, only subjects that belong to an account that has at least this many reported records will be returned.',
+            },
+            minTakendownRecordsCount: {
+              type: 'integer',
+              description:
+                'If specified, only subjects that belong to an account that has at least this many taken down records will be returned.',
+            },
           },
         },
         output: {
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts
index 7397fafc19d..572d323a298 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts
@@ -136,6 +136,8 @@ export interface SubjectStatusView {
   appealed?: boolean
   suspendUntil?: string
   tags?: string[]
+  accountStats?: AccountStats
+  recordsStats?: RecordsStats
   [k: string]: unknown
 }
 
@@ -151,6 +153,66 @@ export function validateSubjectStatusView(v: unknown): ValidationResult {
   return lexicons.validate('tools.ozone.moderation.defs#subjectStatusView', v)
 }
 
+/** Statistics about a particular account subject */
+export interface AccountStats {
+  /** Total number of reports on the account */
+  reportCount?: number
+  /** Total number of appeals against a moderation action on the account */
+  appealCount?: number
+  /** Number of times the account was suspended */
+  suspendCount?: number
+  /** Number of times the account was escalated */
+  escalateCount?: number
+  /** Number of times the account was taken down */
+  takedownCount?: number
+  [k: string]: unknown
+}
+
+export function isAccountStats(v: unknown): v is AccountStats {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'tools.ozone.moderation.defs#accountStats'
+  )
+}
+
+export function validateAccountStats(v: unknown): ValidationResult {
+  return lexicons.validate('tools.ozone.moderation.defs#accountStats', v)
+}
+
+/** Statistics about a set of record subject items */
+export interface RecordsStats {
+  /** Cumulative sum of the number of reports on the items in the set */
+  totalReports?: number
+  /** Number of items that were reported at least once */
+  reportedCount?: number
+  /** Number of items that were escalated at least once */
+  escalatedCount?: number
+  /** Number of items that were appealed at least once */
+  appealedCount?: number
+  /** Total number of item in the set */
+  subjectCount?: number
+  /** Number of item currently in "reviewOpen" or "reviewEscalated" state */
+  pendingCount?: number
+  /** Number of item currently in "reviewNone" or "reviewClosed" state */
+  processedCount?: number
+  /** Number of item currently taken down */
+  takendownCount?: number
+  [k: string]: unknown
+}
+
+export function isRecordsStats(v: unknown): v is RecordsStats {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'tools.ozone.moderation.defs#recordsStats'
+  )
+}
+
+export function validateRecordsStats(v: unknown): ValidationResult {
+  return lexicons.validate('tools.ozone.moderation.defs#recordsStats', v)
+}
+
 export type SubjectReviewState =
   | 'lex:tools.ozone.moderation.defs#reviewOpen'
   | 'lex:tools.ozone.moderation.defs#reviewEscalated'
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
index 0ccd1030c0b..28270425304 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
@@ -49,7 +49,11 @@ export interface QueryParams {
   ignoreSubjects?: string[]
   /** Get all subject statuses that were reviewed by a specific moderator */
   lastReviewedBy?: string
-  sortField: 'lastReviewedAt' | 'lastReportedAt'
+  sortField:
+    | 'lastReviewedAt'
+    | 'lastReportedAt'
+    | 'reportedRecordsCount'
+    | 'takendownRecordsCount'
   sortDirection: 'asc' | 'desc'
   /** Get subjects that were taken down */
   takendown?: boolean
@@ -63,6 +67,12 @@ export interface QueryParams {
   collections?: string[]
   /** If specified, subjects of the given type (account or record) will be returned. When this is set to 'account' the 'collections' parameter will be ignored. When includeAllUserRecords or subject is set, this will be ignored. */
   subjectType?: 'account' | 'record' | (string & {})
+  /** If specified, only subjects that belong to an account that has at least this many suspensions will be returned. */
+  minAccountSuspendCount?: number
+  /** If specified, only subjects that belong to an account that has at least this many reported records will be returned. */
+  minReportedRecordsCount?: number
+  /** If specified, only subjects that belong to an account that has at least this many taken down records will be returned. */
+  minTakendownRecordsCount?: number
 }
 
 export type InputSchema = undefined
diff --git a/packages/pds/tests/__snapshots__/takedown-appeal.test.ts.snap b/packages/pds/tests/__snapshots__/takedown-appeal.test.ts.snap
index a4dfd5d505c..1e7e1c31845 100644
--- a/packages/pds/tests/__snapshots__/takedown-appeal.test.ts.snap
+++ b/packages/pds/tests/__snapshots__/takedown-appeal.test.ts.snap
@@ -2,6 +2,9 @@
 
 exports[`appeal account takedown actor takedown allows appeal request. 1`] = `
 Object {
+  "accountStats": Object {
+    "$type": "tools.ozone.moderation.defs#accountStats",
+  },
   "appealed": true,
   "createdAt": "1970-01-01T00:00:00.000Z",
   "hosting": Object {
@@ -13,6 +16,9 @@ Object {
   "lastReportedAt": "1970-01-01T00:00:00.000Z",
   "lastReviewedAt": "1970-01-01T00:00:00.000Z",
   "lastReviewedBy": "user(0)",
+  "recordsStats": Object {
+    "$type": "tools.ozone.moderation.defs#recordStats",
+  },
   "reviewState": "tools.ozone.moderation.defs#reviewEscalated",
   "subject": Object {
     "$type": "com.atproto.admin.defs#repoRef",
diff --git a/packages/pds/tests/proxied/__snapshots__/admin.test.ts.snap b/packages/pds/tests/proxied/__snapshots__/admin.test.ts.snap
index 45f8c6daa02..32f98e2ae62 100644
--- a/packages/pds/tests/proxied/__snapshots__/admin.test.ts.snap
+++ b/packages/pds/tests/proxied/__snapshots__/admin.test.ts.snap
@@ -142,6 +142,14 @@ Object {
     "indexedAt": "1970-01-01T00:00:00.000Z",
     "moderation": Object {
       "subjectStatus": Object {
+        "accountStats": Object {
+          "$type": "tools.ozone.moderation.defs#accountStats",
+          "appealCount": 0,
+          "escalateCount": 0,
+          "reportCount": 2,
+          "suspendCount": 0,
+          "takedownCount": 0,
+        },
         "createdAt": "1970-01-01T00:00:00.000Z",
         "hosting": Object {
           "$type": "tools.ozone.moderation.defs#accountHosting",
@@ -151,6 +159,17 @@ Object {
         "lastReportedAt": "1970-01-01T00:00:00.000Z",
         "lastReviewedAt": "1970-01-01T00:00:00.000Z",
         "lastReviewedBy": "user(1)",
+        "recordsStats": Object {
+          "$type": "tools.ozone.moderation.defs#recordStats",
+          "appealedCount": 0,
+          "escalatedCount": 0,
+          "pendingCount": 0,
+          "processedCount": 1,
+          "reportedCount": 0,
+          "subjectCount": 1,
+          "takendownCount": 0,
+          "totalReports": 0,
+        },
         "reviewState": "tools.ozone.moderation.defs#reviewClosed",
         "subject": Object {
           "$type": "com.atproto.admin.defs#repoRef",
@@ -240,6 +259,14 @@ Object {
   "labels": Array [],
   "moderation": Object {
     "subjectStatus": Object {
+      "accountStats": Object {
+        "$type": "tools.ozone.moderation.defs#accountStats",
+        "appealCount": 0,
+        "escalateCount": 0,
+        "reportCount": 2,
+        "suspendCount": 0,
+        "takedownCount": 0,
+      },
       "createdAt": "1970-01-01T00:00:00.000Z",
       "hosting": Object {
         "$type": "tools.ozone.moderation.defs#recordHosting",
@@ -248,6 +275,17 @@ Object {
       "id": 5,
       "lastReviewedAt": "1970-01-01T00:00:00.000Z",
       "lastReviewedBy": "user(1)",
+      "recordsStats": Object {
+        "$type": "tools.ozone.moderation.defs#recordStats",
+        "appealedCount": 0,
+        "escalatedCount": 0,
+        "pendingCount": 0,
+        "processedCount": 1,
+        "reportedCount": 0,
+        "subjectCount": 1,
+        "takendownCount": 0,
+        "totalReports": 0,
+      },
       "reviewState": "tools.ozone.moderation.defs#reviewClosed",
       "subject": Object {
         "$type": "com.atproto.repo.strongRef",
@@ -301,6 +339,14 @@ Object {
     "invitesDisabled": true,
     "moderation": Object {
       "subjectStatus": Object {
+        "accountStats": Object {
+          "$type": "tools.ozone.moderation.defs#accountStats",
+          "appealCount": 0,
+          "escalateCount": 0,
+          "reportCount": 2,
+          "suspendCount": 0,
+          "takedownCount": 0,
+        },
         "createdAt": "1970-01-01T00:00:00.000Z",
         "hosting": Object {
           "$type": "tools.ozone.moderation.defs#accountHosting",
@@ -310,6 +356,17 @@ Object {
         "lastReportedAt": "1970-01-01T00:00:00.000Z",
         "lastReviewedAt": "1970-01-01T00:00:00.000Z",
         "lastReviewedBy": "user(1)",
+        "recordsStats": Object {
+          "$type": "tools.ozone.moderation.defs#recordStats",
+          "appealedCount": 0,
+          "escalatedCount": 0,
+          "pendingCount": 0,
+          "processedCount": 1,
+          "reportedCount": 0,
+          "subjectCount": 1,
+          "takendownCount": 0,
+          "totalReports": 0,
+        },
         "reviewState": "tools.ozone.moderation.defs#reviewClosed",
         "subject": Object {
           "$type": "com.atproto.admin.defs#repoRef",
diff --git a/packages/pds/tests/proxied/admin.test.ts b/packages/pds/tests/proxied/admin.test.ts
index 1f51d2df9f5..d9871ea73a3 100644
--- a/packages/pds/tests/proxied/admin.test.ts
+++ b/packages/pds/tests/proxied/admin.test.ts
@@ -62,6 +62,9 @@ describe('proxies admin requests', () => {
       password: 'password',
       inviteCode: invite.code,
     })
+  })
+
+  beforeEach(async () => {
     await network.processAll()
   })
 

From 50603b4f2ef08bd618730107ec164a57f27dcca6 Mon Sep 17 00:00:00 2001
From: Matthieu Sieben <matthieusieben@users.noreply.github.com>
Date: Mon, 20 Jan 2025 16:17:42 +0100
Subject: [PATCH 012/101] =?UTF-8?q?Add=20account=20and=20record=20level=20?=
 =?UTF-8?q?statistics=20when=20querring=20`tools.ozone.mo=E2=80=A6=20(#341?=
 =?UTF-8?q?6)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add account and record level statistics when querring `tools.ozone.moderation.queryStatuses`.

* Update `tools.ozone.moderation.queryStatuses` lexicon
---
 .changeset/clever-countries-attend.md | 5 +++++
 .changeset/serious-comics-joke.md     | 6 ++++++
 2 files changed, 11 insertions(+)
 create mode 100644 .changeset/clever-countries-attend.md
 create mode 100644 .changeset/serious-comics-joke.md

diff --git a/.changeset/clever-countries-attend.md b/.changeset/clever-countries-attend.md
new file mode 100644
index 00000000000..933922f1176
--- /dev/null
+++ b/.changeset/clever-countries-attend.md
@@ -0,0 +1,5 @@
+---
+"@atproto/ozone": patch
+---
+
+Add account and record level statistics when querring `tools.ozone.moderation.queryStatuses`.
diff --git a/.changeset/serious-comics-joke.md b/.changeset/serious-comics-joke.md
new file mode 100644
index 00000000000..fe543f70204
--- /dev/null
+++ b/.changeset/serious-comics-joke.md
@@ -0,0 +1,6 @@
+---
+"@atproto/api": patch
+"@atproto/pds": patch
+---
+
+Update `tools.ozone.moderation.queryStatuses` lexicon

From d80380cb5686f30aa9d23b67f5db69ec161b265a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 15:28:55 +0000
Subject: [PATCH 013/101] Version packages (#3417)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/clever-countries-attend.md |  5 -----
 .changeset/serious-comics-joke.md     |  6 ------
 packages/api/CHANGELOG.md             |  6 ++++++
 packages/api/package.json             |  2 +-
 packages/bsky/CHANGELOG.md            |  7 +++++++
 packages/bsky/package.json            |  2 +-
 packages/dev-env/CHANGELOG.md         | 10 ++++++++++
 packages/dev-env/package.json         |  2 +-
 packages/ozone/CHANGELOG.md           |  9 +++++++++
 packages/ozone/package.json           |  2 +-
 packages/pds/CHANGELOG.md             |  9 +++++++++
 packages/pds/package.json             |  2 +-
 12 files changed, 46 insertions(+), 16 deletions(-)
 delete mode 100644 .changeset/clever-countries-attend.md
 delete mode 100644 .changeset/serious-comics-joke.md

diff --git a/.changeset/clever-countries-attend.md b/.changeset/clever-countries-attend.md
deleted file mode 100644
index 933922f1176..00000000000
--- a/.changeset/clever-countries-attend.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/ozone": patch
----
-
-Add account and record level statistics when querring `tools.ozone.moderation.queryStatuses`.
diff --git a/.changeset/serious-comics-joke.md b/.changeset/serious-comics-joke.md
deleted file mode 100644
index fe543f70204..00000000000
--- a/.changeset/serious-comics-joke.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"@atproto/api": patch
-"@atproto/pds": patch
----
-
-Update `tools.ozone.moderation.queryStatuses` lexicon
diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md
index 5de7eea7b3f..40c0a9955e5 100644
--- a/packages/api/CHANGELOG.md
+++ b/packages/api/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @atproto/api
 
+## 0.13.29
+
+### Patch Changes
+
+- [#3416](https://github.com/bluesky-social/atproto/pull/3416) [`50603b4f2`](https://github.com/bluesky-social/atproto/commit/50603b4f2ef08bd618730107ec164a57f27dcca6) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Update `tools.ozone.moderation.queryStatuses` lexicon
+
 ## 0.13.28
 
 ### Patch Changes
diff --git a/packages/api/package.json b/packages/api/package.json
index a3591f1a6d4..b7bfff0df8f 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/api",
-  "version": "0.13.28",
+  "version": "0.13.29",
   "license": "MIT",
   "description": "Client library for atproto and Bluesky",
   "keywords": [
diff --git a/packages/bsky/CHANGELOG.md b/packages/bsky/CHANGELOG.md
index 5daef0e68fa..fad86b7131b 100644
--- a/packages/bsky/CHANGELOG.md
+++ b/packages/bsky/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/bsky
 
+## 0.0.109
+
+### Patch Changes
+
+- Updated dependencies [[`50603b4f2`](https://github.com/bluesky-social/atproto/commit/50603b4f2ef08bd618730107ec164a57f27dcca6)]:
+  - @atproto/api@0.13.29
+
 ## 0.0.108
 
 ### Patch Changes
diff --git a/packages/bsky/package.json b/packages/bsky/package.json
index 3fa14aa087e..7c782e66962 100644
--- a/packages/bsky/package.json
+++ b/packages/bsky/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.108",
+  "version": "0.0.109",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
diff --git a/packages/dev-env/CHANGELOG.md b/packages/dev-env/CHANGELOG.md
index 6301d867f1f..3e121f398b0 100644
--- a/packages/dev-env/CHANGELOG.md
+++ b/packages/dev-env/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @atproto/dev-env
 
+## 0.3.79
+
+### Patch Changes
+
+- Updated dependencies [[`50603b4f2`](https://github.com/bluesky-social/atproto/commit/50603b4f2ef08bd618730107ec164a57f27dcca6), [`50603b4f2`](https://github.com/bluesky-social/atproto/commit/50603b4f2ef08bd618730107ec164a57f27dcca6)]:
+  - @atproto/ozone@0.1.70
+  - @atproto/api@0.13.29
+  - @atproto/pds@0.4.87
+  - @atproto/bsky@0.0.109
+
 ## 0.3.78
 
 ### Patch Changes
diff --git a/packages/dev-env/package.json b/packages/dev-env/package.json
index bacd2e20d7b..92bc4fff103 100644
--- a/packages/dev-env/package.json
+++ b/packages/dev-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/dev-env",
-  "version": "0.3.78",
+  "version": "0.3.79",
   "license": "MIT",
   "description": "Local development environment helper for atproto development",
   "keywords": [
diff --git a/packages/ozone/CHANGELOG.md b/packages/ozone/CHANGELOG.md
index ad89cff2d77..486961dafa6 100644
--- a/packages/ozone/CHANGELOG.md
+++ b/packages/ozone/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @atproto/ozone
 
+## 0.1.70
+
+### Patch Changes
+
+- [#3416](https://github.com/bluesky-social/atproto/pull/3416) [`50603b4f2`](https://github.com/bluesky-social/atproto/commit/50603b4f2ef08bd618730107ec164a57f27dcca6) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Add account and record level statistics when querring `tools.ozone.moderation.queryStatuses`.
+
+- Updated dependencies [[`50603b4f2`](https://github.com/bluesky-social/atproto/commit/50603b4f2ef08bd618730107ec164a57f27dcca6)]:
+  - @atproto/api@0.13.29
+
 ## 0.1.69
 
 ### Patch Changes
diff --git a/packages/ozone/package.json b/packages/ozone/package.json
index 4a5842a4e96..6dd0da90d45 100644
--- a/packages/ozone/package.json
+++ b/packages/ozone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.1.69",
+  "version": "0.1.70",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
diff --git a/packages/pds/CHANGELOG.md b/packages/pds/CHANGELOG.md
index b9700a226a7..070db64f748 100644
--- a/packages/pds/CHANGELOG.md
+++ b/packages/pds/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @atproto/pds
 
+## 0.4.87
+
+### Patch Changes
+
+- [#3416](https://github.com/bluesky-social/atproto/pull/3416) [`50603b4f2`](https://github.com/bluesky-social/atproto/commit/50603b4f2ef08bd618730107ec164a57f27dcca6) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Update `tools.ozone.moderation.queryStatuses` lexicon
+
+- Updated dependencies [[`50603b4f2`](https://github.com/bluesky-social/atproto/commit/50603b4f2ef08bd618730107ec164a57f27dcca6)]:
+  - @atproto/api@0.13.29
+
 ## 0.4.86
 
 ### Patch Changes
diff --git a/packages/pds/package.json b/packages/pds/package.json
index 6adaed06e1d..cc241c9aead 100644
--- a/packages/pds/package.json
+++ b/packages/pds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/pds",
-  "version": "0.4.86",
+  "version": "0.4.87",
   "license": "MIT",
   "description": "Reference implementation of atproto Personal Data Server (PDS)",
   "keywords": [

From 6241f6b00b8728cd5f5e879591b0ca98308edab0 Mon Sep 17 00:00:00 2001
From: rafael <rafael@blueskyweb.xyz>
Date: Mon, 20 Jan 2025 21:56:11 -0300
Subject: [PATCH 014/101] expose resetRouteRateLimits to the req handler
 (#3420)

---
 .changeset/large-plums-check.md        | 5 +++++
 packages/lex-cli/src/codegen/server.ts | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 .changeset/large-plums-check.md

diff --git a/.changeset/large-plums-check.md b/.changeset/large-plums-check.md
new file mode 100644
index 00000000000..93454901540
--- /dev/null
+++ b/.changeset/large-plums-check.md
@@ -0,0 +1,5 @@
+---
+"@atproto/lex-cli": patch
+---
+
+Expose resetRouteRateLimits to the handler context
diff --git a/packages/lex-cli/src/codegen/server.ts b/packages/lex-cli/src/codegen/server.ts
index ec03c7a037b..6b741b94d81 100644
--- a/packages/lex-cli/src/codegen/server.ts
+++ b/packages/lex-cli/src/codegen/server.ts
@@ -520,6 +520,7 @@ function genServerXrpcMethod(
         input: HandlerInput
         req: express.Request
         res: express.Response
+        resetRouteRateLimits: () => Promise<void>
       }`,
   })
 

From d3432f0a79a2148d0dc90c93f4e7664e83d5ffff Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 22:00:43 -0300
Subject: [PATCH 015/101] Version packages (#3421)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/large-plums-check.md | 5 -----
 packages/lex-cli/CHANGELOG.md   | 6 ++++++
 packages/lex-cli/package.json   | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)
 delete mode 100644 .changeset/large-plums-check.md

diff --git a/.changeset/large-plums-check.md b/.changeset/large-plums-check.md
deleted file mode 100644
index 93454901540..00000000000
--- a/.changeset/large-plums-check.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/lex-cli": patch
----
-
-Expose resetRouteRateLimits to the handler context
diff --git a/packages/lex-cli/CHANGELOG.md b/packages/lex-cli/CHANGELOG.md
index 376f507aaa7..b156f3c6b68 100644
--- a/packages/lex-cli/CHANGELOG.md
+++ b/packages/lex-cli/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @atproto/lex-cli
 
+## 0.5.6
+
+### Patch Changes
+
+- [#3420](https://github.com/bluesky-social/atproto/pull/3420) [`6241f6b00`](https://github.com/bluesky-social/atproto/commit/6241f6b00b8728cd5f5e879591b0ca98308edab0) Thanks [@rafaelbsky](https://github.com/rafaelbsky)! - Expose resetRouteRateLimits to the handler context
+
 ## 0.5.5
 
 ### Patch Changes
diff --git a/packages/lex-cli/package.json b/packages/lex-cli/package.json
index c502afc3cbf..1e291106425 100644
--- a/packages/lex-cli/package.json
+++ b/packages/lex-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/lex-cli",
-  "version": "0.5.5",
+  "version": "0.5.6",
   "license": "MIT",
   "description": "TypeScript codegen tool for atproto Lexicon schemas",
   "keywords": [

From 1015d96925898149cc60b434561e19730a1bea12 Mon Sep 17 00:00:00 2001
From: rafael <rafael@blueskyweb.xyz>
Date: Tue, 21 Jan 2025 10:33:28 -0300
Subject: [PATCH 016/101] changeset (#3422)

---
 .changeset/giant-badgers-confess.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/giant-badgers-confess.md

diff --git a/.changeset/giant-badgers-confess.md b/.changeset/giant-badgers-confess.md
new file mode 100644
index 00000000000..857f6797e21
--- /dev/null
+++ b/.changeset/giant-badgers-confess.md
@@ -0,0 +1,5 @@
+---
+"@atproto/xrpc-server": patch
+---
+
+Fix rate limit reset binding

From 74ee10826296db49d2c1e48f83bab8f28fee1e6c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 21 Jan 2025 10:55:50 -0300
Subject: [PATCH 017/101] Version packages (#3425)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/giant-badgers-confess.md       |  5 -----
 packages/bsky/CHANGELOG.md                |  9 +++++++++
 packages/bsky/package.json                |  2 +-
 packages/dev-env/CHANGELOG.md             | 11 +++++++++++
 packages/dev-env/package.json             |  2 +-
 packages/internal/xrpc-utils/CHANGELOG.md |  7 +++++++
 packages/internal/xrpc-utils/package.json |  2 +-
 packages/ozone/CHANGELOG.md               |  7 +++++++
 packages/ozone/package.json               |  2 +-
 packages/pds/CHANGELOG.md                 |  8 ++++++++
 packages/pds/package.json                 |  2 +-
 packages/sync/CHANGELOG.md                |  7 +++++++
 packages/sync/package.json                |  2 +-
 packages/xrpc-server/CHANGELOG.md         |  6 ++++++
 packages/xrpc-server/package.json         |  2 +-
 15 files changed, 62 insertions(+), 12 deletions(-)
 delete mode 100644 .changeset/giant-badgers-confess.md

diff --git a/.changeset/giant-badgers-confess.md b/.changeset/giant-badgers-confess.md
deleted file mode 100644
index 857f6797e21..00000000000
--- a/.changeset/giant-badgers-confess.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/xrpc-server": patch
----
-
-Fix rate limit reset binding
diff --git a/packages/bsky/CHANGELOG.md b/packages/bsky/CHANGELOG.md
index fad86b7131b..c566e2f8f04 100644
--- a/packages/bsky/CHANGELOG.md
+++ b/packages/bsky/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @atproto/bsky
 
+## 0.0.110
+
+### Patch Changes
+
+- Updated dependencies [[`1015d9692`](https://github.com/bluesky-social/atproto/commit/1015d96925898149cc60b434561e19730a1bea12)]:
+  - @atproto/xrpc-server@0.7.8
+  - @atproto-labs/xrpc-utils@0.0.4
+  - @atproto/sync@0.1.11
+
 ## 0.0.109
 
 ### Patch Changes
diff --git a/packages/bsky/package.json b/packages/bsky/package.json
index 7c782e66962..50ead1b3514 100644
--- a/packages/bsky/package.json
+++ b/packages/bsky/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.109",
+  "version": "0.0.110",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
diff --git a/packages/dev-env/CHANGELOG.md b/packages/dev-env/CHANGELOG.md
index 3e121f398b0..e933d3808ae 100644
--- a/packages/dev-env/CHANGELOG.md
+++ b/packages/dev-env/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @atproto/dev-env
 
+## 0.3.80
+
+### Patch Changes
+
+- Updated dependencies [[`1015d9692`](https://github.com/bluesky-social/atproto/commit/1015d96925898149cc60b434561e19730a1bea12)]:
+  - @atproto/xrpc-server@0.7.8
+  - @atproto/bsky@0.0.110
+  - @atproto/ozone@0.1.71
+  - @atproto/pds@0.4.88
+  - @atproto/sync@0.1.11
+
 ## 0.3.79
 
 ### Patch Changes
diff --git a/packages/dev-env/package.json b/packages/dev-env/package.json
index 92bc4fff103..33293b942a1 100644
--- a/packages/dev-env/package.json
+++ b/packages/dev-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/dev-env",
-  "version": "0.3.79",
+  "version": "0.3.80",
   "license": "MIT",
   "description": "Local development environment helper for atproto development",
   "keywords": [
diff --git a/packages/internal/xrpc-utils/CHANGELOG.md b/packages/internal/xrpc-utils/CHANGELOG.md
index 96636b07e52..79220dbb390 100644
--- a/packages/internal/xrpc-utils/CHANGELOG.md
+++ b/packages/internal/xrpc-utils/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto-labs/xrpc-utils
 
+## 0.0.4
+
+### Patch Changes
+
+- Updated dependencies [[`1015d9692`](https://github.com/bluesky-social/atproto/commit/1015d96925898149cc60b434561e19730a1bea12)]:
+  - @atproto/xrpc-server@0.7.8
+
 ## 0.0.3
 
 ### Patch Changes
diff --git a/packages/internal/xrpc-utils/package.json b/packages/internal/xrpc-utils/package.json
index a4d17fa6700..935cc8a9e62 100644
--- a/packages/internal/xrpc-utils/package.json
+++ b/packages/internal/xrpc-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto-labs/xrpc-utils",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "license": "MIT",
   "description": "XRPC server utilities for Node.JS",
   "keywords": [
diff --git a/packages/ozone/CHANGELOG.md b/packages/ozone/CHANGELOG.md
index 486961dafa6..eb0a95d23d5 100644
--- a/packages/ozone/CHANGELOG.md
+++ b/packages/ozone/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/ozone
 
+## 0.1.71
+
+### Patch Changes
+
+- Updated dependencies [[`1015d9692`](https://github.com/bluesky-social/atproto/commit/1015d96925898149cc60b434561e19730a1bea12)]:
+  - @atproto/xrpc-server@0.7.8
+
 ## 0.1.70
 
 ### Patch Changes
diff --git a/packages/ozone/package.json b/packages/ozone/package.json
index 6dd0da90d45..ade4f19d7df 100644
--- a/packages/ozone/package.json
+++ b/packages/ozone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.1.70",
+  "version": "0.1.71",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
diff --git a/packages/pds/CHANGELOG.md b/packages/pds/CHANGELOG.md
index 070db64f748..dd2a563ab7b 100644
--- a/packages/pds/CHANGELOG.md
+++ b/packages/pds/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @atproto/pds
 
+## 0.4.88
+
+### Patch Changes
+
+- Updated dependencies [[`1015d9692`](https://github.com/bluesky-social/atproto/commit/1015d96925898149cc60b434561e19730a1bea12)]:
+  - @atproto/xrpc-server@0.7.8
+  - @atproto-labs/xrpc-utils@0.0.4
+
 ## 0.4.87
 
 ### Patch Changes
diff --git a/packages/pds/package.json b/packages/pds/package.json
index cc241c9aead..f731ff305ba 100644
--- a/packages/pds/package.json
+++ b/packages/pds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/pds",
-  "version": "0.4.87",
+  "version": "0.4.88",
   "license": "MIT",
   "description": "Reference implementation of atproto Personal Data Server (PDS)",
   "keywords": [
diff --git a/packages/sync/CHANGELOG.md b/packages/sync/CHANGELOG.md
index ded9e3892b9..49ff04e5723 100644
--- a/packages/sync/CHANGELOG.md
+++ b/packages/sync/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/sync
 
+## 0.1.11
+
+### Patch Changes
+
+- Updated dependencies [[`1015d9692`](https://github.com/bluesky-social/atproto/commit/1015d96925898149cc60b434561e19730a1bea12)]:
+  - @atproto/xrpc-server@0.7.8
+
 ## 0.1.10
 
 ### Patch Changes
diff --git a/packages/sync/package.json b/packages/sync/package.json
index eb83470c661..306e7b535c5 100644
--- a/packages/sync/package.json
+++ b/packages/sync/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/sync",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "license": "MIT",
   "description": "atproto sync library",
   "keywords": [
diff --git a/packages/xrpc-server/CHANGELOG.md b/packages/xrpc-server/CHANGELOG.md
index d99b9b5cfb9..38786a39bff 100644
--- a/packages/xrpc-server/CHANGELOG.md
+++ b/packages/xrpc-server/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @atproto/xrpc-server
 
+## 0.7.8
+
+### Patch Changes
+
+- [#3422](https://github.com/bluesky-social/atproto/pull/3422) [`1015d9692`](https://github.com/bluesky-social/atproto/commit/1015d96925898149cc60b434561e19730a1bea12) Thanks [@rafaelbsky](https://github.com/rafaelbsky)! - Fix rate limit reset binding
+
 ## 0.7.7
 
 ### Patch Changes
diff --git a/packages/xrpc-server/package.json b/packages/xrpc-server/package.json
index 8417823aff1..4c5037995ac 100644
--- a/packages/xrpc-server/package.json
+++ b/packages/xrpc-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/xrpc-server",
-  "version": "0.7.7",
+  "version": "0.7.8",
   "license": "MIT",
   "description": "atproto HTTP API (XRPC) server library",
   "keywords": [

From 1ada2d093427e45b6d59a16cf146bf5282560c7b Mon Sep 17 00:00:00 2001
From: Matthieu Sieben <matthieusieben@users.noreply.github.com>
Date: Tue, 21 Jan 2025 17:12:02 +0100
Subject: [PATCH 018/101] Fix getSubjectStatuses SQL (#3426)

---
 .changeset/heavy-badgers-share.md       | 5 +++++
 packages/ozone/src/mod-service/index.ts | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/heavy-badgers-share.md

diff --git a/.changeset/heavy-badgers-share.md b/.changeset/heavy-badgers-share.md
new file mode 100644
index 00000000000..be2d2bc97e6
--- /dev/null
+++ b/.changeset/heavy-badgers-share.md
@@ -0,0 +1,5 @@
+---
+"@atproto/ozone": patch
+---
+
+Fix getSubjectStatuses query
diff --git a/packages/ozone/src/mod-service/index.ts b/packages/ozone/src/mod-service/index.ts
index a1fd403fa2f..ff3891ed225 100644
--- a/packages/ozone/src/mod-service/index.ts
+++ b/packages/ozone/src/mod-service/index.ts
@@ -886,8 +886,8 @@ export class ModerationService {
     ) {
       builder = builder.where(
         queueSeed
-          ? sql`ABS(HASHTEXT(${queueSeed} || did)) % ${queueCount}`
-          : sql`ABS(HASHTEXT(did)) % ${queueCount}`,
+          ? sql`ABS(HASHTEXT(${queueSeed} || moderation_subject_status.did)) % ${queueCount}`
+          : sql`ABS(HASHTEXT(moderation_subject_status.did)) % ${queueCount}`,
         '=',
         queueIndex,
       )

From b1dd0504ccc9fa9273352e27ddd9f11660e6fba3 Mon Sep 17 00:00:00 2001
From: rafael <rafael@blueskyweb.xyz>
Date: Tue, 21 Jan 2025 14:36:50 -0300
Subject: [PATCH 019/101] [threadContext 1] Add threadContext to threadViewPost
 - lex (#3318)

---
 lexicons/app/bsky/feed/defs.json              | 10 +++++++++-
 packages/api/src/client/lexicons.ts           | 15 +++++++++++++++
 .../src/client/types/app/bsky/feed/defs.ts    | 19 +++++++++++++++++++
 packages/bsky/src/lexicon/lexicons.ts         | 15 +++++++++++++++
 .../src/lexicon/types/app/bsky/feed/defs.ts   | 19 +++++++++++++++++++
 packages/ozone/src/lexicon/lexicons.ts        | 15 +++++++++++++++
 .../src/lexicon/types/app/bsky/feed/defs.ts   | 19 +++++++++++++++++++
 packages/pds/src/lexicon/lexicons.ts          | 15 +++++++++++++++
 .../src/lexicon/types/app/bsky/feed/defs.ts   | 19 +++++++++++++++++++
 9 files changed, 145 insertions(+), 1 deletion(-)

diff --git a/lexicons/app/bsky/feed/defs.json b/lexicons/app/bsky/feed/defs.json
index 8aca402f830..4f92c401927 100644
--- a/lexicons/app/bsky/feed/defs.json
+++ b/lexicons/app/bsky/feed/defs.json
@@ -48,6 +48,13 @@
         "pinned": { "type": "boolean" }
       }
     },
+    "threadContext": {
+      "type": "object",
+      "description": "Metadata about this post within the context of the thread it is in.",
+      "properties": {
+        "rootAuthorLike": { "type": "string", "format": "at-uri" }
+      }
+    },
     "feedViewPost": {
       "type": "object",
       "required": ["post"],
@@ -108,7 +115,8 @@
             "type": "union",
             "refs": ["#threadViewPost", "#notFoundPost", "#blockedPost"]
           }
-        }
+        },
+        "threadContext": { "type": "ref", "ref": "#threadContext" }
       }
     },
     "notFoundPost": {
diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
index 40bfab70933..1eb438b9200 100644
--- a/packages/api/src/client/lexicons.ts
+++ b/packages/api/src/client/lexicons.ts
@@ -5573,6 +5573,17 @@ export const schemaDict = {
           },
         },
       },
+      threadContext: {
+        type: 'object',
+        description:
+          'Metadata about this post within the context of the thread it is in.',
+        properties: {
+          rootAuthorLike: {
+            type: 'string',
+            format: 'at-uri',
+          },
+        },
+      },
       feedViewPost: {
         type: 'object',
         required: ['post'],
@@ -5673,6 +5684,10 @@ export const schemaDict = {
               ],
             },
           },
+          threadContext: {
+            type: 'ref',
+            ref: 'lex:app.bsky.feed.defs#threadContext',
+          },
         },
       },
       notFoundPost: {
diff --git a/packages/api/src/client/types/app/bsky/feed/defs.ts b/packages/api/src/client/types/app/bsky/feed/defs.ts
index 64c3f7247d8..760c634d35f 100644
--- a/packages/api/src/client/types/app/bsky/feed/defs.ts
+++ b/packages/api/src/client/types/app/bsky/feed/defs.ts
@@ -71,6 +71,24 @@ export function validateViewerState(v: unknown): ValidationResult {
   return lexicons.validate('app.bsky.feed.defs#viewerState', v)
 }
 
+/** Metadata about this post within the context of the thread it is in. */
+export interface ThreadContext {
+  rootAuthorLike?: string
+  [k: string]: unknown
+}
+
+export function isThreadContext(v: unknown): v is ThreadContext {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'app.bsky.feed.defs#threadContext'
+  )
+}
+
+export function validateThreadContext(v: unknown): ValidationResult {
+  return lexicons.validate('app.bsky.feed.defs#threadContext', v)
+}
+
 export interface FeedViewPost {
   post: PostView
   reply?: ReplyRef
@@ -164,6 +182,7 @@ export interface ThreadViewPost {
     | BlockedPost
     | { $type: string; [k: string]: unknown }
   )[]
+  threadContext?: ThreadContext
   [k: string]: unknown
 }
 
diff --git a/packages/bsky/src/lexicon/lexicons.ts b/packages/bsky/src/lexicon/lexicons.ts
index 397370e3bc3..aecaa923597 100644
--- a/packages/bsky/src/lexicon/lexicons.ts
+++ b/packages/bsky/src/lexicon/lexicons.ts
@@ -5573,6 +5573,17 @@ export const schemaDict = {
           },
         },
       },
+      threadContext: {
+        type: 'object',
+        description:
+          'Metadata about this post within the context of the thread it is in.',
+        properties: {
+          rootAuthorLike: {
+            type: 'string',
+            format: 'at-uri',
+          },
+        },
+      },
       feedViewPost: {
         type: 'object',
         required: ['post'],
@@ -5673,6 +5684,10 @@ export const schemaDict = {
               ],
             },
           },
+          threadContext: {
+            type: 'ref',
+            ref: 'lex:app.bsky.feed.defs#threadContext',
+          },
         },
       },
       notFoundPost: {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/defs.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/defs.ts
index 4472369375e..fdf7e58c8a3 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/defs.ts
@@ -71,6 +71,24 @@ export function validateViewerState(v: unknown): ValidationResult {
   return lexicons.validate('app.bsky.feed.defs#viewerState', v)
 }
 
+/** Metadata about this post within the context of the thread it is in. */
+export interface ThreadContext {
+  rootAuthorLike?: string
+  [k: string]: unknown
+}
+
+export function isThreadContext(v: unknown): v is ThreadContext {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'app.bsky.feed.defs#threadContext'
+  )
+}
+
+export function validateThreadContext(v: unknown): ValidationResult {
+  return lexicons.validate('app.bsky.feed.defs#threadContext', v)
+}
+
 export interface FeedViewPost {
   post: PostView
   reply?: ReplyRef
@@ -164,6 +182,7 @@ export interface ThreadViewPost {
     | BlockedPost
     | { $type: string; [k: string]: unknown }
   )[]
+  threadContext?: ThreadContext
   [k: string]: unknown
 }
 
diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
index 40bfab70933..1eb438b9200 100644
--- a/packages/ozone/src/lexicon/lexicons.ts
+++ b/packages/ozone/src/lexicon/lexicons.ts
@@ -5573,6 +5573,17 @@ export const schemaDict = {
           },
         },
       },
+      threadContext: {
+        type: 'object',
+        description:
+          'Metadata about this post within the context of the thread it is in.',
+        properties: {
+          rootAuthorLike: {
+            type: 'string',
+            format: 'at-uri',
+          },
+        },
+      },
       feedViewPost: {
         type: 'object',
         required: ['post'],
@@ -5673,6 +5684,10 @@ export const schemaDict = {
               ],
             },
           },
+          threadContext: {
+            type: 'ref',
+            ref: 'lex:app.bsky.feed.defs#threadContext',
+          },
         },
       },
       notFoundPost: {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/defs.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/defs.ts
index 4472369375e..fdf7e58c8a3 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/defs.ts
@@ -71,6 +71,24 @@ export function validateViewerState(v: unknown): ValidationResult {
   return lexicons.validate('app.bsky.feed.defs#viewerState', v)
 }
 
+/** Metadata about this post within the context of the thread it is in. */
+export interface ThreadContext {
+  rootAuthorLike?: string
+  [k: string]: unknown
+}
+
+export function isThreadContext(v: unknown): v is ThreadContext {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'app.bsky.feed.defs#threadContext'
+  )
+}
+
+export function validateThreadContext(v: unknown): ValidationResult {
+  return lexicons.validate('app.bsky.feed.defs#threadContext', v)
+}
+
 export interface FeedViewPost {
   post: PostView
   reply?: ReplyRef
@@ -164,6 +182,7 @@ export interface ThreadViewPost {
     | BlockedPost
     | { $type: string; [k: string]: unknown }
   )[]
+  threadContext?: ThreadContext
   [k: string]: unknown
 }
 
diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
index 40bfab70933..1eb438b9200 100644
--- a/packages/pds/src/lexicon/lexicons.ts
+++ b/packages/pds/src/lexicon/lexicons.ts
@@ -5573,6 +5573,17 @@ export const schemaDict = {
           },
         },
       },
+      threadContext: {
+        type: 'object',
+        description:
+          'Metadata about this post within the context of the thread it is in.',
+        properties: {
+          rootAuthorLike: {
+            type: 'string',
+            format: 'at-uri',
+          },
+        },
+      },
       feedViewPost: {
         type: 'object',
         required: ['post'],
@@ -5673,6 +5684,10 @@ export const schemaDict = {
               ],
             },
           },
+          threadContext: {
+            type: 'ref',
+            ref: 'lex:app.bsky.feed.defs#threadContext',
+          },
         },
       },
       notFoundPost: {
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/defs.ts b/packages/pds/src/lexicon/types/app/bsky/feed/defs.ts
index 4472369375e..fdf7e58c8a3 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/defs.ts
@@ -71,6 +71,24 @@ export function validateViewerState(v: unknown): ValidationResult {
   return lexicons.validate('app.bsky.feed.defs#viewerState', v)
 }
 
+/** Metadata about this post within the context of the thread it is in. */
+export interface ThreadContext {
+  rootAuthorLike?: string
+  [k: string]: unknown
+}
+
+export function isThreadContext(v: unknown): v is ThreadContext {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'app.bsky.feed.defs#threadContext'
+  )
+}
+
+export function validateThreadContext(v: unknown): ValidationResult {
+  return lexicons.validate('app.bsky.feed.defs#threadContext', v)
+}
+
 export interface FeedViewPost {
   post: PostView
   reply?: ReplyRef
@@ -164,6 +182,7 @@ export interface ThreadViewPost {
     | BlockedPost
     | { $type: string; [k: string]: unknown }
   )[]
+  threadContext?: ThreadContext
   [k: string]: unknown
 }
 

From 6b8a51e881e37ce4878a25ca67550a48be7b3d15 Mon Sep 17 00:00:00 2001
From: rafael <rafael@blueskyweb.xyz>
Date: Tue, 21 Jan 2025 15:35:16 -0300
Subject: [PATCH 020/101] [threadContext 2] Add threadContext to threadViewPost
 - backend (#3313)

---
 packages/bsky/src/hydration/feed.ts           |  51 ++++++++-
 packages/bsky/src/hydration/hydrator.ts       |  87 +++++++++++----
 packages/bsky/src/views/index.ts              |   9 ++
 .../__snapshots__/indexing.test.ts.snap       |   2 +
 .../__snapshots__/block-lists.test.ts.snap    |   3 +
 .../views/__snapshots__/blocks.test.ts.snap   |   5 +
 .../__snapshots__/mute-lists.test.ts.snap     |   3 +
 .../views/__snapshots__/mutes.test.ts.snap    |   3 +
 .../views/__snapshots__/thread.test.ts.snap   | 105 +++++++++++++-----
 packages/bsky/tests/views/thread.test.ts      |   4 +
 10 files changed, 226 insertions(+), 46 deletions(-)

diff --git a/packages/bsky/src/hydration/feed.ts b/packages/bsky/src/hydration/feed.ts
index 61623ad4173..1db35e4f28a 100644
--- a/packages/bsky/src/hydration/feed.ts
+++ b/packages/bsky/src/hydration/feed.ts
@@ -14,7 +14,11 @@ import {
   split,
 } from './util'
 import { dedupeStrs } from '@atproto/common'
-import { postUriToThreadgateUri, postUriToPostgateUri } from '../util/uris'
+import {
+  postUriToThreadgateUri,
+  postUriToPostgateUri,
+  uriToDid as didFromUri,
+} from '../util/uris'
 
 export type Post = RecordInfo<PostRecord> & {
   violatesThreadGate: boolean
@@ -32,6 +36,12 @@ export type PostViewerState = {
 
 export type PostViewerStates = HydrationMap<PostViewerState>
 
+export type ThreadContext = {
+  like?: string
+}
+
+export type ThreadContexts = HydrationMap<ThreadContext>
+
 export type PostAgg = {
   likes: number
   replies: number
@@ -157,6 +167,45 @@ export class FeedHydrator {
     }, new Map<string, boolean>())
   }
 
+  async getThreadContexts(refs: ThreadRef[]): Promise<ThreadContexts> {
+    if (!refs.length) return new HydrationMap<ThreadContext>()
+
+    const refsByRootAuthor = refs.reduce((acc, ref) => {
+      const { threadRoot } = ref
+      const rootAuthor = didFromUri(threadRoot)
+      const existingValue = acc.get(rootAuthor) ?? []
+      return acc.set(rootAuthor, [...existingValue, ref])
+    }, new Map<string, ThreadRef[]>())
+    const refsByRootAuthorEntries = Array.from(refsByRootAuthor.entries())
+
+    const likesPromises = refsByRootAuthorEntries.map(
+      ([rootAuthor, refsForAuthor]) =>
+        this.dataplane.getLikesByActorAndSubjects({
+          actorDid: rootAuthor,
+          refs: refsForAuthor.map(({ uri, cid }) => ({ uri, cid })),
+        }),
+    )
+
+    const rootAuthorsLikes = await Promise.all(likesPromises)
+
+    const likesByUri = refsByRootAuthorEntries.reduce(
+      (acc, [_rootAuthor, refsForAuthor], i) => {
+        const likesForRootAuthor = rootAuthorsLikes[i]
+        refsForAuthor.forEach(({ uri }, j) => {
+          acc.set(uri, likesForRootAuthor.uris[j])
+        })
+        return acc
+      },
+      new Map<string, string>(),
+    )
+
+    return refs.reduce((acc, { uri }) => {
+      return acc.set(uri, {
+        like: parseString(likesByUri.get(uri)),
+      })
+    }, new HydrationMap<ThreadContext>())
+  }
+
   async getPostAggregates(refs: ItemRef[]): Promise<PostAggs> {
     if (!refs.length) return new HydrationMap<PostAgg>()
     const counts = await this.dataplane.getInteractionCounts({ refs })
diff --git a/packages/bsky/src/hydration/hydrator.ts b/packages/bsky/src/hydration/hydrator.ts
index 562bc9cf1e8..fb19a5cbf3a 100644
--- a/packages/bsky/src/hydration/hydrator.ts
+++ b/packages/bsky/src/hydration/hydrator.ts
@@ -58,6 +58,8 @@ import {
   Threadgates,
   Postgates,
   FeedItem,
+  ThreadContexts,
+  ThreadRef,
 } from './feed'
 import { ParsedLabelers } from '../util'
 
@@ -89,6 +91,7 @@ export type HydrationState = {
   posts?: Posts
   postAggs?: PostAggs
   postViewers?: PostViewerStates
+  threadContexts?: ThreadContexts
   postBlocks?: PostBlocks
   reposts?: Reposts
   follows?: Follows
@@ -341,29 +344,24 @@ export class Hydrator {
     state: HydrationState = {},
   ): Promise<HydrationState> {
     const uris = refs.map((ref) => ref.uri)
+
+    state.posts ??= new HydrationMap<Post>()
+    const addPostsToHydrationState = (posts: Posts) => {
+      posts.forEach((post, uri) => {
+        state.posts ??= new HydrationMap<Post>()
+        state.posts.set(uri, post)
+      })
+    }
+
+    // layer 0: the posts in the thread
     const postsLayer0 = await this.feed.getPosts(
       uris,
       ctx.includeTakedowns,
       state.posts,
     )
-    // first level embeds plus thread roots we haven't fetched yet
-    const urisLayer1 = nestedRecordUrisFromPosts(postsLayer0)
+    addPostsToHydrationState(postsLayer0)
+
     const additionalRootUris = rootUrisFromPosts(postsLayer0) // supports computing threadgates
-    const urisLayer1ByCollection = urisByCollection(urisLayer1)
-    const embedPostUrisLayer1 =
-      urisLayer1ByCollection.get(ids.AppBskyFeedPost) ?? []
-    const postsLayer1 = await this.feed.getPosts(
-      [...embedPostUrisLayer1, ...additionalRootUris],
-      ctx.includeTakedowns,
-    )
-    // second level embeds, ignoring any additional root uris we mixed-in to the previous layer
-    const urisLayer2 = nestedRecordUrisFromPosts(
-      postsLayer1,
-      embedPostUrisLayer1,
-    )
-    const urisLayer2ByCollection = urisByCollection(urisLayer2)
-    const embedPostUrisLayer2 =
-      urisLayer2ByCollection.get(ids.AppBskyFeedPost) ?? []
     const threadRootUris = new Set<string>()
     for (const [uri, post] of postsLayer0) {
       if (post) {
@@ -385,10 +383,38 @@ export class Hydrator {
         postUrisWithThreadgates.add(uri)
       }
     }
+
+    // layer 1: first level embeds plus thread roots we haven't fetched yet
+    const urisLayer1 = nestedRecordUrisFromPosts(postsLayer0)
+    const urisLayer1ByCollection = urisByCollection(urisLayer1)
+    const embedPostUrisLayer1 =
+      urisLayer1ByCollection.get(ids.AppBskyFeedPost) ?? []
+    const postsLayer1 = await this.feed.getPosts(
+      [...embedPostUrisLayer1, ...additionalRootUris],
+      ctx.includeTakedowns,
+      state.posts,
+    )
+    addPostsToHydrationState(postsLayer1)
+
+    // layer 2: second level embeds, ignoring any additional root uris we mixed-in to the previous layer
+    const urisLayer2 = nestedRecordUrisFromPosts(
+      postsLayer1,
+      embedPostUrisLayer1,
+    )
+    const urisLayer2ByCollection = urisByCollection(urisLayer2)
+    const embedPostUrisLayer2 =
+      urisLayer2ByCollection.get(ids.AppBskyFeedPost) ?? []
+
     const [postsLayer2, threadgates] = await Promise.all([
-      this.feed.getPosts(embedPostUrisLayer2, ctx.includeTakedowns),
+      this.feed.getPosts(
+        embedPostUrisLayer2,
+        ctx.includeTakedowns,
+        state.posts,
+      ),
       this.feed.getThreadgatesForPosts([...postUrisWithThreadgates.values()]),
     ])
+    addPostsToHydrationState(postsLayer2)
+
     // collect list/feedgen embeds, lists in threadgates, post record hydration
     const threadgateListUris = getListUrisFromThreadgates(threadgates)
     const nestedListUris = [
@@ -597,7 +623,29 @@ export class Hydrator {
     refs: ItemRef[],
     ctx: HydrateCtx,
   ): Promise<HydrationState> {
-    return this.hydratePosts(refs, ctx)
+    const postsState = await this.hydratePosts(refs, ctx)
+
+    const { posts } = postsState
+    const postsList = posts ? Array.from(posts.entries()) : []
+
+    const isDefined = (
+      entry: [string, Post | null],
+    ): entry is [string, Post] => {
+      const [, post] = entry
+      return !!post
+    }
+
+    const threadRefs: ThreadRef[] = postsList
+      .filter(isDefined)
+      .map(([uri, post]) => ({
+        uri,
+        cid: post.cid,
+        threadRoot: post.record.reply?.root.uri ?? uri,
+      }))
+
+    const threadContexts = await this.feed.getThreadContexts(threadRefs)
+
+    return mergeStates(postsState, { threadContexts })
   }
 
   // app.bsky.feed.defs#generatorView
@@ -1168,6 +1216,7 @@ export const mergeStates = (
     posts: mergeMaps(stateA.posts, stateB.posts),
     postAggs: mergeMaps(stateA.postAggs, stateB.postAggs),
     postViewers: mergeMaps(stateA.postViewers, stateB.postViewers),
+    threadContexts: mergeMaps(stateA.threadContexts, stateB.threadContexts),
     postBlocks: mergeMaps(stateA.postBlocks, stateB.postBlocks),
     reposts: mergeMaps(stateA.reposts, stateB.reposts),
     follows: mergeMaps(stateA.follows, stateB.follows),
diff --git a/packages/bsky/src/views/index.ts b/packages/bsky/src/views/index.ts
index ee511b3a9a4..0d3d2ec576b 100644
--- a/packages/bsky/src/views/index.ts
+++ b/packages/bsky/src/views/index.ts
@@ -800,6 +800,9 @@ export class Views {
             opts.depth,
           )
         : undefined,
+      threadContext: {
+        rootAuthorLike: state.threadContexts?.get(post.uri)?.like,
+      },
     }
   }
 
@@ -829,6 +832,9 @@ export class Views {
       $type: 'app.bsky.feed.defs#threadViewPost',
       post,
       parent: this.threadParent(parentUri, rootUri, state, height - 1),
+      threadContext: {
+        rootAuthorLike: state.threadContexts?.get(post.uri)?.like,
+      },
     }
   }
 
@@ -873,6 +879,9 @@ export class Views {
           state,
           depth - 1,
         ),
+        threadContext: {
+          rootAuthorLike: state.threadContexts?.get(post.uri)?.like,
+        },
       }
     })
   }
diff --git a/packages/bsky/tests/data-plane/__snapshots__/indexing.test.ts.snap b/packages/bsky/tests/data-plane/__snapshots__/indexing.test.ts.snap
index 8c8ec964444..0ef5bb537d6 100644
--- a/packages/bsky/tests/data-plane/__snapshots__/indexing.test.ts.snap
+++ b/packages/bsky/tests/data-plane/__snapshots__/indexing.test.ts.snap
@@ -599,6 +599,7 @@ Object {
       },
     },
     "replies": Array [],
+    "threadContext": Object {},
   },
 }
 `;
@@ -668,6 +669,7 @@ Object {
       },
     },
     "replies": Array [],
+    "threadContext": Object {},
   },
 }
 `;
diff --git a/packages/bsky/tests/views/__snapshots__/block-lists.test.ts.snap b/packages/bsky/tests/views/__snapshots__/block-lists.test.ts.snap
index 5270c1cb612..7f843d36d26 100644
--- a/packages/bsky/tests/views/__snapshots__/block-lists.test.ts.snap
+++ b/packages/bsky/tests/views/__snapshots__/block-lists.test.ts.snap
@@ -137,6 +137,7 @@ Object {
         "threadMuted": false,
       },
     },
+    "threadContext": Object {},
   },
 }
 `;
@@ -215,6 +216,7 @@ Object {
       },
     },
     "replies": Array [],
+    "threadContext": Object {},
   },
 }
 `;
@@ -298,6 +300,7 @@ Object {
         "uri": "record(7)",
       },
     ],
+    "threadContext": Object {},
   },
 }
 `;
diff --git a/packages/bsky/tests/views/__snapshots__/blocks.test.ts.snap b/packages/bsky/tests/views/__snapshots__/blocks.test.ts.snap
index 9d5dcf2908e..dcf56b98537 100644
--- a/packages/bsky/tests/views/__snapshots__/blocks.test.ts.snap
+++ b/packages/bsky/tests/views/__snapshots__/blocks.test.ts.snap
@@ -137,6 +137,7 @@ Object {
         "threadMuted": false,
       },
     },
+    "threadContext": Object {},
   },
 }
 `;
@@ -255,8 +256,10 @@ Object {
             "threadMuted": false,
           },
         },
+        "threadContext": Object {},
       },
     ],
+    "threadContext": Object {},
   },
 }
 `;
@@ -412,8 +415,10 @@ Object {
             "threadMuted": false,
           },
         },
+        "threadContext": Object {},
       },
     ],
+    "threadContext": Object {},
   },
 }
 `;
diff --git a/packages/bsky/tests/views/__snapshots__/mute-lists.test.ts.snap b/packages/bsky/tests/views/__snapshots__/mute-lists.test.ts.snap
index 91b9ca6f01e..566cca2c117 100644
--- a/packages/bsky/tests/views/__snapshots__/mute-lists.test.ts.snap
+++ b/packages/bsky/tests/views/__snapshots__/mute-lists.test.ts.snap
@@ -210,6 +210,7 @@ Object {
           "threadMuted": false,
         },
       },
+      "threadContext": Object {},
     },
     Object {
       "$type": "app.bsky.feed.defs#threadViewPost",
@@ -309,8 +310,10 @@ Object {
           "threadMuted": false,
         },
       },
+      "threadContext": Object {},
     },
   ],
+  "threadContext": Object {},
 }
 `;
 
diff --git a/packages/bsky/tests/views/__snapshots__/mutes.test.ts.snap b/packages/bsky/tests/views/__snapshots__/mutes.test.ts.snap
index 2a8fedfbeec..fdd945c589e 100644
--- a/packages/bsky/tests/views/__snapshots__/mutes.test.ts.snap
+++ b/packages/bsky/tests/views/__snapshots__/mutes.test.ts.snap
@@ -196,6 +196,7 @@ Object {
           "threadMuted": false,
         },
       },
+      "threadContext": Object {},
     },
     Object {
       "$type": "app.bsky.feed.defs#threadViewPost",
@@ -283,7 +284,9 @@ Object {
           "threadMuted": false,
         },
       },
+      "threadContext": Object {},
     },
   ],
+  "threadContext": Object {},
 }
 `;
diff --git a/packages/bsky/tests/views/__snapshots__/thread.test.ts.snap b/packages/bsky/tests/views/__snapshots__/thread.test.ts.snap
index 4a97788f6e9..e7ac4eed23b 100644
--- a/packages/bsky/tests/views/__snapshots__/thread.test.ts.snap
+++ b/packages/bsky/tests/views/__snapshots__/thread.test.ts.snap
@@ -56,6 +56,7 @@ Object {
           "threadMuted": false,
         },
       },
+      "threadContext": Object {},
     },
     "post": Object {
       "author": Object {
@@ -98,7 +99,7 @@ Object {
           "val": "test-label-2",
         },
       ],
-      "likeCount": 0,
+      "likeCount": 1,
       "quoteCount": 0,
       "record": Object {
         "$type": "app.bsky.feed.post",
@@ -139,6 +140,9 @@ Object {
         "threadMuted": false,
       },
     },
+    "threadContext": Object {
+      "rootAuthorLike": "record(8)",
+    },
   },
   "post": Object {
     "author": Object {
@@ -173,7 +177,7 @@ Object {
     "cid": "cids(0)",
     "indexedAt": "1970-01-01T00:00:00.000Z",
     "labels": Array [],
-    "likeCount": 0,
+    "likeCount": 1,
     "quoteCount": 0,
     "record": Object {
       "$type": "app.bsky.feed.post",
@@ -200,6 +204,9 @@ Object {
     },
   },
   "replies": Array [],
+  "threadContext": Object {
+    "rootAuthorLike": "record(9)",
+  },
 }
 `;
 
@@ -272,7 +279,7 @@ Object {
         "cid": "cids(3)",
         "indexedAt": "1970-01-01T00:00:00.000Z",
         "labels": Array [],
-        "likeCount": 0,
+        "likeCount": 1,
         "quoteCount": 0,
         "record": Object {
           "$type": "app.bsky.feed.post",
@@ -298,6 +305,9 @@ Object {
         },
       },
       "replies": Array [],
+      "threadContext": Object {
+        "rootAuthorLike": "record(7)",
+      },
     },
     Object {
       "$type": "app.bsky.feed.defs#threadViewPost",
@@ -331,18 +341,18 @@ Object {
             "cid": "cids(4)",
             "cts": "1970-01-01T00:00:00.000Z",
             "src": "did:example:labeler",
-            "uri": "record(7)",
+            "uri": "record(8)",
             "val": "test-label",
           },
           Object {
             "cid": "cids(4)",
             "cts": "1970-01-01T00:00:00.000Z",
             "src": "did:example:labeler",
-            "uri": "record(7)",
+            "uri": "record(8)",
             "val": "test-label-2",
           },
         ],
-        "likeCount": 0,
+        "likeCount": 1,
         "quoteCount": 0,
         "record": Object {
           "$type": "app.bsky.feed.post",
@@ -377,7 +387,7 @@ Object {
         },
         "replyCount": 1,
         "repostCount": 0,
-        "uri": "record(7)",
+        "uri": "record(8)",
         "viewer": Object {
           "embeddingDisabled": false,
           "threadMuted": false,
@@ -419,7 +429,7 @@ Object {
             "cid": "cids(6)",
             "indexedAt": "1970-01-01T00:00:00.000Z",
             "labels": Array [],
-            "likeCount": 0,
+            "likeCount": 1,
             "quoteCount": 0,
             "record": Object {
               "$type": "app.bsky.feed.post",
@@ -427,7 +437,7 @@ Object {
               "reply": Object {
                 "parent": Object {
                   "cid": "cids(4)",
-                  "uri": "record(7)",
+                  "uri": "record(8)",
                 },
                 "root": Object {
                   "cid": "cids(0)",
@@ -438,18 +448,25 @@ Object {
             },
             "replyCount": 0,
             "repostCount": 2,
-            "uri": "record(8)",
+            "uri": "record(9)",
             "viewer": Object {
               "embeddingDisabled": false,
-              "repost": "record(9)",
+              "repost": "record(10)",
               "threadMuted": false,
             },
           },
           "replies": Array [],
+          "threadContext": Object {
+            "rootAuthorLike": "record(11)",
+          },
         },
       ],
+      "threadContext": Object {
+        "rootAuthorLike": "record(12)",
+      },
     },
   ],
+  "threadContext": Object {},
 }
 `;
 
@@ -522,7 +539,7 @@ Object {
         "cid": "cids(3)",
         "indexedAt": "1970-01-01T00:00:00.000Z",
         "labels": Array [],
-        "likeCount": 0,
+        "likeCount": 1,
         "quoteCount": 0,
         "record": Object {
           "$type": "app.bsky.feed.post",
@@ -547,6 +564,9 @@ Object {
           "threadMuted": false,
         },
       },
+      "threadContext": Object {
+        "rootAuthorLike": "record(7)",
+      },
     },
     Object {
       "$type": "app.bsky.feed.defs#threadViewPost",
@@ -580,18 +600,18 @@ Object {
             "cid": "cids(4)",
             "cts": "1970-01-01T00:00:00.000Z",
             "src": "did:example:labeler",
-            "uri": "record(7)",
+            "uri": "record(8)",
             "val": "test-label",
           },
           Object {
             "cid": "cids(4)",
             "cts": "1970-01-01T00:00:00.000Z",
             "src": "did:example:labeler",
-            "uri": "record(7)",
+            "uri": "record(8)",
             "val": "test-label-2",
           },
         ],
-        "likeCount": 0,
+        "likeCount": 1,
         "quoteCount": 0,
         "record": Object {
           "$type": "app.bsky.feed.post",
@@ -626,14 +646,18 @@ Object {
         },
         "replyCount": 1,
         "repostCount": 0,
-        "uri": "record(7)",
+        "uri": "record(8)",
         "viewer": Object {
           "embeddingDisabled": false,
           "threadMuted": false,
         },
       },
+      "threadContext": Object {
+        "rootAuthorLike": "record(9)",
+      },
     },
   ],
+  "threadContext": Object {},
 }
 `;
 
@@ -706,7 +730,7 @@ Object {
         "cid": "cids(3)",
         "indexedAt": "1970-01-01T00:00:00.000Z",
         "labels": Array [],
-        "likeCount": 0,
+        "likeCount": 1,
         "quoteCount": 0,
         "record": Object {
           "$type": "app.bsky.feed.post",
@@ -731,6 +755,9 @@ Object {
           "threadMuted": false,
         },
       },
+      "threadContext": Object {
+        "rootAuthorLike": "record(7)",
+      },
     },
     Object {
       "$type": "app.bsky.feed.defs#threadViewPost",
@@ -764,18 +791,18 @@ Object {
             "cid": "cids(4)",
             "cts": "1970-01-01T00:00:00.000Z",
             "src": "did:example:labeler",
-            "uri": "record(7)",
+            "uri": "record(8)",
             "val": "test-label",
           },
           Object {
             "cid": "cids(4)",
             "cts": "1970-01-01T00:00:00.000Z",
             "src": "did:example:labeler",
-            "uri": "record(7)",
+            "uri": "record(8)",
             "val": "test-label-2",
           },
         ],
-        "likeCount": 0,
+        "likeCount": 1,
         "quoteCount": 0,
         "record": Object {
           "$type": "app.bsky.feed.post",
@@ -810,14 +837,18 @@ Object {
         },
         "replyCount": 1,
         "repostCount": 0,
-        "uri": "record(7)",
+        "uri": "record(8)",
         "viewer": Object {
           "embeddingDisabled": false,
           "threadMuted": false,
         },
       },
+      "threadContext": Object {
+        "rootAuthorLike": "record(9)",
+      },
     },
   ],
+  "threadContext": Object {},
 }
 `;
 
@@ -978,10 +1009,13 @@ Object {
             },
           },
           "replies": Array [],
+          "threadContext": Object {},
         },
       ],
+      "threadContext": Object {},
     },
   ],
+  "threadContext": Object {},
 }
 `;
 
@@ -1037,6 +1071,7 @@ Object {
     },
   },
   "replies": Array [],
+  "threadContext": Object {},
 }
 `;
 
@@ -1107,6 +1142,7 @@ Object {
     },
   },
   "replies": Array [],
+  "threadContext": Object {},
 }
 `;
 
@@ -1151,7 +1187,7 @@ Object {
     "cid": "cids(0)",
     "indexedAt": "1970-01-01T00:00:00.000Z",
     "labels": Array [],
-    "likeCount": 0,
+    "likeCount": 1,
     "quoteCount": 0,
     "record": Object {
       "$type": "app.bsky.feed.post",
@@ -1178,6 +1214,9 @@ Object {
     },
   },
   "replies": Array [],
+  "threadContext": Object {
+    "rootAuthorLike": "record(7)",
+  },
 }
 `;
 
@@ -1222,7 +1261,7 @@ Object {
     "cid": "cids(0)",
     "indexedAt": "1970-01-01T00:00:00.000Z",
     "labels": Array [],
-    "likeCount": 0,
+    "likeCount": 1,
     "quoteCount": 0,
     "record": Object {
       "$type": "app.bsky.feed.post",
@@ -1249,6 +1288,9 @@ Object {
     },
   },
   "replies": Array [],
+  "threadContext": Object {
+    "rootAuthorLike": "record(7)",
+  },
 }
 `;
 
@@ -1348,7 +1390,7 @@ Object {
             "val": "test-label-2",
           },
         ],
-        "likeCount": 0,
+        "likeCount": 1,
         "quoteCount": 0,
         "record": Object {
           "$type": "app.bsky.feed.post",
@@ -1425,7 +1467,7 @@ Object {
             "cid": "cids(5)",
             "indexedAt": "1970-01-01T00:00:00.000Z",
             "labels": Array [],
-            "likeCount": 0,
+            "likeCount": 1,
             "quoteCount": 0,
             "record": Object {
               "$type": "app.bsky.feed.post",
@@ -1452,10 +1494,17 @@ Object {
             },
           },
           "replies": Array [],
+          "threadContext": Object {
+            "rootAuthorLike": "record(8)",
+          },
         },
       ],
+      "threadContext": Object {
+        "rootAuthorLike": "record(9)",
+      },
     },
   ],
+  "threadContext": Object {},
 }
 `;
 
@@ -1555,7 +1604,7 @@ Object {
             "val": "test-label-2",
           },
         ],
-        "likeCount": 0,
+        "likeCount": 1,
         "quoteCount": 0,
         "record": Object {
           "$type": "app.bsky.feed.post",
@@ -1597,7 +1646,11 @@ Object {
         },
       },
       "replies": Array [],
+      "threadContext": Object {
+        "rootAuthorLike": "record(6)",
+      },
     },
   ],
+  "threadContext": Object {},
 }
 `;
diff --git a/packages/bsky/tests/views/thread.test.ts b/packages/bsky/tests/views/thread.test.ts
index 6cf095d795d..67c9f66dd0b 100644
--- a/packages/bsky/tests/views/thread.test.ts
+++ b/packages/bsky/tests/views/thread.test.ts
@@ -27,6 +27,10 @@ describe('pds thread views', () => {
     alice = sc.dids.alice
     bob = sc.dids.bob
     carol = sc.dids.carol
+
+    await sc.like(alice, sc.replies[alice][0].ref)
+    await sc.like(alice, sc.replies[bob][0].ref)
+    await sc.like(alice, sc.replies[carol][0].ref)
   })
 
   beforeAll(async () => {

From c0a75d310aa92c067799a97d1acc5bd0543114c5 Mon Sep 17 00:00:00 2001
From: rafael <rafael@blueskyweb.xyz>
Date: Tue, 21 Jan 2025 15:49:02 -0300
Subject: [PATCH 021/101] posts_with_video filter (#3390)

---
 .changeset/real-kids-type.md                  |  6 ++
 lexicons/app/bsky/feed/getAuthorFeed.json     |  3 +-
 packages/api/src/client/lexicons.ts           |  1 +
 .../types/app/bsky/feed/getAuthorFeed.ts      |  1 +
 packages/bsky/proto/bsky.proto                |  3 +
 .../src/api/app/bsky/feed/getAuthorFeed.ts    |  1 +
 .../20250116T222618297Z-post-embed-video.ts   | 17 +++++
 .../data-plane/server/db/migrations/index.ts  |  1 +
 .../data-plane/server/db/tables/post-embed.ts |  8 +++
 .../server/indexing/plugins/post.ts           | 27 +++++++-
 .../src/data-plane/server/routes/feeds.ts     | 11 ++++
 packages/bsky/src/lexicon/lexicons.ts         |  1 +
 .../types/app/bsky/feed/getAuthorFeed.ts      |  1 +
 packages/bsky/src/proto/bsky_pb.ts            | 23 +++++++
 packages/bsky/tests/views/author-feed.test.ts | 64 +++++++++++++++++++
 packages/ozone/src/lexicon/lexicons.ts        |  1 +
 .../types/app/bsky/feed/getAuthorFeed.ts      |  1 +
 packages/pds/src/lexicon/lexicons.ts          |  1 +
 .../types/app/bsky/feed/getAuthorFeed.ts      |  1 +
 19 files changed, 169 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/real-kids-type.md
 create mode 100644 packages/bsky/src/data-plane/server/db/migrations/20250116T222618297Z-post-embed-video.ts

diff --git a/.changeset/real-kids-type.md b/.changeset/real-kids-type.md
new file mode 100644
index 00000000000..fb0dc454bfb
--- /dev/null
+++ b/.changeset/real-kids-type.md
@@ -0,0 +1,6 @@
+---
+"@atproto/bsky": patch
+"@atproto/api": patch
+---
+
+posts_with_video filter in getAuthorFeed
diff --git a/lexicons/app/bsky/feed/getAuthorFeed.json b/lexicons/app/bsky/feed/getAuthorFeed.json
index 19e99b174ac..c9ef8c5077d 100644
--- a/lexicons/app/bsky/feed/getAuthorFeed.json
+++ b/lexicons/app/bsky/feed/getAuthorFeed.json
@@ -24,7 +24,8 @@
               "posts_with_replies",
               "posts_no_replies",
               "posts_with_media",
-              "posts_and_author_threads"
+              "posts_and_author_threads",
+              "posts_with_video"
             ],
             "default": "posts_with_replies"
           },
diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
index 1eb438b9200..36604fa13ae 100644
--- a/packages/api/src/client/lexicons.ts
+++ b/packages/api/src/client/lexicons.ts
@@ -6230,6 +6230,7 @@ export const schemaDict = {
                 'posts_no_replies',
                 'posts_with_media',
                 'posts_and_author_threads',
+                'posts_with_video',
               ],
               default: 'posts_with_replies',
             },
diff --git a/packages/api/src/client/types/app/bsky/feed/getAuthorFeed.ts b/packages/api/src/client/types/app/bsky/feed/getAuthorFeed.ts
index 77319f28d40..8fc58a4e46c 100644
--- a/packages/api/src/client/types/app/bsky/feed/getAuthorFeed.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getAuthorFeed.ts
@@ -18,6 +18,7 @@ export interface QueryParams {
     | 'posts_no_replies'
     | 'posts_with_media'
     | 'posts_and_author_threads'
+    | 'posts_with_video'
     | (string & {})
   includePins?: boolean
 }
diff --git a/packages/bsky/proto/bsky.proto b/packages/bsky/proto/bsky.proto
index 699b9fe673f..b2fe8840a0e 100644
--- a/packages/bsky/proto/bsky.proto
+++ b/packages/bsky/proto/bsky.proto
@@ -82,6 +82,7 @@ message PostRecordMeta {
   bool violates_embedding_rules = 4;
   bool has_post_gate = 5;
   bool has_thread_gate = 6;
+  bool has_video = 7;
 }
 
 message GetPostRecordsRequest {
@@ -788,6 +789,7 @@ enum FeedType {
   FEED_TYPE_POSTS_AND_AUTHOR_THREADS = 1;
   FEED_TYPE_POSTS_NO_REPLIES = 2;
   FEED_TYPE_POSTS_WITH_MEDIA = 3;
+  FEED_TYPE_POSTS_WITH_VIDEO = 4;
 }
 
 // - Returns recent posts authored by a given DID, paginated
@@ -811,6 +813,7 @@ message AuthorFeedItem {
   bool is_reply = 8;
   bool is_repost = 9;
   bool is_quote_post = 10;
+  bool posts_with_video = 11;
 }
 
 message GetAuthorFeedResponse {
diff --git a/packages/bsky/src/api/app/bsky/feed/getAuthorFeed.ts b/packages/bsky/src/api/app/bsky/feed/getAuthorFeed.ts
index d58500c07c4..1aeaf65f291 100644
--- a/packages/bsky/src/api/app/bsky/feed/getAuthorFeed.ts
+++ b/packages/bsky/src/api/app/bsky/feed/getAuthorFeed.ts
@@ -58,6 +58,7 @@ const FILTER_TO_FEED_TYPE = {
   posts_no_replies: FeedType.POSTS_NO_REPLIES,
   posts_with_media: FeedType.POSTS_WITH_MEDIA,
   posts_and_author_threads: FeedType.POSTS_AND_AUTHOR_THREADS,
+  posts_with_video: FeedType.POSTS_WITH_VIDEO,
 }
 
 export const skeleton = async (inputs: {
diff --git a/packages/bsky/src/data-plane/server/db/migrations/20250116T222618297Z-post-embed-video.ts b/packages/bsky/src/data-plane/server/db/migrations/20250116T222618297Z-post-embed-video.ts
new file mode 100644
index 00000000000..87c7e1b75f5
--- /dev/null
+++ b/packages/bsky/src/data-plane/server/db/migrations/20250116T222618297Z-post-embed-video.ts
@@ -0,0 +1,17 @@
+import { Kysely } from 'kysely'
+
+export async function up(db: Kysely<unknown>): Promise<void> {
+  // postEmbedVideo
+  await db.schema
+    .createTable('post_embed_video')
+    .addColumn('postUri', 'varchar', (col) => col.notNull())
+    .addColumn('videoCid', 'varchar', (col) => col.notNull())
+    .addColumn('alt', 'varchar')
+    .addPrimaryKeyConstraint('post_embed_video_pkey', ['postUri'])
+    .execute()
+}
+
+export async function down(db: Kysely<unknown>): Promise<void> {
+  // postEmbedVideo
+  await db.schema.dropTable('post_embed_video').execute()
+}
diff --git a/packages/bsky/src/data-plane/server/db/migrations/index.ts b/packages/bsky/src/data-plane/server/db/migrations/index.ts
index 5b8684a2a78..90356eca865 100644
--- a/packages/bsky/src/data-plane/server/db/migrations/index.ts
+++ b/packages/bsky/src/data-plane/server/db/migrations/index.ts
@@ -45,3 +45,4 @@ export * as _20240808T224251220Z from './20240808T224251220Z-post-gate-flags'
 export * as _20240829T211238293Z from './20240829T211238293Z-simplify-actor-sync'
 export * as _20240831T134810923Z from './20240831T134810923Z-pinned-posts'
 export * as _20241114T153108102Z from './20241114T153108102Z-add-starter-packs-name'
+export * as _20250116T222618297Z from './20250116T222618297Z-post-embed-video'
diff --git a/packages/bsky/src/data-plane/server/db/tables/post-embed.ts b/packages/bsky/src/data-plane/server/db/tables/post-embed.ts
index 69c44efe718..dfcc1564857 100644
--- a/packages/bsky/src/data-plane/server/db/tables/post-embed.ts
+++ b/packages/bsky/src/data-plane/server/db/tables/post-embed.ts
@@ -1,6 +1,7 @@
 export const imageTableName = 'post_embed_image'
 export const externalTableName = 'post_embed_external'
 export const recordTableName = 'post_embed_record'
+export const videoTableName = 'post_embed_video'
 
 export interface PostEmbedImage {
   postUri: string
@@ -23,8 +24,15 @@ export interface PostEmbedRecord {
   embedCid: string
 }
 
+export interface PostEmbedVideo {
+  postUri: string
+  videoCid: string
+  alt: string | null
+}
+
 export type PartialDB = {
   [imageTableName]: PostEmbedImage
   [externalTableName]: PostEmbedExternal
   [recordTableName]: PostEmbedRecord
+  [videoTableName]: PostEmbedVideo
 }
diff --git a/packages/bsky/src/data-plane/server/indexing/plugins/post.ts b/packages/bsky/src/data-plane/server/indexing/plugins/post.ts
index eb495fcb13f..606d2aff3f8 100644
--- a/packages/bsky/src/data-plane/server/indexing/plugins/post.ts
+++ b/packages/bsky/src/data-plane/server/indexing/plugins/post.ts
@@ -12,6 +12,7 @@ import { isMain as isEmbedImage } from '../../../../lexicon/types/app/bsky/embed
 import { isMain as isEmbedExternal } from '../../../../lexicon/types/app/bsky/embed/external'
 import { isMain as isEmbedRecord } from '../../../../lexicon/types/app/bsky/embed/record'
 import { isMain as isEmbedRecordWithMedia } from '../../../../lexicon/types/app/bsky/embed/recordWithMedia'
+import { isMain as isEmbedVideo } from '../../../../lexicon/types/app/bsky/embed/video'
 import {
   isMention,
   isLink,
@@ -41,6 +42,7 @@ type Post = Selectable<DatabaseSchemaType['post']>
 type PostEmbedImage = DatabaseSchemaType['post_embed_image']
 type PostEmbedExternal = DatabaseSchemaType['post_embed_external']
 type PostEmbedRecord = DatabaseSchemaType['post_embed_record']
+type PostEmbedVideo = DatabaseSchemaType['post_embed_video']
 type PostAncestor = {
   uri: string
   height: number
@@ -55,7 +57,12 @@ type PostDescendent = {
 type IndexedPost = {
   post: Post
   facets?: { type: 'mention' | 'link'; value: string }[]
-  embeds?: (PostEmbedImage[] | PostEmbedExternal | PostEmbedRecord)[]
+  embeds?: (
+    | PostEmbedImage[]
+    | PostEmbedExternal
+    | PostEmbedRecord
+    | PostEmbedVideo
+  )[]
   ancestors?: PostAncestor[]
   descendents?: PostDescendent[]
   threadgate?: GateRecord
@@ -149,7 +156,12 @@ const insertFn = async (
       return []
     })
   // Embed indices
-  const embeds: (PostEmbedImage[] | PostEmbedExternal | PostEmbedRecord)[] = []
+  const embeds: (
+    | PostEmbedImage[]
+    | PostEmbedExternal
+    | PostEmbedRecord
+    | PostEmbedVideo
+  )[] = []
   const postEmbeds = separateEmbeds(obj.embed)
   for (const postEmbed of postEmbeds) {
     if (isEmbedImage(postEmbed)) {
@@ -232,6 +244,17 @@ const insertFn = async (
             .executeTakeFirst()
         }
       }
+    } else if (isEmbedVideo(postEmbed)) {
+      const { video } = postEmbed
+      const videoEmbed = {
+        postUri: uri.toString(),
+        videoCid: video.ref.toString(),
+        // @NOTE: alt is required for image but not for video on the lexicon.
+        alt: postEmbed.alt ?? null,
+      }
+      embeds.push(videoEmbed)
+
+      await db.insertInto('post_embed_video').values(videoEmbed).execute()
     }
   }
 
diff --git a/packages/bsky/src/data-plane/server/routes/feeds.ts b/packages/bsky/src/data-plane/server/routes/feeds.ts
index 3cb56d57e3f..60b737a889a 100644
--- a/packages/bsky/src/data-plane/server/routes/feeds.ts
+++ b/packages/bsky/src/data-plane/server/routes/feeds.ts
@@ -27,6 +27,17 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
             .select('post_embed_image.postUri')
             .whereRef('post_embed_image.postUri', '=', 'feed_item.postUri'),
         )
+    } else if (feedType === FeedType.POSTS_WITH_VIDEO) {
+      builder = builder
+        // only your own posts
+        .where('type', '=', 'post')
+        // only posts with video
+        .whereExists((qb) =>
+          qb
+            .selectFrom('post_embed_video')
+            .select('post_embed_video.postUri')
+            .whereRef('post_embed_video.postUri', '=', 'feed_item.postUri'),
+        )
     } else if (feedType === FeedType.POSTS_NO_REPLIES) {
       builder = builder.where((qb) =>
         qb.where('post.replyParent', 'is', null).orWhere('type', '=', 'repost'),
diff --git a/packages/bsky/src/lexicon/lexicons.ts b/packages/bsky/src/lexicon/lexicons.ts
index aecaa923597..793a68326ba 100644
--- a/packages/bsky/src/lexicon/lexicons.ts
+++ b/packages/bsky/src/lexicon/lexicons.ts
@@ -6230,6 +6230,7 @@ export const schemaDict = {
                 'posts_no_replies',
                 'posts_with_media',
                 'posts_and_author_threads',
+                'posts_with_video',
               ],
               default: 'posts_with_replies',
             },
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
index 60fa2f74f92..70c2c439d2a 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
@@ -19,6 +19,7 @@ export interface QueryParams {
     | 'posts_no_replies'
     | 'posts_with_media'
     | 'posts_and_author_threads'
+    | 'posts_with_video'
     | (string & {})
   includePins: boolean
 }
diff --git a/packages/bsky/src/proto/bsky_pb.ts b/packages/bsky/src/proto/bsky_pb.ts
index 74f0f04a604..d5db7b82ecf 100644
--- a/packages/bsky/src/proto/bsky_pb.ts
+++ b/packages/bsky/src/proto/bsky_pb.ts
@@ -36,6 +36,11 @@ export enum FeedType {
    * @generated from enum value: FEED_TYPE_POSTS_WITH_MEDIA = 3;
    */
   POSTS_WITH_MEDIA = 3,
+
+  /**
+   * @generated from enum value: FEED_TYPE_POSTS_WITH_VIDEO = 4;
+   */
+  POSTS_WITH_VIDEO = 4,
 }
 // Retrieve enum metadata with: proto3.getEnumType(FeedType)
 proto3.util.setEnumType(FeedType, 'bsky.FeedType', [
@@ -43,6 +48,7 @@ proto3.util.setEnumType(FeedType, 'bsky.FeedType', [
   { no: 1, name: 'FEED_TYPE_POSTS_AND_AUTHOR_THREADS' },
   { no: 2, name: 'FEED_TYPE_POSTS_NO_REPLIES' },
   { no: 3, name: 'FEED_TYPE_POSTS_WITH_MEDIA' },
+  { no: 4, name: 'FEED_TYPE_POSTS_WITH_VIDEO' },
 ])
 
 /**
@@ -975,6 +981,11 @@ export class PostRecordMeta extends Message<PostRecordMeta> {
    */
   hasThreadGate = false
 
+  /**
+   * @generated from field: bool has_video = 7;
+   */
+  hasVideo = false
+
   constructor(data?: PartialMessage<PostRecordMeta>) {
     super()
     proto3.util.initPartial(data, this)
@@ -1009,6 +1020,7 @@ export class PostRecordMeta extends Message<PostRecordMeta> {
       kind: 'scalar',
       T: 8 /* ScalarType.BOOL */,
     },
+    { no: 7, name: 'has_video', kind: 'scalar', T: 8 /* ScalarType.BOOL */ },
   ])
 
   static fromBinary(
@@ -8540,6 +8552,11 @@ export class AuthorFeedItem extends Message<AuthorFeedItem> {
    */
   isQuotePost = false
 
+  /**
+   * @generated from field: bool posts_with_video = 11;
+   */
+  postsWithVideo = false
+
   constructor(data?: PartialMessage<AuthorFeedItem>) {
     super()
     proto3.util.initPartial(data, this)
@@ -8578,6 +8595,12 @@ export class AuthorFeedItem extends Message<AuthorFeedItem> {
       kind: 'scalar',
       T: 8 /* ScalarType.BOOL */,
     },
+    {
+      no: 11,
+      name: 'posts_with_video',
+      kind: 'scalar',
+      T: 8 /* ScalarType.BOOL */,
+    },
   ])
 
   static fromBinary(
diff --git a/packages/bsky/tests/views/author-feed.test.ts b/packages/bsky/tests/views/author-feed.test.ts
index 23f4f0072fe..50c105d2342 100644
--- a/packages/bsky/tests/views/author-feed.test.ts
+++ b/packages/bsky/tests/views/author-feed.test.ts
@@ -9,9 +9,11 @@ import {
 import { ReplyRef, isRecord } from '../../src/lexicon/types/app/bsky/feed/post'
 import { isView as isEmbedRecordWithMedia } from '../../src/lexicon/types/app/bsky/embed/recordWithMedia'
 import { isView as isImageEmbed } from '../../src/lexicon/types/app/bsky/embed/images'
+import { isView as isVideoEmbed } from '../../src/lexicon/types/app/bsky/embed/video'
 import { isPostView } from '../../src/lexicon/types/app/bsky/feed/defs'
 import { uriToDid } from '../../src/util/uris'
 import { ids } from '../../src/lexicon/lexicons'
+import { VideoEmbed } from '../../src/views/types'
 
 describe('pds author feed views', () => {
   let network: TestNetwork
@@ -319,6 +321,68 @@ describe('pds author feed views', () => {
     expect(danFeed.feed.length).toEqual(0)
   })
 
+  it('can filter by posts_with_video', async () => {
+    const { data: carolFeedBefore } =
+      await agent.api.app.bsky.feed.getAuthorFeed({
+        actor: carol,
+        filter: 'posts_with_video',
+      })
+    expect(carolFeedBefore.feed).toHaveLength(0)
+
+    const { data: video } = await pdsAgent.api.com.atproto.repo.uploadBlob(
+      Buffer.from('notarealvideo'),
+      {
+        headers: sc.getHeaders(sc.dids.carol),
+        encoding: 'image/mp4',
+      },
+    )
+
+    await sc.post(carol, 'video post', undefined, undefined, undefined, {
+      embed: {
+        $type: 'app.bsky.embed.video',
+        video: video.blob,
+        alt: 'alt text',
+        aspectRatio: { height: 3, width: 4 },
+      } satisfies VideoEmbed,
+    })
+    await network.processAll()
+
+    const { data: carolFeed } = await agent.api.app.bsky.feed.getAuthorFeed({
+      actor: carol,
+      filter: 'posts_with_video',
+    })
+
+    expect(carolFeed.feed).toHaveLength(1)
+    expect(
+      carolFeed.feed.every(({ post }) => {
+        const isRecordWithActorMedia =
+          isEmbedRecordWithMedia(post.embed) && isVideoEmbed(post.embed?.media)
+        const isActorMedia = isVideoEmbed(post.embed)
+        const isFromActor = post.author.did === carol
+
+        return (isRecordWithActorMedia || isActorMedia) && isFromActor
+      }),
+    ).toBeTruthy()
+
+    const { data: bobFeed } = await agent.api.app.bsky.feed.getAuthorFeed({
+      actor: bob,
+      filter: 'posts_with_video',
+    })
+
+    expect(
+      bobFeed.feed.every(({ post }) => {
+        return isVideoEmbed(post.embed) && post.author.did === bob
+      }),
+    ).toBeTruthy()
+
+    const { data: danFeed } = await agent.api.app.bsky.feed.getAuthorFeed({
+      actor: dan,
+      filter: 'posts_with_video',
+    })
+
+    expect(danFeed.feed.length).toEqual(0)
+  })
+
   it('filters by posts_no_replies', async () => {
     const { data: carolFeed } = await agent.api.app.bsky.feed.getAuthorFeed({
       actor: carol,
diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
index 1eb438b9200..36604fa13ae 100644
--- a/packages/ozone/src/lexicon/lexicons.ts
+++ b/packages/ozone/src/lexicon/lexicons.ts
@@ -6230,6 +6230,7 @@ export const schemaDict = {
                 'posts_no_replies',
                 'posts_with_media',
                 'posts_and_author_threads',
+                'posts_with_video',
               ],
               default: 'posts_with_replies',
             },
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
index 60fa2f74f92..70c2c439d2a 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
@@ -19,6 +19,7 @@ export interface QueryParams {
     | 'posts_no_replies'
     | 'posts_with_media'
     | 'posts_and_author_threads'
+    | 'posts_with_video'
     | (string & {})
   includePins: boolean
 }
diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
index 1eb438b9200..36604fa13ae 100644
--- a/packages/pds/src/lexicon/lexicons.ts
+++ b/packages/pds/src/lexicon/lexicons.ts
@@ -6230,6 +6230,7 @@ export const schemaDict = {
                 'posts_no_replies',
                 'posts_with_media',
                 'posts_and_author_threads',
+                'posts_with_video',
               ],
               default: 'posts_with_replies',
             },
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
index 60fa2f74f92..70c2c439d2a 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
@@ -19,6 +19,7 @@ export interface QueryParams {
     | 'posts_no_replies'
     | 'posts_with_media'
     | 'posts_and_author_threads'
+    | 'posts_with_video'
     | (string & {})
   includePins: boolean
 }

From e6e6aea3814e3d0bb42a537f80d77947e85fa73f Mon Sep 17 00:00:00 2001
From: rafael <rafael@blueskyweb.xyz>
Date: Tue, 21 Jan 2025 22:06:08 -0300
Subject: [PATCH 022/101] version api (#3429)

---
 .changeset/perfect-dogs-complain.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/perfect-dogs-complain.md

diff --git a/.changeset/perfect-dogs-complain.md b/.changeset/perfect-dogs-complain.md
new file mode 100644
index 00000000000..d5e41d5b8f4
--- /dev/null
+++ b/.changeset/perfect-dogs-complain.md
@@ -0,0 +1,5 @@
+---
+"@atproto/api": patch
+---
+
+add feedViewPost.threadContext defs

From c5a4cdb0a52f4583ffe783a0b259e80263f24a8c Mon Sep 17 00:00:00 2001
From: Matthieu Sieben <matthieusieben@users.noreply.github.com>
Date: Wed, 22 Jan 2025 11:17:20 +0100
Subject: [PATCH 023/101] Improve error description in case invalid DPoP nonce
 is used (#3415)

---
 .changeset/young-balloons-check.md                     | 5 +++++
 packages/oauth/oauth-provider/src/dpop/dpop-manager.ts | 8 ++++++--
 packages/oauth/oauth-provider/src/lib/http/router.ts   | 8 ++++----
 3 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 .changeset/young-balloons-check.md

diff --git a/.changeset/young-balloons-check.md b/.changeset/young-balloons-check.md
new file mode 100644
index 00000000000..ea89b9201b8
--- /dev/null
+++ b/.changeset/young-balloons-check.md
@@ -0,0 +1,5 @@
+---
+"@atproto/oauth-provider": patch
+---
+
+Improve error description in case invalid DPoP nonce is used
diff --git a/packages/oauth/oauth-provider/src/dpop/dpop-manager.ts b/packages/oauth/oauth-provider/src/dpop/dpop-manager.ts
index 7ff55719f37..d41813d741f 100644
--- a/packages/oauth/oauth-provider/src/dpop/dpop-manager.ts
+++ b/packages/oauth/oauth-provider/src/dpop/dpop-manager.ts
@@ -87,11 +87,15 @@ export class DpopManager {
     }
 
     if (payload['nonce'] && !this.dpopNonce?.check(payload['nonce'])) {
-      throw new UseDpopNonceError()
+      throw new UseDpopNonceError('DPoP nonce mismatch')
     }
 
     const htuNorm = normalizeHtu(htu)
-    if (!htuNorm || htuNorm !== normalizeHtu(payload['htu'])) {
+    if (!htuNorm) {
+      throw new TypeError('Invalid "htu" argument')
+    }
+
+    if (htuNorm !== normalizeHtu(payload['htu'])) {
       throw new InvalidDpopProofError('DPoP htu mismatch')
     }
 
diff --git a/packages/oauth/oauth-provider/src/lib/http/router.ts b/packages/oauth/oauth-provider/src/lib/http/router.ts
index efbfd0ccf5f..a767867ae49 100644
--- a/packages/oauth/oauth-provider/src/lib/http/router.ts
+++ b/packages/oauth/oauth-provider/src/lib/http/router.ts
@@ -104,10 +104,10 @@ export class Router<
           const host = req.headers.host || routerUrl?.host || 'localhost'
           const pathname = req.url || '/'
           url = new URL(pathname, `${protocol}//${host}`)
-        } catch (err) {
-          return next(
-            Object.assign(err as Error, { status: 400, statusCode: 400 }),
-          )
+        } catch (cause) {
+          const error =
+            cause instanceof Error ? cause : new Error('Invalid URL', { cause })
+          return next(Object.assign(error, { status: 400, statusCode: 400 }))
         }
       }
 

From e6bd2ad8d1a314c80540616095ef3d5926213682 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 22 Jan 2025 15:52:42 -0300
Subject: [PATCH 024/101] Version packages (#3427)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/heavy-badgers-share.md          |  5 -----
 .changeset/perfect-dogs-complain.md        |  5 -----
 .changeset/real-kids-type.md               |  6 ------
 .changeset/young-balloons-check.md         |  5 -----
 packages/api/CHANGELOG.md                  |  8 ++++++++
 packages/api/package.json                  |  2 +-
 packages/bsky/CHANGELOG.md                 |  9 +++++++++
 packages/bsky/package.json                 |  2 +-
 packages/dev-env/CHANGELOG.md              | 10 ++++++++++
 packages/dev-env/package.json              |  2 +-
 packages/oauth/oauth-provider/CHANGELOG.md |  6 ++++++
 packages/oauth/oauth-provider/package.json |  2 +-
 packages/ozone/CHANGELOG.md                |  9 +++++++++
 packages/ozone/package.json                |  2 +-
 packages/pds/CHANGELOG.md                  |  8 ++++++++
 packages/pds/package.json                  |  2 +-
 16 files changed, 56 insertions(+), 27 deletions(-)
 delete mode 100644 .changeset/heavy-badgers-share.md
 delete mode 100644 .changeset/perfect-dogs-complain.md
 delete mode 100644 .changeset/real-kids-type.md
 delete mode 100644 .changeset/young-balloons-check.md

diff --git a/.changeset/heavy-badgers-share.md b/.changeset/heavy-badgers-share.md
deleted file mode 100644
index be2d2bc97e6..00000000000
--- a/.changeset/heavy-badgers-share.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/ozone": patch
----
-
-Fix getSubjectStatuses query
diff --git a/.changeset/perfect-dogs-complain.md b/.changeset/perfect-dogs-complain.md
deleted file mode 100644
index d5e41d5b8f4..00000000000
--- a/.changeset/perfect-dogs-complain.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/api": patch
----
-
-add feedViewPost.threadContext defs
diff --git a/.changeset/real-kids-type.md b/.changeset/real-kids-type.md
deleted file mode 100644
index fb0dc454bfb..00000000000
--- a/.changeset/real-kids-type.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"@atproto/bsky": patch
-"@atproto/api": patch
----
-
-posts_with_video filter in getAuthorFeed
diff --git a/.changeset/young-balloons-check.md b/.changeset/young-balloons-check.md
deleted file mode 100644
index ea89b9201b8..00000000000
--- a/.changeset/young-balloons-check.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/oauth-provider": patch
----
-
-Improve error description in case invalid DPoP nonce is used
diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md
index 40c0a9955e5..f3a524ae1e8 100644
--- a/packages/api/CHANGELOG.md
+++ b/packages/api/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @atproto/api
 
+## 0.13.30
+
+### Patch Changes
+
+- [#3429](https://github.com/bluesky-social/atproto/pull/3429) [`e6e6aea38`](https://github.com/bluesky-social/atproto/commit/e6e6aea3814e3d0bb42a537f80d77947e85fa73f) Thanks [@rafaelbsky](https://github.com/rafaelbsky)! - add feedViewPost.threadContext defs
+
+- [#3390](https://github.com/bluesky-social/atproto/pull/3390) [`c0a75d310`](https://github.com/bluesky-social/atproto/commit/c0a75d310aa92c067799a97d1acc5bd0543114c5) Thanks [@rafaelbsky](https://github.com/rafaelbsky)! - posts_with_video filter in getAuthorFeed
+
 ## 0.13.29
 
 ### Patch Changes
diff --git a/packages/api/package.json b/packages/api/package.json
index b7bfff0df8f..222027b7870 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/api",
-  "version": "0.13.29",
+  "version": "0.13.30",
   "license": "MIT",
   "description": "Client library for atproto and Bluesky",
   "keywords": [
diff --git a/packages/bsky/CHANGELOG.md b/packages/bsky/CHANGELOG.md
index c566e2f8f04..1eecb2411b8 100644
--- a/packages/bsky/CHANGELOG.md
+++ b/packages/bsky/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @atproto/bsky
 
+## 0.0.111
+
+### Patch Changes
+
+- [#3390](https://github.com/bluesky-social/atproto/pull/3390) [`c0a75d310`](https://github.com/bluesky-social/atproto/commit/c0a75d310aa92c067799a97d1acc5bd0543114c5) Thanks [@rafaelbsky](https://github.com/rafaelbsky)! - posts_with_video filter in getAuthorFeed
+
+- Updated dependencies [[`e6e6aea38`](https://github.com/bluesky-social/atproto/commit/e6e6aea3814e3d0bb42a537f80d77947e85fa73f), [`c0a75d310`](https://github.com/bluesky-social/atproto/commit/c0a75d310aa92c067799a97d1acc5bd0543114c5)]:
+  - @atproto/api@0.13.30
+
 ## 0.0.110
 
 ### Patch Changes
diff --git a/packages/bsky/package.json b/packages/bsky/package.json
index 50ead1b3514..58b6848f593 100644
--- a/packages/bsky/package.json
+++ b/packages/bsky/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.110",
+  "version": "0.0.111",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
diff --git a/packages/dev-env/CHANGELOG.md b/packages/dev-env/CHANGELOG.md
index e933d3808ae..ff18c62f0ad 100644
--- a/packages/dev-env/CHANGELOG.md
+++ b/packages/dev-env/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @atproto/dev-env
 
+## 0.3.81
+
+### Patch Changes
+
+- Updated dependencies [[`1ada2d093`](https://github.com/bluesky-social/atproto/commit/1ada2d093427e45b6d59a16cf146bf5282560c7b), [`e6e6aea38`](https://github.com/bluesky-social/atproto/commit/e6e6aea3814e3d0bb42a537f80d77947e85fa73f), [`c0a75d310`](https://github.com/bluesky-social/atproto/commit/c0a75d310aa92c067799a97d1acc5bd0543114c5)]:
+  - @atproto/ozone@0.1.72
+  - @atproto/api@0.13.30
+  - @atproto/bsky@0.0.111
+  - @atproto/pds@0.4.89
+
 ## 0.3.80
 
 ### Patch Changes
diff --git a/packages/dev-env/package.json b/packages/dev-env/package.json
index 33293b942a1..ccc026bc702 100644
--- a/packages/dev-env/package.json
+++ b/packages/dev-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/dev-env",
-  "version": "0.3.80",
+  "version": "0.3.81",
   "license": "MIT",
   "description": "Local development environment helper for atproto development",
   "keywords": [
diff --git a/packages/oauth/oauth-provider/CHANGELOG.md b/packages/oauth/oauth-provider/CHANGELOG.md
index 88a84cf6375..5ae5f34792b 100644
--- a/packages/oauth/oauth-provider/CHANGELOG.md
+++ b/packages/oauth/oauth-provider/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @atproto/oauth-provider
 
+## 0.2.14
+
+### Patch Changes
+
+- [#3415](https://github.com/bluesky-social/atproto/pull/3415) [`c5a4cdb0a`](https://github.com/bluesky-social/atproto/commit/c5a4cdb0a52f4583ffe783a0b259e80263f24a8c) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Improve error description in case invalid DPoP nonce is used
+
 ## 0.2.13
 
 ### Patch Changes
diff --git a/packages/oauth/oauth-provider/package.json b/packages/oauth/oauth-provider/package.json
index 2e6d0be16a4..9b87ac0852d 100644
--- a/packages/oauth/oauth-provider/package.json
+++ b/packages/oauth/oauth-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/oauth-provider",
-  "version": "0.2.13",
+  "version": "0.2.14",
   "license": "MIT",
   "description": "Generic OAuth2 and OpenID Connect provider for Node.js. Currently only supports features needed for Atproto.",
   "keywords": [
diff --git a/packages/ozone/CHANGELOG.md b/packages/ozone/CHANGELOG.md
index eb0a95d23d5..5a45d5e7ab0 100644
--- a/packages/ozone/CHANGELOG.md
+++ b/packages/ozone/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @atproto/ozone
 
+## 0.1.72
+
+### Patch Changes
+
+- [#3426](https://github.com/bluesky-social/atproto/pull/3426) [`1ada2d093`](https://github.com/bluesky-social/atproto/commit/1ada2d093427e45b6d59a16cf146bf5282560c7b) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Fix getSubjectStatuses query
+
+- Updated dependencies [[`e6e6aea38`](https://github.com/bluesky-social/atproto/commit/e6e6aea3814e3d0bb42a537f80d77947e85fa73f), [`c0a75d310`](https://github.com/bluesky-social/atproto/commit/c0a75d310aa92c067799a97d1acc5bd0543114c5)]:
+  - @atproto/api@0.13.30
+
 ## 0.1.71
 
 ### Patch Changes
diff --git a/packages/ozone/package.json b/packages/ozone/package.json
index ade4f19d7df..781798bd26d 100644
--- a/packages/ozone/package.json
+++ b/packages/ozone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.1.71",
+  "version": "0.1.72",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
diff --git a/packages/pds/CHANGELOG.md b/packages/pds/CHANGELOG.md
index dd2a563ab7b..64ee066e01d 100644
--- a/packages/pds/CHANGELOG.md
+++ b/packages/pds/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @atproto/pds
 
+## 0.4.89
+
+### Patch Changes
+
+- Updated dependencies [[`e6e6aea38`](https://github.com/bluesky-social/atproto/commit/e6e6aea3814e3d0bb42a537f80d77947e85fa73f), [`c0a75d310`](https://github.com/bluesky-social/atproto/commit/c0a75d310aa92c067799a97d1acc5bd0543114c5), [`c5a4cdb0a`](https://github.com/bluesky-social/atproto/commit/c5a4cdb0a52f4583ffe783a0b259e80263f24a8c)]:
+  - @atproto/api@0.13.30
+  - @atproto/oauth-provider@0.2.14
+
 ## 0.4.88
 
 ### Patch Changes
diff --git a/packages/pds/package.json b/packages/pds/package.json
index f731ff305ba..34858139bfc 100644
--- a/packages/pds/package.json
+++ b/packages/pds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/pds",
-  "version": "0.4.88",
+  "version": "0.4.89",
   "license": "MIT",
   "description": "Reference implementation of atproto Personal Data Server (PDS)",
   "keywords": [

From 08a48c16a0c09838df8fda79fd00af6b94c26bf3 Mon Sep 17 00:00:00 2001
From: Daniel Holmgren <dtholmgren@gmail.com>
Date: Wed, 22 Jan 2025 17:55:34 -0600
Subject: [PATCH 025/101] Reset rate limit codegen (#3435)

reset rate limit codegen
---
 packages/bsky/src/lexicon/types/app/bsky/actor/getPreferences.ts | 1 +
 packages/bsky/src/lexicon/types/app/bsky/actor/getProfile.ts     | 1 +
 packages/bsky/src/lexicon/types/app/bsky/actor/getProfiles.ts    | 1 +
 packages/bsky/src/lexicon/types/app/bsky/actor/getSuggestions.ts | 1 +
 packages/bsky/src/lexicon/types/app/bsky/actor/putPreferences.ts | 1 +
 packages/bsky/src/lexicon/types/app/bsky/actor/searchActors.ts   | 1 +
 .../src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts    | 1 +
 .../src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts     | 1 +
 packages/bsky/src/lexicon/types/app/bsky/feed/getActorFeeds.ts   | 1 +
 packages/bsky/src/lexicon/types/app/bsky/feed/getActorLikes.ts   | 1 +
 packages/bsky/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts   | 1 +
 packages/bsky/src/lexicon/types/app/bsky/feed/getFeed.ts         | 1 +
 .../bsky/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts     | 1 +
 .../bsky/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts    | 1 +
 packages/bsky/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts | 1 +
 packages/bsky/src/lexicon/types/app/bsky/feed/getLikes.ts        | 1 +
 packages/bsky/src/lexicon/types/app/bsky/feed/getListFeed.ts     | 1 +
 packages/bsky/src/lexicon/types/app/bsky/feed/getPostThread.ts   | 1 +
 packages/bsky/src/lexicon/types/app/bsky/feed/getPosts.ts        | 1 +
 packages/bsky/src/lexicon/types/app/bsky/feed/getQuotes.ts       | 1 +
 packages/bsky/src/lexicon/types/app/bsky/feed/getRepostedBy.ts   | 1 +
 .../bsky/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts    | 1 +
 packages/bsky/src/lexicon/types/app/bsky/feed/getTimeline.ts     | 1 +
 packages/bsky/src/lexicon/types/app/bsky/feed/searchPosts.ts     | 1 +
 .../bsky/src/lexicon/types/app/bsky/feed/sendInteractions.ts     | 1 +
 .../src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts     | 1 +
 packages/bsky/src/lexicon/types/app/bsky/graph/getBlocks.ts      | 1 +
 packages/bsky/src/lexicon/types/app/bsky/graph/getFollowers.ts   | 1 +
 packages/bsky/src/lexicon/types/app/bsky/graph/getFollows.ts     | 1 +
 .../bsky/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts   | 1 +
 packages/bsky/src/lexicon/types/app/bsky/graph/getList.ts        | 1 +
 packages/bsky/src/lexicon/types/app/bsky/graph/getListBlocks.ts  | 1 +
 packages/bsky/src/lexicon/types/app/bsky/graph/getListMutes.ts   | 1 +
 packages/bsky/src/lexicon/types/app/bsky/graph/getLists.ts       | 1 +
 packages/bsky/src/lexicon/types/app/bsky/graph/getMutes.ts       | 1 +
 .../bsky/src/lexicon/types/app/bsky/graph/getRelationships.ts    | 1 +
 packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPack.ts | 1 +
 .../bsky/src/lexicon/types/app/bsky/graph/getStarterPacks.ts     | 1 +
 .../lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts   | 1 +
 packages/bsky/src/lexicon/types/app/bsky/graph/muteActor.ts      | 1 +
 packages/bsky/src/lexicon/types/app/bsky/graph/muteActorList.ts  | 1 +
 packages/bsky/src/lexicon/types/app/bsky/graph/muteThread.ts     | 1 +
 .../bsky/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts  | 1 +
 packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActor.ts    | 1 +
 .../bsky/src/lexicon/types/app/bsky/graph/unmuteActorList.ts     | 1 +
 packages/bsky/src/lexicon/types/app/bsky/graph/unmuteThread.ts   | 1 +
 packages/bsky/src/lexicon/types/app/bsky/labeler/getServices.ts  | 1 +
 .../src/lexicon/types/app/bsky/notification/getUnreadCount.ts    | 1 +
 .../src/lexicon/types/app/bsky/notification/listNotifications.ts | 1 +
 .../src/lexicon/types/app/bsky/notification/putPreferences.ts    | 1 +
 .../bsky/src/lexicon/types/app/bsky/notification/registerPush.ts | 1 +
 .../bsky/src/lexicon/types/app/bsky/notification/updateSeen.ts   | 1 +
 packages/bsky/src/lexicon/types/app/bsky/unspecced/getConfig.ts  | 1 +
 .../lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts | 1 +
 .../lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts   | 1 +
 .../src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts | 1 +
 .../src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts    | 1 +
 .../src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts | 1 +
 .../src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts  | 1 +
 .../types/app/bsky/unspecced/searchStarterPacksSkeleton.ts       | 1 +
 packages/bsky/src/lexicon/types/app/bsky/video/getJobStatus.ts   | 1 +
 .../bsky/src/lexicon/types/app/bsky/video/getUploadLimits.ts     | 1 +
 packages/bsky/src/lexicon/types/app/bsky/video/uploadVideo.ts    | 1 +
 packages/bsky/src/lexicon/types/chat/bsky/actor/deleteAccount.ts | 1 +
 .../bsky/src/lexicon/types/chat/bsky/actor/exportAccountData.ts  | 1 +
 .../src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts    | 1 +
 packages/bsky/src/lexicon/types/chat/bsky/convo/getConvo.ts      | 1 +
 .../bsky/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts | 1 +
 packages/bsky/src/lexicon/types/chat/bsky/convo/getLog.ts        | 1 +
 packages/bsky/src/lexicon/types/chat/bsky/convo/getMessages.ts   | 1 +
 packages/bsky/src/lexicon/types/chat/bsky/convo/leaveConvo.ts    | 1 +
 packages/bsky/src/lexicon/types/chat/bsky/convo/listConvos.ts    | 1 +
 packages/bsky/src/lexicon/types/chat/bsky/convo/muteConvo.ts     | 1 +
 packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessage.ts   | 1 +
 .../bsky/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts   | 1 +
 packages/bsky/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts   | 1 +
 packages/bsky/src/lexicon/types/chat/bsky/convo/updateRead.ts    | 1 +
 .../src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts   | 1 +
 .../src/lexicon/types/chat/bsky/moderation/getMessageContext.ts  | 1 +
 .../src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts  | 1 +
 .../bsky/src/lexicon/types/com/atproto/admin/deleteAccount.ts    | 1 +
 .../src/lexicon/types/com/atproto/admin/disableAccountInvites.ts | 1 +
 .../src/lexicon/types/com/atproto/admin/disableInviteCodes.ts    | 1 +
 .../src/lexicon/types/com/atproto/admin/enableAccountInvites.ts  | 1 +
 .../bsky/src/lexicon/types/com/atproto/admin/getAccountInfo.ts   | 1 +
 .../bsky/src/lexicon/types/com/atproto/admin/getAccountInfos.ts  | 1 +
 .../bsky/src/lexicon/types/com/atproto/admin/getInviteCodes.ts   | 1 +
 .../bsky/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts | 1 +
 .../bsky/src/lexicon/types/com/atproto/admin/searchAccounts.ts   | 1 +
 packages/bsky/src/lexicon/types/com/atproto/admin/sendEmail.ts   | 1 +
 .../src/lexicon/types/com/atproto/admin/updateAccountEmail.ts    | 1 +
 .../src/lexicon/types/com/atproto/admin/updateAccountHandle.ts   | 1 +
 .../src/lexicon/types/com/atproto/admin/updateAccountPassword.ts | 1 +
 .../src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts   | 1 +
 .../types/com/atproto/identity/getRecommendedDidCredentials.ts   | 1 +
 .../types/com/atproto/identity/requestPlcOperationSignature.ts   | 1 +
 .../bsky/src/lexicon/types/com/atproto/identity/resolveHandle.ts | 1 +
 .../src/lexicon/types/com/atproto/identity/signPlcOperation.ts   | 1 +
 .../src/lexicon/types/com/atproto/identity/submitPlcOperation.ts | 1 +
 .../bsky/src/lexicon/types/com/atproto/identity/updateHandle.ts  | 1 +
 packages/bsky/src/lexicon/types/com/atproto/label/queryLabels.ts | 1 +
 .../src/lexicon/types/com/atproto/moderation/createReport.ts     | 1 +
 packages/bsky/src/lexicon/types/com/atproto/repo/applyWrites.ts  | 1 +
 packages/bsky/src/lexicon/types/com/atproto/repo/createRecord.ts | 1 +
 packages/bsky/src/lexicon/types/com/atproto/repo/deleteRecord.ts | 1 +
 packages/bsky/src/lexicon/types/com/atproto/repo/describeRepo.ts | 1 +
 packages/bsky/src/lexicon/types/com/atproto/repo/getRecord.ts    | 1 +
 packages/bsky/src/lexicon/types/com/atproto/repo/importRepo.ts   | 1 +
 .../bsky/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts  | 1 +
 packages/bsky/src/lexicon/types/com/atproto/repo/listRecords.ts  | 1 +
 packages/bsky/src/lexicon/types/com/atproto/repo/putRecord.ts    | 1 +
 packages/bsky/src/lexicon/types/com/atproto/repo/uploadBlob.ts   | 1 +
 .../bsky/src/lexicon/types/com/atproto/server/activateAccount.ts | 1 +
 .../src/lexicon/types/com/atproto/server/checkAccountStatus.ts   | 1 +
 .../bsky/src/lexicon/types/com/atproto/server/confirmEmail.ts    | 1 +
 .../bsky/src/lexicon/types/com/atproto/server/createAccount.ts   | 1 +
 .../src/lexicon/types/com/atproto/server/createAppPassword.ts    | 1 +
 .../src/lexicon/types/com/atproto/server/createInviteCode.ts     | 1 +
 .../src/lexicon/types/com/atproto/server/createInviteCodes.ts    | 1 +
 .../bsky/src/lexicon/types/com/atproto/server/createSession.ts   | 1 +
 .../src/lexicon/types/com/atproto/server/deactivateAccount.ts    | 1 +
 .../bsky/src/lexicon/types/com/atproto/server/deleteAccount.ts   | 1 +
 .../bsky/src/lexicon/types/com/atproto/server/deleteSession.ts   | 1 +
 .../bsky/src/lexicon/types/com/atproto/server/describeServer.ts  | 1 +
 .../lexicon/types/com/atproto/server/getAccountInviteCodes.ts    | 1 +
 .../bsky/src/lexicon/types/com/atproto/server/getServiceAuth.ts  | 1 +
 packages/bsky/src/lexicon/types/com/atproto/server/getSession.ts | 1 +
 .../src/lexicon/types/com/atproto/server/listAppPasswords.ts     | 1 +
 .../bsky/src/lexicon/types/com/atproto/server/refreshSession.ts  | 1 +
 .../src/lexicon/types/com/atproto/server/requestAccountDelete.ts | 1 +
 .../lexicon/types/com/atproto/server/requestEmailConfirmation.ts | 1 +
 .../src/lexicon/types/com/atproto/server/requestEmailUpdate.ts   | 1 +
 .../src/lexicon/types/com/atproto/server/requestPasswordReset.ts | 1 +
 .../src/lexicon/types/com/atproto/server/reserveSigningKey.ts    | 1 +
 .../bsky/src/lexicon/types/com/atproto/server/resetPassword.ts   | 1 +
 .../src/lexicon/types/com/atproto/server/revokeAppPassword.ts    | 1 +
 .../bsky/src/lexicon/types/com/atproto/server/updateEmail.ts     | 1 +
 packages/bsky/src/lexicon/types/com/atproto/sync/getBlob.ts      | 1 +
 packages/bsky/src/lexicon/types/com/atproto/sync/getBlocks.ts    | 1 +
 packages/bsky/src/lexicon/types/com/atproto/sync/getCheckout.ts  | 1 +
 packages/bsky/src/lexicon/types/com/atproto/sync/getHead.ts      | 1 +
 .../bsky/src/lexicon/types/com/atproto/sync/getLatestCommit.ts   | 1 +
 packages/bsky/src/lexicon/types/com/atproto/sync/getRecord.ts    | 1 +
 packages/bsky/src/lexicon/types/com/atproto/sync/getRepo.ts      | 1 +
 .../bsky/src/lexicon/types/com/atproto/sync/getRepoStatus.ts     | 1 +
 packages/bsky/src/lexicon/types/com/atproto/sync/listBlobs.ts    | 1 +
 packages/bsky/src/lexicon/types/com/atproto/sync/listRepos.ts    | 1 +
 .../bsky/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts    | 1 +
 packages/bsky/src/lexicon/types/com/atproto/sync/requestCrawl.ts | 1 +
 .../bsky/src/lexicon/types/com/atproto/temp/addReservedHandle.ts | 1 +
 .../bsky/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts  | 1 +
 packages/bsky/src/lexicon/types/com/atproto/temp/fetchLabels.ts  | 1 +
 .../lexicon/types/com/atproto/temp/requestPhoneVerification.ts   | 1 +
 .../ozone/src/lexicon/types/app/bsky/actor/getPreferences.ts     | 1 +
 packages/ozone/src/lexicon/types/app/bsky/actor/getProfile.ts    | 1 +
 packages/ozone/src/lexicon/types/app/bsky/actor/getProfiles.ts   | 1 +
 .../ozone/src/lexicon/types/app/bsky/actor/getSuggestions.ts     | 1 +
 .../ozone/src/lexicon/types/app/bsky/actor/putPreferences.ts     | 1 +
 packages/ozone/src/lexicon/types/app/bsky/actor/searchActors.ts  | 1 +
 .../src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts    | 1 +
 .../src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts     | 1 +
 packages/ozone/src/lexicon/types/app/bsky/feed/getActorFeeds.ts  | 1 +
 packages/ozone/src/lexicon/types/app/bsky/feed/getActorLikes.ts  | 1 +
 packages/ozone/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts  | 1 +
 packages/ozone/src/lexicon/types/app/bsky/feed/getFeed.ts        | 1 +
 .../ozone/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts    | 1 +
 .../ozone/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts   | 1 +
 .../ozone/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts     | 1 +
 packages/ozone/src/lexicon/types/app/bsky/feed/getLikes.ts       | 1 +
 packages/ozone/src/lexicon/types/app/bsky/feed/getListFeed.ts    | 1 +
 packages/ozone/src/lexicon/types/app/bsky/feed/getPostThread.ts  | 1 +
 packages/ozone/src/lexicon/types/app/bsky/feed/getPosts.ts       | 1 +
 packages/ozone/src/lexicon/types/app/bsky/feed/getQuotes.ts      | 1 +
 packages/ozone/src/lexicon/types/app/bsky/feed/getRepostedBy.ts  | 1 +
 .../ozone/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts   | 1 +
 packages/ozone/src/lexicon/types/app/bsky/feed/getTimeline.ts    | 1 +
 packages/ozone/src/lexicon/types/app/bsky/feed/searchPosts.ts    | 1 +
 .../ozone/src/lexicon/types/app/bsky/feed/sendInteractions.ts    | 1 +
 .../src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts     | 1 +
 packages/ozone/src/lexicon/types/app/bsky/graph/getBlocks.ts     | 1 +
 packages/ozone/src/lexicon/types/app/bsky/graph/getFollowers.ts  | 1 +
 packages/ozone/src/lexicon/types/app/bsky/graph/getFollows.ts    | 1 +
 .../ozone/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts  | 1 +
 packages/ozone/src/lexicon/types/app/bsky/graph/getList.ts       | 1 +
 packages/ozone/src/lexicon/types/app/bsky/graph/getListBlocks.ts | 1 +
 packages/ozone/src/lexicon/types/app/bsky/graph/getListMutes.ts  | 1 +
 packages/ozone/src/lexicon/types/app/bsky/graph/getLists.ts      | 1 +
 packages/ozone/src/lexicon/types/app/bsky/graph/getMutes.ts      | 1 +
 .../ozone/src/lexicon/types/app/bsky/graph/getRelationships.ts   | 1 +
 .../ozone/src/lexicon/types/app/bsky/graph/getStarterPack.ts     | 1 +
 .../ozone/src/lexicon/types/app/bsky/graph/getStarterPacks.ts    | 1 +
 .../lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts   | 1 +
 packages/ozone/src/lexicon/types/app/bsky/graph/muteActor.ts     | 1 +
 packages/ozone/src/lexicon/types/app/bsky/graph/muteActorList.ts | 1 +
 packages/ozone/src/lexicon/types/app/bsky/graph/muteThread.ts    | 1 +
 .../ozone/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts | 1 +
 packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActor.ts   | 1 +
 .../ozone/src/lexicon/types/app/bsky/graph/unmuteActorList.ts    | 1 +
 packages/ozone/src/lexicon/types/app/bsky/graph/unmuteThread.ts  | 1 +
 packages/ozone/src/lexicon/types/app/bsky/labeler/getServices.ts | 1 +
 .../src/lexicon/types/app/bsky/notification/getUnreadCount.ts    | 1 +
 .../src/lexicon/types/app/bsky/notification/listNotifications.ts | 1 +
 .../src/lexicon/types/app/bsky/notification/putPreferences.ts    | 1 +
 .../src/lexicon/types/app/bsky/notification/registerPush.ts      | 1 +
 .../ozone/src/lexicon/types/app/bsky/notification/updateSeen.ts  | 1 +
 packages/ozone/src/lexicon/types/app/bsky/unspecced/getConfig.ts | 1 +
 .../lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts | 1 +
 .../lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts   | 1 +
 .../src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts | 1 +
 .../src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts    | 1 +
 .../src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts | 1 +
 .../src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts  | 1 +
 .../types/app/bsky/unspecced/searchStarterPacksSkeleton.ts       | 1 +
 packages/ozone/src/lexicon/types/app/bsky/video/getJobStatus.ts  | 1 +
 .../ozone/src/lexicon/types/app/bsky/video/getUploadLimits.ts    | 1 +
 packages/ozone/src/lexicon/types/app/bsky/video/uploadVideo.ts   | 1 +
 .../ozone/src/lexicon/types/chat/bsky/actor/deleteAccount.ts     | 1 +
 .../ozone/src/lexicon/types/chat/bsky/actor/exportAccountData.ts | 1 +
 .../src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts    | 1 +
 packages/ozone/src/lexicon/types/chat/bsky/convo/getConvo.ts     | 1 +
 .../src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts      | 1 +
 packages/ozone/src/lexicon/types/chat/bsky/convo/getLog.ts       | 1 +
 packages/ozone/src/lexicon/types/chat/bsky/convo/getMessages.ts  | 1 +
 packages/ozone/src/lexicon/types/chat/bsky/convo/leaveConvo.ts   | 1 +
 packages/ozone/src/lexicon/types/chat/bsky/convo/listConvos.ts   | 1 +
 packages/ozone/src/lexicon/types/chat/bsky/convo/muteConvo.ts    | 1 +
 packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessage.ts  | 1 +
 .../ozone/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts  | 1 +
 packages/ozone/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts  | 1 +
 packages/ozone/src/lexicon/types/chat/bsky/convo/updateRead.ts   | 1 +
 .../src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts   | 1 +
 .../src/lexicon/types/chat/bsky/moderation/getMessageContext.ts  | 1 +
 .../src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts  | 1 +
 .../ozone/src/lexicon/types/com/atproto/admin/deleteAccount.ts   | 1 +
 .../src/lexicon/types/com/atproto/admin/disableAccountInvites.ts | 1 +
 .../src/lexicon/types/com/atproto/admin/disableInviteCodes.ts    | 1 +
 .../src/lexicon/types/com/atproto/admin/enableAccountInvites.ts  | 1 +
 .../ozone/src/lexicon/types/com/atproto/admin/getAccountInfo.ts  | 1 +
 .../ozone/src/lexicon/types/com/atproto/admin/getAccountInfos.ts | 1 +
 .../ozone/src/lexicon/types/com/atproto/admin/getInviteCodes.ts  | 1 +
 .../src/lexicon/types/com/atproto/admin/getSubjectStatus.ts      | 1 +
 .../ozone/src/lexicon/types/com/atproto/admin/searchAccounts.ts  | 1 +
 packages/ozone/src/lexicon/types/com/atproto/admin/sendEmail.ts  | 1 +
 .../src/lexicon/types/com/atproto/admin/updateAccountEmail.ts    | 1 +
 .../src/lexicon/types/com/atproto/admin/updateAccountHandle.ts   | 1 +
 .../src/lexicon/types/com/atproto/admin/updateAccountPassword.ts | 1 +
 .../src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts   | 1 +
 .../types/com/atproto/identity/getRecommendedDidCredentials.ts   | 1 +
 .../types/com/atproto/identity/requestPlcOperationSignature.ts   | 1 +
 .../src/lexicon/types/com/atproto/identity/resolveHandle.ts      | 1 +
 .../src/lexicon/types/com/atproto/identity/signPlcOperation.ts   | 1 +
 .../src/lexicon/types/com/atproto/identity/submitPlcOperation.ts | 1 +
 .../ozone/src/lexicon/types/com/atproto/identity/updateHandle.ts | 1 +
 .../ozone/src/lexicon/types/com/atproto/label/queryLabels.ts     | 1 +
 .../src/lexicon/types/com/atproto/moderation/createReport.ts     | 1 +
 packages/ozone/src/lexicon/types/com/atproto/repo/applyWrites.ts | 1 +
 .../ozone/src/lexicon/types/com/atproto/repo/createRecord.ts     | 1 +
 .../ozone/src/lexicon/types/com/atproto/repo/deleteRecord.ts     | 1 +
 .../ozone/src/lexicon/types/com/atproto/repo/describeRepo.ts     | 1 +
 packages/ozone/src/lexicon/types/com/atproto/repo/getRecord.ts   | 1 +
 packages/ozone/src/lexicon/types/com/atproto/repo/importRepo.ts  | 1 +
 .../ozone/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts | 1 +
 packages/ozone/src/lexicon/types/com/atproto/repo/listRecords.ts | 1 +
 packages/ozone/src/lexicon/types/com/atproto/repo/putRecord.ts   | 1 +
 packages/ozone/src/lexicon/types/com/atproto/repo/uploadBlob.ts  | 1 +
 .../src/lexicon/types/com/atproto/server/activateAccount.ts      | 1 +
 .../src/lexicon/types/com/atproto/server/checkAccountStatus.ts   | 1 +
 .../ozone/src/lexicon/types/com/atproto/server/confirmEmail.ts   | 1 +
 .../ozone/src/lexicon/types/com/atproto/server/createAccount.ts  | 1 +
 .../src/lexicon/types/com/atproto/server/createAppPassword.ts    | 1 +
 .../src/lexicon/types/com/atproto/server/createInviteCode.ts     | 1 +
 .../src/lexicon/types/com/atproto/server/createInviteCodes.ts    | 1 +
 .../ozone/src/lexicon/types/com/atproto/server/createSession.ts  | 1 +
 .../src/lexicon/types/com/atproto/server/deactivateAccount.ts    | 1 +
 .../ozone/src/lexicon/types/com/atproto/server/deleteAccount.ts  | 1 +
 .../ozone/src/lexicon/types/com/atproto/server/deleteSession.ts  | 1 +
 .../ozone/src/lexicon/types/com/atproto/server/describeServer.ts | 1 +
 .../lexicon/types/com/atproto/server/getAccountInviteCodes.ts    | 1 +
 .../ozone/src/lexicon/types/com/atproto/server/getServiceAuth.ts | 1 +
 .../ozone/src/lexicon/types/com/atproto/server/getSession.ts     | 1 +
 .../src/lexicon/types/com/atproto/server/listAppPasswords.ts     | 1 +
 .../ozone/src/lexicon/types/com/atproto/server/refreshSession.ts | 1 +
 .../src/lexicon/types/com/atproto/server/requestAccountDelete.ts | 1 +
 .../lexicon/types/com/atproto/server/requestEmailConfirmation.ts | 1 +
 .../src/lexicon/types/com/atproto/server/requestEmailUpdate.ts   | 1 +
 .../src/lexicon/types/com/atproto/server/requestPasswordReset.ts | 1 +
 .../src/lexicon/types/com/atproto/server/reserveSigningKey.ts    | 1 +
 .../ozone/src/lexicon/types/com/atproto/server/resetPassword.ts  | 1 +
 .../src/lexicon/types/com/atproto/server/revokeAppPassword.ts    | 1 +
 .../ozone/src/lexicon/types/com/atproto/server/updateEmail.ts    | 1 +
 packages/ozone/src/lexicon/types/com/atproto/sync/getBlob.ts     | 1 +
 packages/ozone/src/lexicon/types/com/atproto/sync/getBlocks.ts   | 1 +
 packages/ozone/src/lexicon/types/com/atproto/sync/getCheckout.ts | 1 +
 packages/ozone/src/lexicon/types/com/atproto/sync/getHead.ts     | 1 +
 .../ozone/src/lexicon/types/com/atproto/sync/getLatestCommit.ts  | 1 +
 packages/ozone/src/lexicon/types/com/atproto/sync/getRecord.ts   | 1 +
 packages/ozone/src/lexicon/types/com/atproto/sync/getRepo.ts     | 1 +
 .../ozone/src/lexicon/types/com/atproto/sync/getRepoStatus.ts    | 1 +
 packages/ozone/src/lexicon/types/com/atproto/sync/listBlobs.ts   | 1 +
 packages/ozone/src/lexicon/types/com/atproto/sync/listRepos.ts   | 1 +
 .../ozone/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts   | 1 +
 .../ozone/src/lexicon/types/com/atproto/sync/requestCrawl.ts     | 1 +
 .../src/lexicon/types/com/atproto/temp/addReservedHandle.ts      | 1 +
 .../ozone/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts | 1 +
 packages/ozone/src/lexicon/types/com/atproto/temp/fetchLabels.ts | 1 +
 .../lexicon/types/com/atproto/temp/requestPhoneVerification.ts   | 1 +
 .../lexicon/types/tools/ozone/communication/createTemplate.ts    | 1 +
 .../lexicon/types/tools/ozone/communication/deleteTemplate.ts    | 1 +
 .../src/lexicon/types/tools/ozone/communication/listTemplates.ts | 1 +
 .../lexicon/types/tools/ozone/communication/updateTemplate.ts    | 1 +
 .../ozone/src/lexicon/types/tools/ozone/moderation/emitEvent.ts  | 1 +
 .../ozone/src/lexicon/types/tools/ozone/moderation/getEvent.ts   | 1 +
 .../ozone/src/lexicon/types/tools/ozone/moderation/getRecord.ts  | 1 +
 .../ozone/src/lexicon/types/tools/ozone/moderation/getRecords.ts | 1 +
 .../ozone/src/lexicon/types/tools/ozone/moderation/getRepo.ts    | 1 +
 .../ozone/src/lexicon/types/tools/ozone/moderation/getRepos.ts   | 1 +
 .../src/lexicon/types/tools/ozone/moderation/queryEvents.ts      | 1 +
 .../src/lexicon/types/tools/ozone/moderation/queryStatuses.ts    | 1 +
 .../src/lexicon/types/tools/ozone/moderation/searchRepos.ts      | 1 +
 packages/ozone/src/lexicon/types/tools/ozone/server/getConfig.ts | 1 +
 packages/ozone/src/lexicon/types/tools/ozone/set/addValues.ts    | 1 +
 packages/ozone/src/lexicon/types/tools/ozone/set/deleteSet.ts    | 1 +
 packages/ozone/src/lexicon/types/tools/ozone/set/deleteValues.ts | 1 +
 packages/ozone/src/lexicon/types/tools/ozone/set/getValues.ts    | 1 +
 packages/ozone/src/lexicon/types/tools/ozone/set/querySets.ts    | 1 +
 packages/ozone/src/lexicon/types/tools/ozone/set/upsertSet.ts    | 1 +
 .../ozone/src/lexicon/types/tools/ozone/setting/listOptions.ts   | 1 +
 .../ozone/src/lexicon/types/tools/ozone/setting/removeOptions.ts | 1 +
 .../ozone/src/lexicon/types/tools/ozone/setting/upsertOption.ts  | 1 +
 .../src/lexicon/types/tools/ozone/signature/findCorrelation.ts   | 1 +
 .../lexicon/types/tools/ozone/signature/findRelatedAccounts.ts   | 1 +
 .../src/lexicon/types/tools/ozone/signature/searchAccounts.ts    | 1 +
 packages/ozone/src/lexicon/types/tools/ozone/team/addMember.ts   | 1 +
 .../ozone/src/lexicon/types/tools/ozone/team/deleteMember.ts     | 1 +
 packages/ozone/src/lexicon/types/tools/ozone/team/listMembers.ts | 1 +
 .../ozone/src/lexicon/types/tools/ozone/team/updateMember.ts     | 1 +
 packages/pds/src/lexicon/types/app/bsky/actor/getPreferences.ts  | 1 +
 packages/pds/src/lexicon/types/app/bsky/actor/getProfile.ts      | 1 +
 packages/pds/src/lexicon/types/app/bsky/actor/getProfiles.ts     | 1 +
 packages/pds/src/lexicon/types/app/bsky/actor/getSuggestions.ts  | 1 +
 packages/pds/src/lexicon/types/app/bsky/actor/putPreferences.ts  | 1 +
 packages/pds/src/lexicon/types/app/bsky/actor/searchActors.ts    | 1 +
 .../src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts    | 1 +
 .../pds/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts | 1 +
 packages/pds/src/lexicon/types/app/bsky/feed/getActorFeeds.ts    | 1 +
 packages/pds/src/lexicon/types/app/bsky/feed/getActorLikes.ts    | 1 +
 packages/pds/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts    | 1 +
 packages/pds/src/lexicon/types/app/bsky/feed/getFeed.ts          | 1 +
 packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts | 1 +
 .../pds/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts     | 1 +
 packages/pds/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts  | 1 +
 packages/pds/src/lexicon/types/app/bsky/feed/getLikes.ts         | 1 +
 packages/pds/src/lexicon/types/app/bsky/feed/getListFeed.ts      | 1 +
 packages/pds/src/lexicon/types/app/bsky/feed/getPostThread.ts    | 1 +
 packages/pds/src/lexicon/types/app/bsky/feed/getPosts.ts         | 1 +
 packages/pds/src/lexicon/types/app/bsky/feed/getQuotes.ts        | 1 +
 packages/pds/src/lexicon/types/app/bsky/feed/getRepostedBy.ts    | 1 +
 .../pds/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts     | 1 +
 packages/pds/src/lexicon/types/app/bsky/feed/getTimeline.ts      | 1 +
 packages/pds/src/lexicon/types/app/bsky/feed/searchPosts.ts      | 1 +
 packages/pds/src/lexicon/types/app/bsky/feed/sendInteractions.ts | 1 +
 .../pds/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts | 1 +
 packages/pds/src/lexicon/types/app/bsky/graph/getBlocks.ts       | 1 +
 packages/pds/src/lexicon/types/app/bsky/graph/getFollowers.ts    | 1 +
 packages/pds/src/lexicon/types/app/bsky/graph/getFollows.ts      | 1 +
 .../pds/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts    | 1 +
 packages/pds/src/lexicon/types/app/bsky/graph/getList.ts         | 1 +
 packages/pds/src/lexicon/types/app/bsky/graph/getListBlocks.ts   | 1 +
 packages/pds/src/lexicon/types/app/bsky/graph/getListMutes.ts    | 1 +
 packages/pds/src/lexicon/types/app/bsky/graph/getLists.ts        | 1 +
 packages/pds/src/lexicon/types/app/bsky/graph/getMutes.ts        | 1 +
 .../pds/src/lexicon/types/app/bsky/graph/getRelationships.ts     | 1 +
 packages/pds/src/lexicon/types/app/bsky/graph/getStarterPack.ts  | 1 +
 packages/pds/src/lexicon/types/app/bsky/graph/getStarterPacks.ts | 1 +
 .../lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts   | 1 +
 packages/pds/src/lexicon/types/app/bsky/graph/muteActor.ts       | 1 +
 packages/pds/src/lexicon/types/app/bsky/graph/muteActorList.ts   | 1 +
 packages/pds/src/lexicon/types/app/bsky/graph/muteThread.ts      | 1 +
 .../pds/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts   | 1 +
 packages/pds/src/lexicon/types/app/bsky/graph/unmuteActor.ts     | 1 +
 packages/pds/src/lexicon/types/app/bsky/graph/unmuteActorList.ts | 1 +
 packages/pds/src/lexicon/types/app/bsky/graph/unmuteThread.ts    | 1 +
 packages/pds/src/lexicon/types/app/bsky/labeler/getServices.ts   | 1 +
 .../src/lexicon/types/app/bsky/notification/getUnreadCount.ts    | 1 +
 .../src/lexicon/types/app/bsky/notification/listNotifications.ts | 1 +
 .../src/lexicon/types/app/bsky/notification/putPreferences.ts    | 1 +
 .../pds/src/lexicon/types/app/bsky/notification/registerPush.ts  | 1 +
 .../pds/src/lexicon/types/app/bsky/notification/updateSeen.ts    | 1 +
 packages/pds/src/lexicon/types/app/bsky/unspecced/getConfig.ts   | 1 +
 .../lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts | 1 +
 .../lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts   | 1 +
 .../src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts | 1 +
 .../src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts    | 1 +
 .../src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts | 1 +
 .../src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts  | 1 +
 .../types/app/bsky/unspecced/searchStarterPacksSkeleton.ts       | 1 +
 packages/pds/src/lexicon/types/app/bsky/video/getJobStatus.ts    | 1 +
 packages/pds/src/lexicon/types/app/bsky/video/getUploadLimits.ts | 1 +
 packages/pds/src/lexicon/types/app/bsky/video/uploadVideo.ts     | 1 +
 packages/pds/src/lexicon/types/chat/bsky/actor/deleteAccount.ts  | 1 +
 .../pds/src/lexicon/types/chat/bsky/actor/exportAccountData.ts   | 1 +
 .../src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts    | 1 +
 packages/pds/src/lexicon/types/chat/bsky/convo/getConvo.ts       | 1 +
 .../pds/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts  | 1 +
 packages/pds/src/lexicon/types/chat/bsky/convo/getLog.ts         | 1 +
 packages/pds/src/lexicon/types/chat/bsky/convo/getMessages.ts    | 1 +
 packages/pds/src/lexicon/types/chat/bsky/convo/leaveConvo.ts     | 1 +
 packages/pds/src/lexicon/types/chat/bsky/convo/listConvos.ts     | 1 +
 packages/pds/src/lexicon/types/chat/bsky/convo/muteConvo.ts      | 1 +
 packages/pds/src/lexicon/types/chat/bsky/convo/sendMessage.ts    | 1 +
 .../pds/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts    | 1 +
 packages/pds/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts    | 1 +
 packages/pds/src/lexicon/types/chat/bsky/convo/updateRead.ts     | 1 +
 .../src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts   | 1 +
 .../src/lexicon/types/chat/bsky/moderation/getMessageContext.ts  | 1 +
 .../src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts  | 1 +
 .../pds/src/lexicon/types/com/atproto/admin/deleteAccount.ts     | 1 +
 .../src/lexicon/types/com/atproto/admin/disableAccountInvites.ts | 1 +
 .../src/lexicon/types/com/atproto/admin/disableInviteCodes.ts    | 1 +
 .../src/lexicon/types/com/atproto/admin/enableAccountInvites.ts  | 1 +
 .../pds/src/lexicon/types/com/atproto/admin/getAccountInfo.ts    | 1 +
 .../pds/src/lexicon/types/com/atproto/admin/getAccountInfos.ts   | 1 +
 .../pds/src/lexicon/types/com/atproto/admin/getInviteCodes.ts    | 1 +
 .../pds/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts  | 1 +
 .../pds/src/lexicon/types/com/atproto/admin/searchAccounts.ts    | 1 +
 packages/pds/src/lexicon/types/com/atproto/admin/sendEmail.ts    | 1 +
 .../src/lexicon/types/com/atproto/admin/updateAccountEmail.ts    | 1 +
 .../src/lexicon/types/com/atproto/admin/updateAccountHandle.ts   | 1 +
 .../src/lexicon/types/com/atproto/admin/updateAccountPassword.ts | 1 +
 .../src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts   | 1 +
 .../types/com/atproto/identity/getRecommendedDidCredentials.ts   | 1 +
 .../types/com/atproto/identity/requestPlcOperationSignature.ts   | 1 +
 .../pds/src/lexicon/types/com/atproto/identity/resolveHandle.ts  | 1 +
 .../src/lexicon/types/com/atproto/identity/signPlcOperation.ts   | 1 +
 .../src/lexicon/types/com/atproto/identity/submitPlcOperation.ts | 1 +
 .../pds/src/lexicon/types/com/atproto/identity/updateHandle.ts   | 1 +
 packages/pds/src/lexicon/types/com/atproto/label/queryLabels.ts  | 1 +
 .../pds/src/lexicon/types/com/atproto/moderation/createReport.ts | 1 +
 packages/pds/src/lexicon/types/com/atproto/repo/applyWrites.ts   | 1 +
 packages/pds/src/lexicon/types/com/atproto/repo/createRecord.ts  | 1 +
 packages/pds/src/lexicon/types/com/atproto/repo/deleteRecord.ts  | 1 +
 packages/pds/src/lexicon/types/com/atproto/repo/describeRepo.ts  | 1 +
 packages/pds/src/lexicon/types/com/atproto/repo/getRecord.ts     | 1 +
 packages/pds/src/lexicon/types/com/atproto/repo/importRepo.ts    | 1 +
 .../pds/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts   | 1 +
 packages/pds/src/lexicon/types/com/atproto/repo/listRecords.ts   | 1 +
 packages/pds/src/lexicon/types/com/atproto/repo/putRecord.ts     | 1 +
 packages/pds/src/lexicon/types/com/atproto/repo/uploadBlob.ts    | 1 +
 .../pds/src/lexicon/types/com/atproto/server/activateAccount.ts  | 1 +
 .../src/lexicon/types/com/atproto/server/checkAccountStatus.ts   | 1 +
 .../pds/src/lexicon/types/com/atproto/server/confirmEmail.ts     | 1 +
 .../pds/src/lexicon/types/com/atproto/server/createAccount.ts    | 1 +
 .../src/lexicon/types/com/atproto/server/createAppPassword.ts    | 1 +
 .../pds/src/lexicon/types/com/atproto/server/createInviteCode.ts | 1 +
 .../src/lexicon/types/com/atproto/server/createInviteCodes.ts    | 1 +
 .../pds/src/lexicon/types/com/atproto/server/createSession.ts    | 1 +
 .../src/lexicon/types/com/atproto/server/deactivateAccount.ts    | 1 +
 .../pds/src/lexicon/types/com/atproto/server/deleteAccount.ts    | 1 +
 .../pds/src/lexicon/types/com/atproto/server/deleteSession.ts    | 1 +
 .../pds/src/lexicon/types/com/atproto/server/describeServer.ts   | 1 +
 .../lexicon/types/com/atproto/server/getAccountInviteCodes.ts    | 1 +
 .../pds/src/lexicon/types/com/atproto/server/getServiceAuth.ts   | 1 +
 packages/pds/src/lexicon/types/com/atproto/server/getSession.ts  | 1 +
 .../pds/src/lexicon/types/com/atproto/server/listAppPasswords.ts | 1 +
 .../pds/src/lexicon/types/com/atproto/server/refreshSession.ts   | 1 +
 .../src/lexicon/types/com/atproto/server/requestAccountDelete.ts | 1 +
 .../lexicon/types/com/atproto/server/requestEmailConfirmation.ts | 1 +
 .../src/lexicon/types/com/atproto/server/requestEmailUpdate.ts   | 1 +
 .../src/lexicon/types/com/atproto/server/requestPasswordReset.ts | 1 +
 .../src/lexicon/types/com/atproto/server/reserveSigningKey.ts    | 1 +
 .../pds/src/lexicon/types/com/atproto/server/resetPassword.ts    | 1 +
 .../src/lexicon/types/com/atproto/server/revokeAppPassword.ts    | 1 +
 packages/pds/src/lexicon/types/com/atproto/server/updateEmail.ts | 1 +
 packages/pds/src/lexicon/types/com/atproto/sync/getBlob.ts       | 1 +
 packages/pds/src/lexicon/types/com/atproto/sync/getBlocks.ts     | 1 +
 packages/pds/src/lexicon/types/com/atproto/sync/getCheckout.ts   | 1 +
 packages/pds/src/lexicon/types/com/atproto/sync/getHead.ts       | 1 +
 .../pds/src/lexicon/types/com/atproto/sync/getLatestCommit.ts    | 1 +
 packages/pds/src/lexicon/types/com/atproto/sync/getRecord.ts     | 1 +
 packages/pds/src/lexicon/types/com/atproto/sync/getRepo.ts       | 1 +
 packages/pds/src/lexicon/types/com/atproto/sync/getRepoStatus.ts | 1 +
 packages/pds/src/lexicon/types/com/atproto/sync/listBlobs.ts     | 1 +
 packages/pds/src/lexicon/types/com/atproto/sync/listRepos.ts     | 1 +
 .../pds/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts     | 1 +
 packages/pds/src/lexicon/types/com/atproto/sync/requestCrawl.ts  | 1 +
 .../pds/src/lexicon/types/com/atproto/temp/addReservedHandle.ts  | 1 +
 .../pds/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts   | 1 +
 packages/pds/src/lexicon/types/com/atproto/temp/fetchLabels.ts   | 1 +
 .../lexicon/types/com/atproto/temp/requestPhoneVerification.ts   | 1 +
 .../lexicon/types/tools/ozone/communication/createTemplate.ts    | 1 +
 .../lexicon/types/tools/ozone/communication/deleteTemplate.ts    | 1 +
 .../src/lexicon/types/tools/ozone/communication/listTemplates.ts | 1 +
 .../lexicon/types/tools/ozone/communication/updateTemplate.ts    | 1 +
 .../pds/src/lexicon/types/tools/ozone/moderation/emitEvent.ts    | 1 +
 .../pds/src/lexicon/types/tools/ozone/moderation/getEvent.ts     | 1 +
 .../pds/src/lexicon/types/tools/ozone/moderation/getRecord.ts    | 1 +
 .../pds/src/lexicon/types/tools/ozone/moderation/getRecords.ts   | 1 +
 packages/pds/src/lexicon/types/tools/ozone/moderation/getRepo.ts | 1 +
 .../pds/src/lexicon/types/tools/ozone/moderation/getRepos.ts     | 1 +
 .../pds/src/lexicon/types/tools/ozone/moderation/queryEvents.ts  | 1 +
 .../src/lexicon/types/tools/ozone/moderation/queryStatuses.ts    | 1 +
 .../pds/src/lexicon/types/tools/ozone/moderation/searchRepos.ts  | 1 +
 packages/pds/src/lexicon/types/tools/ozone/server/getConfig.ts   | 1 +
 packages/pds/src/lexicon/types/tools/ozone/set/addValues.ts      | 1 +
 packages/pds/src/lexicon/types/tools/ozone/set/deleteSet.ts      | 1 +
 packages/pds/src/lexicon/types/tools/ozone/set/deleteValues.ts   | 1 +
 packages/pds/src/lexicon/types/tools/ozone/set/getValues.ts      | 1 +
 packages/pds/src/lexicon/types/tools/ozone/set/querySets.ts      | 1 +
 packages/pds/src/lexicon/types/tools/ozone/set/upsertSet.ts      | 1 +
 .../pds/src/lexicon/types/tools/ozone/setting/listOptions.ts     | 1 +
 .../pds/src/lexicon/types/tools/ozone/setting/removeOptions.ts   | 1 +
 .../pds/src/lexicon/types/tools/ozone/setting/upsertOption.ts    | 1 +
 .../src/lexicon/types/tools/ozone/signature/findCorrelation.ts   | 1 +
 .../lexicon/types/tools/ozone/signature/findRelatedAccounts.ts   | 1 +
 .../src/lexicon/types/tools/ozone/signature/searchAccounts.ts    | 1 +
 packages/pds/src/lexicon/types/tools/ozone/team/addMember.ts     | 1 +
 packages/pds/src/lexicon/types/tools/ozone/team/deleteMember.ts  | 1 +
 packages/pds/src/lexicon/types/tools/ozone/team/listMembers.ts   | 1 +
 packages/pds/src/lexicon/types/tools/ozone/team/updateMember.ts  | 1 +
 519 files changed, 519 insertions(+)

diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/getPreferences.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/getPreferences.ts
index 305e80484be..f839ece0a4d 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/getPreferences.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/getPreferences.ts
@@ -38,6 +38,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/getProfile.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/getProfile.ts
index 5a7b1f25bfc..f9163fcf168 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/getProfile.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/getProfile.ts
@@ -36,6 +36,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/getProfiles.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/getProfiles.ts
index 16438505654..5c2ffb1f2cc 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/getProfiles.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/getProfiles.ts
@@ -40,6 +40,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/getSuggestions.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/getSuggestions.ts
index 6ecd43f1283..c7e254261a1 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/getSuggestions.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/getSuggestions.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/putPreferences.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/putPreferences.ts
index 670e752fea3..59aea81c2da 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/putPreferences.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/putPreferences.ts
@@ -33,6 +33,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/searchActors.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/searchActors.ts
index dcda0c41854..ebd81ececc5 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/searchActors.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/searchActors.ts
@@ -46,6 +46,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
index 0198b23d790..b7e9831b21d 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
index 5bf8699a3ca..0a7d253ce8f 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
@@ -39,6 +39,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getActorFeeds.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
index 0b8afff4ec8..6af507c6e03 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
@@ -43,6 +43,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getActorLikes.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getActorLikes.ts
index da315ae33c7..daf5060c8d2 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getActorLikes.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getActorLikes.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
index 70c2c439d2a..2a14f45d6da 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
@@ -53,6 +53,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeed.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeed.ts
index e03913a6fb3..5014c102155 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeed.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeed.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
index 7ab89057a8c..2b99efa318d 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
index 21963a91e2e..2dd6f136f17 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
@@ -40,6 +40,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
index ca1cef20f08..cd69f1a10b8 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getLikes.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getLikes.ts
index 275d99bba3d..b035c2ea609 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getLikes.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getLikes.ts
@@ -48,6 +48,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getListFeed.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getListFeed.ts
index 84e12deaa92..0720feb5b6b 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getListFeed.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getListFeed.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getPostThread.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getPostThread.ts
index 768977193ef..918faddfc1d 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getPostThread.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getPostThread.ts
@@ -51,6 +51,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getPosts.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getPosts.ts
index 85000c74787..b7048083583 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getPosts.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getPosts.ts
@@ -41,6 +41,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getQuotes.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getQuotes.ts
index 38d04ad88c1..23c7dd831f0 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getQuotes.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getQuotes.ts
@@ -48,6 +48,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getRepostedBy.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
index 40e008815d9..efae1c0b14f 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
@@ -48,6 +48,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
index d1ec590f33d..c660e995f9f 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getTimeline.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getTimeline.ts
index 5202c9eb6e3..f9cd3d702c5 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getTimeline.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getTimeline.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/searchPosts.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/searchPosts.ts
index 14efa5276f8..68e0b729b53 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/searchPosts.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/searchPosts.ts
@@ -66,6 +66,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/sendInteractions.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/sendInteractions.ts
index c22fc1cb2fb..b0280ad8028 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/sendInteractions.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/sendInteractions.ts
@@ -43,6 +43,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
index 10250d0f3b4..352c542990f 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
@@ -43,6 +43,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getBlocks.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getBlocks.ts
index 1fc9cd8ce37..1fdd49c6831 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getBlocks.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getBlocks.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getFollowers.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getFollowers.ts
index f5645eaef29..1f348e97d20 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getFollowers.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getFollowers.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getFollows.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getFollows.ts
index b9bd249da45..a9664991c88 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getFollows.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getFollows.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
index f5645eaef29..1f348e97d20 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getList.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getList.ts
index 864a81b3833..a8408edd622 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getList.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getList.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getListBlocks.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getListBlocks.ts
index 7399a14fadc..728892f4379 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getListBlocks.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getListBlocks.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getListMutes.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getListMutes.ts
index 7399a14fadc..728892f4379 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getListMutes.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getListMutes.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getLists.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getLists.ts
index dc0c4f18bea..0ed8abc586e 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getLists.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getLists.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getMutes.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getMutes.ts
index f450393522d..45c7966644e 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getMutes.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getMutes.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getRelationships.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getRelationships.ts
index bd6b6e765ed..677c8815d43 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getRelationships.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getRelationships.ts
@@ -49,6 +49,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPack.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPack.ts
index 93fe21f0b13..bbf8a537da0 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPack.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPack.ts
@@ -41,6 +41,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPacks.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
index 4b9757b941e..1ea054400b3 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
@@ -40,6 +40,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
index be577ecab54..8736dc71b45 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/muteActor.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/muteActor.ts
index baa9844046a..7d0057721d6 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/muteActor.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/muteActor.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/muteActorList.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/muteActorList.ts
index 6a68f680a1c..1d80ac0d3db 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/muteActorList.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/muteActorList.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/muteThread.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/muteThread.ts
index 928c56b6fc3..659ced88112 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/muteThread.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/muteThread.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
index dea496aa50f..70bc184bb43 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActor.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActor.ts
index baa9844046a..7d0057721d6 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActor.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActor.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActorList.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
index 6a68f680a1c..1d80ac0d3db 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteThread.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteThread.ts
index 928c56b6fc3..659ced88112 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteThread.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteThread.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/labeler/getServices.ts b/packages/bsky/src/lexicon/types/app/bsky/labeler/getServices.ts
index faeb30b4798..e1d318b6177 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/labeler/getServices.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/labeler/getServices.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/notification/getUnreadCount.ts b/packages/bsky/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
index 3931e24d3f0..d2cff779da4 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
@@ -40,6 +40,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/notification/listNotifications.ts b/packages/bsky/src/lexicon/types/app/bsky/notification/listNotifications.ts
index 88fe90a0518..69d05288acb 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/notification/listNotifications.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/notification/listNotifications.ts
@@ -49,6 +49,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/notification/putPreferences.ts b/packages/bsky/src/lexicon/types/app/bsky/notification/putPreferences.ts
index 2c3a9d6fdbb..2271b658cb2 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/notification/putPreferences.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/notification/putPreferences.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/notification/registerPush.ts b/packages/bsky/src/lexicon/types/app/bsky/notification/registerPush.ts
index cce8f95839d..c4ca7104764 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/notification/registerPush.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/notification/registerPush.ts
@@ -35,6 +35,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/notification/updateSeen.ts b/packages/bsky/src/lexicon/types/app/bsky/notification/updateSeen.ts
index 93db017a152..690e68dbeeb 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/notification/updateSeen.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/notification/updateSeen.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getConfig.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getConfig.ts
index da202ab0d54..e922e1f10df 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getConfig.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getConfig.ts
@@ -37,6 +37,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
index 02f19f3cc6a..56ecba098be 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
@@ -43,6 +43,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
index a89065ffcde..4b68e768e20 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
@@ -50,6 +50,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
index a03f442140d..7febcd64994 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
@@ -37,6 +37,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
index 51b78652a74..469ecd63b79 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
@@ -43,6 +43,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
index 94295f45349..0cb2c5e0b9c 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
@@ -52,6 +52,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
index cd293454902..00318176398 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
@@ -68,6 +68,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
index e980d884fec..d488cb43fed 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
@@ -50,6 +50,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/video/getJobStatus.ts b/packages/bsky/src/lexicon/types/app/bsky/video/getJobStatus.ts
index 3e075ba2195..846dbf5e0b5 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/video/getJobStatus.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/video/getJobStatus.ts
@@ -40,6 +40,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/video/getUploadLimits.ts b/packages/bsky/src/lexicon/types/app/bsky/video/getUploadLimits.ts
index f0f23003b0b..d1930430c9d 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/video/getUploadLimits.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/video/getUploadLimits.ts
@@ -41,6 +41,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/app/bsky/video/uploadVideo.ts b/packages/bsky/src/lexicon/types/app/bsky/video/uploadVideo.ts
index c23ff677a4b..99291559507 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/video/uploadVideo.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/video/uploadVideo.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/actor/deleteAccount.ts b/packages/bsky/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
index 08714990fcb..1ae84f6c7cc 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
@@ -36,6 +36,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/actor/exportAccountData.ts b/packages/bsky/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
index f6f38ab2fb3..363a8c68b97 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
index c05bc99b36a..2a70c63df4f 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvo.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvo.ts
index 1448c75b306..e6d1a651280 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvo.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvo.ts
@@ -40,6 +40,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
index 108dfd6ad5b..0062e2230e6 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
@@ -40,6 +40,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/getLog.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/getLog.ts
index 89f6778c4d3..2d1354f09bd 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/getLog.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/getLog.ts
@@ -47,6 +47,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/getMessages.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/getMessages.ts
index a615ba37674..689dd4539dd 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/getMessages.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/getMessages.ts
@@ -47,6 +47,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/leaveConvo.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
index 8b76a7b0c75..99af5702e29 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/listConvos.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/listConvos.ts
index 4d6f35bf39c..5e9a3dad264 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/listConvos.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/listConvos.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/muteConvo.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/muteConvo.ts
index ddb57623913..4d39442ff86 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/muteConvo.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/muteConvo.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessage.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessage.ts
index ab2d8b03f89..94acb7f018d 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessage.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessage.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
index b3c2c2bc252..29556e52e7a 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
index ddb57623913..4d39442ff86 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/updateRead.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/updateRead.ts
index b879cde82b0..6aa23309332 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/updateRead.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/updateRead.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts b/packages/bsky/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
index 077a0076bab..f99260a1b85 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
@@ -41,6 +41,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts b/packages/bsky/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
index 0a1f5b1b691..39489eb7c12 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
@@ -48,6 +48,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts b/packages/bsky/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
index d9c95f69643..17324495c1c 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
@@ -34,6 +34,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/deleteAccount.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/deleteAccount.ts
index 003c1b5ebcd..1b0223ea303 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/deleteAccount.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/deleteAccount.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
index 68c6503d95e..d8f8ecad320 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
@@ -34,6 +34,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
index 2bf8de35583..75a9fb472a5 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
@@ -33,6 +33,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
index 3f2836e7142..b072ad7ec56 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
@@ -34,6 +34,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfo.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
index c7b840a153d..acea7749774 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
@@ -35,6 +35,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfos.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
index 99ef44a99f5..7d9fa3fdcbf 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
@@ -40,6 +40,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/getInviteCodes.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
index d68b97d775a..9619d5e4b5b 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
@@ -43,6 +43,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
index c13496638c8..3aff3e6f322 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
@@ -49,6 +49,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/searchAccounts.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/searchAccounts.ts
index 80d0eecd926..96b26867f41 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/searchAccounts.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/searchAccounts.ts
@@ -43,6 +43,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/sendEmail.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/sendEmail.ts
index 836fba39f79..5c8bebe791d 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/sendEmail.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/sendEmail.ts
@@ -48,6 +48,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
index ebabffbccdb..e3ea26f7298 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
@@ -34,6 +34,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
index d6dc4a2dc25..87d861faef5 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
@@ -33,6 +33,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
index 948568f0d3d..b6aef601e13 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
@@ -33,6 +33,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
index c03d9667cae..ae48689cb4f 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
@@ -56,6 +56,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts b/packages/bsky/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
index 5fa374de737..33bd5f6fa05 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
@@ -41,6 +41,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts b/packages/bsky/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
index 82672f1d1c7..7620d0abb69 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
@@ -25,6 +25,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/identity/resolveHandle.ts b/packages/bsky/src/lexicon/types/com/atproto/identity/resolveHandle.ts
index 05019df6166..e319fbfbadb 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/identity/resolveHandle.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/resolveHandle.ts
@@ -40,6 +40,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/identity/signPlcOperation.ts b/packages/bsky/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
index 3c908c049f2..9b0cb540b8e 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
@@ -49,6 +49,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts b/packages/bsky/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
index 5290b55d023..9b85d7dcb2f 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/identity/updateHandle.ts b/packages/bsky/src/lexicon/types/com/atproto/identity/updateHandle.ts
index f451d1f57c7..8a271d80264 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/identity/updateHandle.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/updateHandle.ts
@@ -33,6 +33,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/label/queryLabels.ts b/packages/bsky/src/lexicon/types/com/atproto/label/queryLabels.ts
index 0c9d55a6961..9873f6914b4 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/label/queryLabels.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/label/queryLabels.ts
@@ -46,6 +46,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/moderation/createReport.ts b/packages/bsky/src/lexicon/types/com/atproto/moderation/createReport.ts
index aa3f810a91c..dc7985c7685 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/moderation/createReport.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/moderation/createReport.ts
@@ -60,6 +60,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/applyWrites.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/applyWrites.ts
index 4e3c8dcef3d..a58fcc0a56b 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/applyWrites.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/applyWrites.ts
@@ -52,6 +52,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/createRecord.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/createRecord.ts
index 5cac0848bf1..0982f49bf3d 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/createRecord.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/createRecord.ts
@@ -59,6 +59,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/deleteRecord.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/deleteRecord.ts
index e594cd00adf..c86ab7ba47a 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/deleteRecord.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/deleteRecord.ts
@@ -54,6 +54,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/describeRepo.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/describeRepo.ts
index 749bedcfeb7..5b187f3758c 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/describeRepo.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/describeRepo.ts
@@ -47,6 +47,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/getRecord.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/getRecord.ts
index 9d03da19530..96ce9ee551f 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/getRecord.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/getRecord.ts
@@ -49,6 +49,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/importRepo.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/importRepo.ts
index 59288c7a027..685918f455f 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/importRepo.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/importRepo.ts
@@ -30,6 +30,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
index 40f4d385e47..f1be00d8e87 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
@@ -41,6 +41,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/listRecords.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/listRecords.ts
index f46f6eb0f7f..e328cfbb204 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/listRecords.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/listRecords.ts
@@ -52,6 +52,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/putRecord.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/putRecord.ts
index 5cde768d7c2..269244ede91 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/putRecord.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/putRecord.ts
@@ -61,6 +61,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/uploadBlob.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/uploadBlob.ts
index 4a712346a0b..7595e7295e6 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/uploadBlob.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/uploadBlob.ts
@@ -41,6 +41,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/activateAccount.ts b/packages/bsky/src/lexicon/types/com/atproto/server/activateAccount.ts
index 82672f1d1c7..7620d0abb69 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/activateAccount.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/activateAccount.ts
@@ -25,6 +25,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/checkAccountStatus.ts b/packages/bsky/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
index f17182a8dce..2ad98689303 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/confirmEmail.ts b/packages/bsky/src/lexicon/types/com/atproto/server/confirmEmail.ts
index b667a04b996..d6338b80fc5 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/confirmEmail.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/confirmEmail.ts
@@ -34,6 +34,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/createAccount.ts b/packages/bsky/src/lexicon/types/com/atproto/server/createAccount.ts
index 6e9b2f9f3c2..a85c83edffc 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/createAccount.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/createAccount.ts
@@ -71,6 +71,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/createAppPassword.ts b/packages/bsky/src/lexicon/types/com/atproto/server/createAppPassword.ts
index 00657a2058f..65ad1d4b4cb 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/createAppPassword.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/createAppPassword.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCode.ts b/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCode.ts
index 9cfeacc7e28..82daf7eea6f 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCode.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCode.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCodes.ts b/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCodes.ts
index eb6cd2bb1b1..fa2c1f73c2a 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCodes.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCodes.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/createSession.ts b/packages/bsky/src/lexicon/types/com/atproto/server/createSession.ts
index 4ed0ae70fb1..47ffaaaa0bd 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/createSession.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/createSession.ts
@@ -59,6 +59,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/deactivateAccount.ts b/packages/bsky/src/lexicon/types/com/atproto/server/deactivateAccount.ts
index b3793d6b2e0..56b86424e61 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/deactivateAccount.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/deactivateAccount.ts
@@ -33,6 +33,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/deleteAccount.ts b/packages/bsky/src/lexicon/types/com/atproto/server/deleteAccount.ts
index 4fcec360a11..93b7b78a0e5 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/deleteAccount.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/deleteAccount.ts
@@ -35,6 +35,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/deleteSession.ts b/packages/bsky/src/lexicon/types/com/atproto/server/deleteSession.ts
index 82672f1d1c7..7620d0abb69 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/deleteSession.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/deleteSession.ts
@@ -25,6 +25,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/describeServer.ts b/packages/bsky/src/lexicon/types/com/atproto/server/describeServer.ts
index e21868158b3..6964a59ffdf 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/describeServer.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/describeServer.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts b/packages/bsky/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
index 82c3ffa8c31..1cdf1299961 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
@@ -43,6 +43,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/getServiceAuth.ts b/packages/bsky/src/lexicon/types/com/atproto/server/getServiceAuth.ts
index 14f249fde44..1e9d1398be7 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/getServiceAuth.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/getServiceAuth.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/getSession.ts b/packages/bsky/src/lexicon/types/com/atproto/server/getSession.ts
index be34cb92afd..cafa6bc7452 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/getSession.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/getSession.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/listAppPasswords.ts b/packages/bsky/src/lexicon/types/com/atproto/server/listAppPasswords.ts
index 397e7043e67..99219e67f7f 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/listAppPasswords.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/listAppPasswords.ts
@@ -38,6 +38,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/refreshSession.ts b/packages/bsky/src/lexicon/types/com/atproto/server/refreshSession.ts
index 1d6272a0d71..59e8f9d5a32 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/refreshSession.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/refreshSession.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/requestAccountDelete.ts b/packages/bsky/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
index 82672f1d1c7..7620d0abb69 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
@@ -25,6 +25,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts b/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
index 82672f1d1c7..7620d0abb69 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
@@ -25,6 +25,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts b/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
index 24dce3e12af..87b9a094ccc 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
@@ -37,6 +37,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/requestPasswordReset.ts b/packages/bsky/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
index d0f3f2ad769..ae541342aff 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/reserveSigningKey.ts b/packages/bsky/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
index 0ec1e80c77c..72850ce061b 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/resetPassword.ts b/packages/bsky/src/lexicon/types/com/atproto/server/resetPassword.ts
index 38f63382cf0..4b5b8ea1ecc 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/resetPassword.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/resetPassword.ts
@@ -34,6 +34,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/revokeAppPassword.ts b/packages/bsky/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
index 769ad6aa521..80131f8c9e3 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/updateEmail.ts b/packages/bsky/src/lexicon/types/com/atproto/server/updateEmail.ts
index 34fc7421979..a80982da4f8 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/updateEmail.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/updateEmail.ts
@@ -36,6 +36,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getBlob.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getBlob.ts
index b1581d6e473..659c71c1a8d 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getBlob.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getBlob.ts
@@ -43,6 +43,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getBlocks.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getBlocks.ts
index 925b4a7d50b..7fef8b7f64d 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getBlocks.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getBlocks.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getCheckout.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getCheckout.ts
index 51856b9088d..3d519f6916d 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getCheckout.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getCheckout.ts
@@ -35,6 +35,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getHead.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getHead.ts
index adedd4cf211..d9bb230cef5 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getHead.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getHead.ts
@@ -41,6 +41,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getLatestCommit.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
index f0e9a757d04..6041841e311 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getRecord.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getRecord.ts
index 83d88655228..afbd779faf1 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getRecord.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getRecord.ts
@@ -46,6 +46,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getRepo.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getRepo.ts
index 883ff37def1..62a86f56a38 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getRepo.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getRepo.ts
@@ -38,6 +38,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getRepoStatus.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
index 00abbeaa84b..743bcc45767 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
@@ -46,6 +46,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/listBlobs.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/listBlobs.ts
index c6ea955ee0c..abb1719f41b 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/listBlobs.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/listBlobs.ts
@@ -46,6 +46,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/listRepos.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/listRepos.ts
index 5628b0b5147..228d6a004b5 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/listRepos.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/listRepos.ts
@@ -41,6 +41,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
index 8a0af577c7c..b2d2e6b2e48 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
@@ -33,6 +33,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/requestCrawl.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/requestCrawl.ts
index 31180aabf58..fd54e157b7b 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/requestCrawl.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/requestCrawl.ts
@@ -33,6 +33,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/temp/addReservedHandle.ts b/packages/bsky/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
index b884cb08998..69be85f72df 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts b/packages/bsky/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
index 9486bce2b2b..9c7ef1ae6ab 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
@@ -39,6 +39,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/temp/fetchLabels.ts b/packages/bsky/src/lexicon/types/com/atproto/temp/fetchLabels.ts
index 0fbdeed1196..0392ba06ea2 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/temp/fetchLabels.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/temp/fetchLabels.ts
@@ -41,6 +41,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/bsky/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts b/packages/bsky/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
index c977500fc33..8ebee2ad46d 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/getPreferences.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/getPreferences.ts
index 305e80484be..f839ece0a4d 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/getPreferences.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/getPreferences.ts
@@ -38,6 +38,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/getProfile.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/getProfile.ts
index 5a7b1f25bfc..f9163fcf168 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/getProfile.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/getProfile.ts
@@ -36,6 +36,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/getProfiles.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/getProfiles.ts
index 16438505654..5c2ffb1f2cc 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/getProfiles.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/getProfiles.ts
@@ -40,6 +40,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/getSuggestions.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/getSuggestions.ts
index 6ecd43f1283..c7e254261a1 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/getSuggestions.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/getSuggestions.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/putPreferences.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/putPreferences.ts
index 670e752fea3..59aea81c2da 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/putPreferences.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/putPreferences.ts
@@ -33,6 +33,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/searchActors.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/searchActors.ts
index dcda0c41854..ebd81ececc5 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/searchActors.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/searchActors.ts
@@ -46,6 +46,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
index 0198b23d790..b7e9831b21d 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
index 5bf8699a3ca..0a7d253ce8f 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
@@ -39,6 +39,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getActorFeeds.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
index 0b8afff4ec8..6af507c6e03 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
@@ -43,6 +43,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getActorLikes.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getActorLikes.ts
index da315ae33c7..daf5060c8d2 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getActorLikes.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getActorLikes.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
index 70c2c439d2a..2a14f45d6da 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
@@ -53,6 +53,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeed.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeed.ts
index e03913a6fb3..5014c102155 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeed.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeed.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
index 7ab89057a8c..2b99efa318d 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
index 21963a91e2e..2dd6f136f17 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
@@ -40,6 +40,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
index ca1cef20f08..cd69f1a10b8 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getLikes.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getLikes.ts
index 275d99bba3d..b035c2ea609 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getLikes.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getLikes.ts
@@ -48,6 +48,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getListFeed.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getListFeed.ts
index 84e12deaa92..0720feb5b6b 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getListFeed.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getListFeed.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getPostThread.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getPostThread.ts
index 768977193ef..918faddfc1d 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getPostThread.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getPostThread.ts
@@ -51,6 +51,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getPosts.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getPosts.ts
index 85000c74787..b7048083583 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getPosts.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getPosts.ts
@@ -41,6 +41,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getQuotes.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getQuotes.ts
index 38d04ad88c1..23c7dd831f0 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getQuotes.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getQuotes.ts
@@ -48,6 +48,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getRepostedBy.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
index 40e008815d9..efae1c0b14f 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
@@ -48,6 +48,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
index d1ec590f33d..c660e995f9f 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getTimeline.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getTimeline.ts
index 5202c9eb6e3..f9cd3d702c5 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getTimeline.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getTimeline.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/searchPosts.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/searchPosts.ts
index 14efa5276f8..68e0b729b53 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/searchPosts.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/searchPosts.ts
@@ -66,6 +66,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/sendInteractions.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/sendInteractions.ts
index c22fc1cb2fb..b0280ad8028 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/sendInteractions.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/sendInteractions.ts
@@ -43,6 +43,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
index 10250d0f3b4..352c542990f 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
@@ -43,6 +43,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getBlocks.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getBlocks.ts
index 1fc9cd8ce37..1fdd49c6831 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getBlocks.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getBlocks.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getFollowers.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getFollowers.ts
index f5645eaef29..1f348e97d20 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getFollowers.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getFollowers.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getFollows.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getFollows.ts
index b9bd249da45..a9664991c88 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getFollows.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getFollows.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
index f5645eaef29..1f348e97d20 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getList.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getList.ts
index 864a81b3833..a8408edd622 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getList.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getList.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getListBlocks.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getListBlocks.ts
index 7399a14fadc..728892f4379 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getListBlocks.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getListBlocks.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getListMutes.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getListMutes.ts
index 7399a14fadc..728892f4379 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getListMutes.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getListMutes.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getLists.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getLists.ts
index dc0c4f18bea..0ed8abc586e 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getLists.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getLists.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getMutes.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getMutes.ts
index f450393522d..45c7966644e 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getMutes.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getMutes.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getRelationships.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getRelationships.ts
index bd6b6e765ed..677c8815d43 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getRelationships.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getRelationships.ts
@@ -49,6 +49,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPack.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPack.ts
index 93fe21f0b13..bbf8a537da0 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPack.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPack.ts
@@ -41,6 +41,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPacks.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
index 4b9757b941e..1ea054400b3 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
@@ -40,6 +40,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
index be577ecab54..8736dc71b45 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/muteActor.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/muteActor.ts
index baa9844046a..7d0057721d6 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/muteActor.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/muteActor.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/muteActorList.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/muteActorList.ts
index 6a68f680a1c..1d80ac0d3db 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/muteActorList.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/muteActorList.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/muteThread.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/muteThread.ts
index 928c56b6fc3..659ced88112 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/muteThread.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/muteThread.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
index dea496aa50f..70bc184bb43 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActor.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActor.ts
index baa9844046a..7d0057721d6 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActor.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActor.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActorList.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
index 6a68f680a1c..1d80ac0d3db 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteThread.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteThread.ts
index 928c56b6fc3..659ced88112 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteThread.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteThread.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/labeler/getServices.ts b/packages/ozone/src/lexicon/types/app/bsky/labeler/getServices.ts
index faeb30b4798..e1d318b6177 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/labeler/getServices.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/labeler/getServices.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/notification/getUnreadCount.ts b/packages/ozone/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
index 3931e24d3f0..d2cff779da4 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
@@ -40,6 +40,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/notification/listNotifications.ts b/packages/ozone/src/lexicon/types/app/bsky/notification/listNotifications.ts
index 88fe90a0518..69d05288acb 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/notification/listNotifications.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/notification/listNotifications.ts
@@ -49,6 +49,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/notification/putPreferences.ts b/packages/ozone/src/lexicon/types/app/bsky/notification/putPreferences.ts
index 2c3a9d6fdbb..2271b658cb2 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/notification/putPreferences.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/notification/putPreferences.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/notification/registerPush.ts b/packages/ozone/src/lexicon/types/app/bsky/notification/registerPush.ts
index cce8f95839d..c4ca7104764 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/notification/registerPush.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/notification/registerPush.ts
@@ -35,6 +35,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/notification/updateSeen.ts b/packages/ozone/src/lexicon/types/app/bsky/notification/updateSeen.ts
index 93db017a152..690e68dbeeb 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/notification/updateSeen.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/notification/updateSeen.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getConfig.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getConfig.ts
index da202ab0d54..e922e1f10df 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getConfig.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getConfig.ts
@@ -37,6 +37,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
index 02f19f3cc6a..56ecba098be 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
@@ -43,6 +43,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
index a89065ffcde..4b68e768e20 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
@@ -50,6 +50,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
index a03f442140d..7febcd64994 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
@@ -37,6 +37,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
index 51b78652a74..469ecd63b79 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
@@ -43,6 +43,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
index 94295f45349..0cb2c5e0b9c 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
@@ -52,6 +52,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
index cd293454902..00318176398 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
@@ -68,6 +68,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
index e980d884fec..d488cb43fed 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
@@ -50,6 +50,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/video/getJobStatus.ts b/packages/ozone/src/lexicon/types/app/bsky/video/getJobStatus.ts
index 3e075ba2195..846dbf5e0b5 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/video/getJobStatus.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/video/getJobStatus.ts
@@ -40,6 +40,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/video/getUploadLimits.ts b/packages/ozone/src/lexicon/types/app/bsky/video/getUploadLimits.ts
index f0f23003b0b..d1930430c9d 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/video/getUploadLimits.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/video/getUploadLimits.ts
@@ -41,6 +41,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/app/bsky/video/uploadVideo.ts b/packages/ozone/src/lexicon/types/app/bsky/video/uploadVideo.ts
index c23ff677a4b..99291559507 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/video/uploadVideo.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/video/uploadVideo.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/actor/deleteAccount.ts b/packages/ozone/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
index 08714990fcb..1ae84f6c7cc 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
@@ -36,6 +36,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/actor/exportAccountData.ts b/packages/ozone/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
index f6f38ab2fb3..363a8c68b97 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
index c05bc99b36a..2a70c63df4f 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvo.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvo.ts
index 1448c75b306..e6d1a651280 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvo.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvo.ts
@@ -40,6 +40,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
index 108dfd6ad5b..0062e2230e6 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
@@ -40,6 +40,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/getLog.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/getLog.ts
index 89f6778c4d3..2d1354f09bd 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/getLog.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/getLog.ts
@@ -47,6 +47,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/getMessages.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/getMessages.ts
index a615ba37674..689dd4539dd 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/getMessages.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/getMessages.ts
@@ -47,6 +47,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/leaveConvo.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
index 8b76a7b0c75..99af5702e29 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/listConvos.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/listConvos.ts
index 4d6f35bf39c..5e9a3dad264 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/listConvos.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/listConvos.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/muteConvo.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/muteConvo.ts
index ddb57623913..4d39442ff86 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/muteConvo.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/muteConvo.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessage.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessage.ts
index ab2d8b03f89..94acb7f018d 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessage.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessage.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
index b3c2c2bc252..29556e52e7a 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
index ddb57623913..4d39442ff86 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/updateRead.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/updateRead.ts
index b879cde82b0..6aa23309332 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/updateRead.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/updateRead.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts b/packages/ozone/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
index 077a0076bab..f99260a1b85 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
@@ -41,6 +41,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts b/packages/ozone/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
index 0a1f5b1b691..39489eb7c12 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
@@ -48,6 +48,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts b/packages/ozone/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
index d9c95f69643..17324495c1c 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
@@ -34,6 +34,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/deleteAccount.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/deleteAccount.ts
index 003c1b5ebcd..1b0223ea303 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/deleteAccount.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/deleteAccount.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
index 68c6503d95e..d8f8ecad320 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
@@ -34,6 +34,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
index 2bf8de35583..75a9fb472a5 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
@@ -33,6 +33,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
index 3f2836e7142..b072ad7ec56 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
@@ -34,6 +34,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfo.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
index c7b840a153d..acea7749774 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
@@ -35,6 +35,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfos.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
index 99ef44a99f5..7d9fa3fdcbf 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
@@ -40,6 +40,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/getInviteCodes.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
index d68b97d775a..9619d5e4b5b 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
@@ -43,6 +43,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
index c13496638c8..3aff3e6f322 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
@@ -49,6 +49,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/searchAccounts.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/searchAccounts.ts
index 80d0eecd926..96b26867f41 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/searchAccounts.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/searchAccounts.ts
@@ -43,6 +43,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/sendEmail.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/sendEmail.ts
index 836fba39f79..5c8bebe791d 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/sendEmail.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/sendEmail.ts
@@ -48,6 +48,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
index ebabffbccdb..e3ea26f7298 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
@@ -34,6 +34,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
index d6dc4a2dc25..87d861faef5 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
@@ -33,6 +33,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
index 948568f0d3d..b6aef601e13 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
@@ -33,6 +33,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
index c03d9667cae..ae48689cb4f 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
@@ -56,6 +56,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts b/packages/ozone/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
index 5fa374de737..33bd5f6fa05 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
@@ -41,6 +41,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts b/packages/ozone/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
index 82672f1d1c7..7620d0abb69 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
@@ -25,6 +25,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/identity/resolveHandle.ts b/packages/ozone/src/lexicon/types/com/atproto/identity/resolveHandle.ts
index 05019df6166..e319fbfbadb 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/identity/resolveHandle.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/resolveHandle.ts
@@ -40,6 +40,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/identity/signPlcOperation.ts b/packages/ozone/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
index 3c908c049f2..9b0cb540b8e 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
@@ -49,6 +49,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts b/packages/ozone/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
index 5290b55d023..9b85d7dcb2f 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/identity/updateHandle.ts b/packages/ozone/src/lexicon/types/com/atproto/identity/updateHandle.ts
index f451d1f57c7..8a271d80264 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/identity/updateHandle.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/updateHandle.ts
@@ -33,6 +33,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/label/queryLabels.ts b/packages/ozone/src/lexicon/types/com/atproto/label/queryLabels.ts
index 0c9d55a6961..9873f6914b4 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/label/queryLabels.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/label/queryLabels.ts
@@ -46,6 +46,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/moderation/createReport.ts b/packages/ozone/src/lexicon/types/com/atproto/moderation/createReport.ts
index aa3f810a91c..dc7985c7685 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/moderation/createReport.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/moderation/createReport.ts
@@ -60,6 +60,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/applyWrites.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/applyWrites.ts
index 4e3c8dcef3d..a58fcc0a56b 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/applyWrites.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/applyWrites.ts
@@ -52,6 +52,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/createRecord.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/createRecord.ts
index 5cac0848bf1..0982f49bf3d 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/createRecord.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/createRecord.ts
@@ -59,6 +59,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/deleteRecord.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/deleteRecord.ts
index e594cd00adf..c86ab7ba47a 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/deleteRecord.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/deleteRecord.ts
@@ -54,6 +54,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/describeRepo.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/describeRepo.ts
index 749bedcfeb7..5b187f3758c 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/describeRepo.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/describeRepo.ts
@@ -47,6 +47,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/getRecord.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/getRecord.ts
index 9d03da19530..96ce9ee551f 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/getRecord.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/getRecord.ts
@@ -49,6 +49,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/importRepo.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/importRepo.ts
index 59288c7a027..685918f455f 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/importRepo.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/importRepo.ts
@@ -30,6 +30,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
index 40f4d385e47..f1be00d8e87 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
@@ -41,6 +41,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/listRecords.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/listRecords.ts
index f46f6eb0f7f..e328cfbb204 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/listRecords.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/listRecords.ts
@@ -52,6 +52,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/putRecord.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/putRecord.ts
index 5cde768d7c2..269244ede91 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/putRecord.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/putRecord.ts
@@ -61,6 +61,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/uploadBlob.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/uploadBlob.ts
index 4a712346a0b..7595e7295e6 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/uploadBlob.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/uploadBlob.ts
@@ -41,6 +41,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/activateAccount.ts b/packages/ozone/src/lexicon/types/com/atproto/server/activateAccount.ts
index 82672f1d1c7..7620d0abb69 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/activateAccount.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/activateAccount.ts
@@ -25,6 +25,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/checkAccountStatus.ts b/packages/ozone/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
index f17182a8dce..2ad98689303 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/confirmEmail.ts b/packages/ozone/src/lexicon/types/com/atproto/server/confirmEmail.ts
index b667a04b996..d6338b80fc5 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/confirmEmail.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/confirmEmail.ts
@@ -34,6 +34,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/createAccount.ts b/packages/ozone/src/lexicon/types/com/atproto/server/createAccount.ts
index 6e9b2f9f3c2..a85c83edffc 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/createAccount.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/createAccount.ts
@@ -71,6 +71,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/createAppPassword.ts b/packages/ozone/src/lexicon/types/com/atproto/server/createAppPassword.ts
index 00657a2058f..65ad1d4b4cb 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/createAppPassword.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/createAppPassword.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCode.ts b/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCode.ts
index 9cfeacc7e28..82daf7eea6f 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCode.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCode.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCodes.ts b/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCodes.ts
index eb6cd2bb1b1..fa2c1f73c2a 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCodes.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCodes.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/createSession.ts b/packages/ozone/src/lexicon/types/com/atproto/server/createSession.ts
index 4ed0ae70fb1..47ffaaaa0bd 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/createSession.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/createSession.ts
@@ -59,6 +59,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/deactivateAccount.ts b/packages/ozone/src/lexicon/types/com/atproto/server/deactivateAccount.ts
index b3793d6b2e0..56b86424e61 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/deactivateAccount.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/deactivateAccount.ts
@@ -33,6 +33,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/deleteAccount.ts b/packages/ozone/src/lexicon/types/com/atproto/server/deleteAccount.ts
index 4fcec360a11..93b7b78a0e5 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/deleteAccount.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/deleteAccount.ts
@@ -35,6 +35,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/deleteSession.ts b/packages/ozone/src/lexicon/types/com/atproto/server/deleteSession.ts
index 82672f1d1c7..7620d0abb69 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/deleteSession.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/deleteSession.ts
@@ -25,6 +25,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/describeServer.ts b/packages/ozone/src/lexicon/types/com/atproto/server/describeServer.ts
index e21868158b3..6964a59ffdf 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/describeServer.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/describeServer.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts b/packages/ozone/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
index 82c3ffa8c31..1cdf1299961 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
@@ -43,6 +43,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/getServiceAuth.ts b/packages/ozone/src/lexicon/types/com/atproto/server/getServiceAuth.ts
index 14f249fde44..1e9d1398be7 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/getServiceAuth.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/getServiceAuth.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/getSession.ts b/packages/ozone/src/lexicon/types/com/atproto/server/getSession.ts
index be34cb92afd..cafa6bc7452 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/getSession.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/getSession.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/listAppPasswords.ts b/packages/ozone/src/lexicon/types/com/atproto/server/listAppPasswords.ts
index 397e7043e67..99219e67f7f 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/listAppPasswords.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/listAppPasswords.ts
@@ -38,6 +38,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/refreshSession.ts b/packages/ozone/src/lexicon/types/com/atproto/server/refreshSession.ts
index 1d6272a0d71..59e8f9d5a32 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/refreshSession.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/refreshSession.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/requestAccountDelete.ts b/packages/ozone/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
index 82672f1d1c7..7620d0abb69 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
@@ -25,6 +25,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts b/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
index 82672f1d1c7..7620d0abb69 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
@@ -25,6 +25,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts b/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
index 24dce3e12af..87b9a094ccc 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
@@ -37,6 +37,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/requestPasswordReset.ts b/packages/ozone/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
index d0f3f2ad769..ae541342aff 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/reserveSigningKey.ts b/packages/ozone/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
index 0ec1e80c77c..72850ce061b 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/resetPassword.ts b/packages/ozone/src/lexicon/types/com/atproto/server/resetPassword.ts
index 38f63382cf0..4b5b8ea1ecc 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/resetPassword.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/resetPassword.ts
@@ -34,6 +34,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/revokeAppPassword.ts b/packages/ozone/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
index 769ad6aa521..80131f8c9e3 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/updateEmail.ts b/packages/ozone/src/lexicon/types/com/atproto/server/updateEmail.ts
index 34fc7421979..a80982da4f8 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/updateEmail.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/updateEmail.ts
@@ -36,6 +36,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getBlob.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getBlob.ts
index b1581d6e473..659c71c1a8d 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getBlob.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getBlob.ts
@@ -43,6 +43,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getBlocks.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getBlocks.ts
index 925b4a7d50b..7fef8b7f64d 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getBlocks.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getBlocks.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getCheckout.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getCheckout.ts
index 51856b9088d..3d519f6916d 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getCheckout.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getCheckout.ts
@@ -35,6 +35,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getHead.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getHead.ts
index adedd4cf211..d9bb230cef5 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getHead.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getHead.ts
@@ -41,6 +41,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getLatestCommit.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
index f0e9a757d04..6041841e311 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getRecord.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getRecord.ts
index 83d88655228..afbd779faf1 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getRecord.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getRecord.ts
@@ -46,6 +46,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getRepo.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getRepo.ts
index 883ff37def1..62a86f56a38 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getRepo.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getRepo.ts
@@ -38,6 +38,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getRepoStatus.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
index 00abbeaa84b..743bcc45767 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
@@ -46,6 +46,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/listBlobs.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/listBlobs.ts
index c6ea955ee0c..abb1719f41b 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/listBlobs.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/listBlobs.ts
@@ -46,6 +46,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/listRepos.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/listRepos.ts
index 5628b0b5147..228d6a004b5 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/listRepos.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/listRepos.ts
@@ -41,6 +41,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
index 8a0af577c7c..b2d2e6b2e48 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
@@ -33,6 +33,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/requestCrawl.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/requestCrawl.ts
index 31180aabf58..fd54e157b7b 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/requestCrawl.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/requestCrawl.ts
@@ -33,6 +33,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/temp/addReservedHandle.ts b/packages/ozone/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
index b884cb08998..69be85f72df 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts b/packages/ozone/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
index 9486bce2b2b..9c7ef1ae6ab 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
@@ -39,6 +39,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/temp/fetchLabels.ts b/packages/ozone/src/lexicon/types/com/atproto/temp/fetchLabels.ts
index 0fbdeed1196..0392ba06ea2 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/temp/fetchLabels.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/temp/fetchLabels.ts
@@ -41,6 +41,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts b/packages/ozone/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
index c977500fc33..8ebee2ad46d 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/communication/createTemplate.ts b/packages/ozone/src/lexicon/types/tools/ozone/communication/createTemplate.ts
index 6d29f93bdba..49d46cc6299 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/communication/createTemplate.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/communication/createTemplate.ts
@@ -51,6 +51,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts b/packages/ozone/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts
index c5ae5cd469f..d773d84d8e6 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/communication/listTemplates.ts b/packages/ozone/src/lexicon/types/tools/ozone/communication/listTemplates.ts
index 4573ac7bbb9..aa2738f5ca2 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/communication/listTemplates.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/communication/listTemplates.ts
@@ -38,6 +38,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/communication/updateTemplate.ts b/packages/ozone/src/lexicon/types/tools/ozone/communication/updateTemplate.ts
index f8c5817b4d9..9f9c532e136 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/communication/updateTemplate.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/communication/updateTemplate.ts
@@ -54,6 +54,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/emitEvent.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
index 1399cf589ee..d409858ec7b 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
@@ -68,6 +68,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getEvent.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getEvent.ts
index b583510a791..c7e1b5943f3 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getEvent.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getEvent.ts
@@ -35,6 +35,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecord.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecord.ts
index a3832cd161c..67eca72d05f 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecord.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecord.ts
@@ -37,6 +37,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecords.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecords.ts
index 2559727bd65..46e11ef48e3 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecords.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecords.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepo.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepo.ts
index 853d6460e85..ff675e577dc 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepo.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepo.ts
@@ -36,6 +36,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepos.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepos.ts
index 71da4d1bac9..f113ef4395c 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepos.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepos.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryEvents.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryEvents.ts
index 51003984889..c29249690d4 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryEvents.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryEvents.ts
@@ -72,6 +72,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
index 28270425304..73a953e5176 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
@@ -103,6 +103,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/searchRepos.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/searchRepos.ts
index 7696df54d0f..2aca4ee5a97 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/searchRepos.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/searchRepos.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/server/getConfig.ts b/packages/ozone/src/lexicon/types/tools/ozone/server/getConfig.ts
index b05ce4246d9..78ac5c2fb85 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/server/getConfig.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/server/getConfig.ts
@@ -41,6 +41,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/set/addValues.ts b/packages/ozone/src/lexicon/types/tools/ozone/set/addValues.ts
index 1a48da4e682..41ae9830f30 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/addValues.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/addValues.ts
@@ -35,6 +35,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/set/deleteSet.ts b/packages/ozone/src/lexicon/types/tools/ozone/set/deleteSet.ts
index 8b1584c3a1a..4612b73d044 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/deleteSet.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/deleteSet.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/set/deleteValues.ts b/packages/ozone/src/lexicon/types/tools/ozone/set/deleteValues.ts
index d1090863925..f0a18ff3b26 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/deleteValues.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/deleteValues.ts
@@ -36,6 +36,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/set/getValues.ts b/packages/ozone/src/lexicon/types/tools/ozone/set/getValues.ts
index abae3c0b33a..d6f3af9e43e 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/getValues.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/getValues.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/set/querySets.ts b/packages/ozone/src/lexicon/types/tools/ozone/set/querySets.ts
index 1eea93a7c4c..a1fe230268e 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/querySets.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/querySets.ts
@@ -46,6 +46,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/set/upsertSet.ts b/packages/ozone/src/lexicon/types/tools/ozone/set/upsertSet.ts
index f51e375e425..843ad1029db 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/upsertSet.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/upsertSet.ts
@@ -37,6 +37,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/setting/listOptions.ts b/packages/ozone/src/lexicon/types/tools/ozone/setting/listOptions.ts
index 54ad9608df3..464cdf7c50b 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/setting/listOptions.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/setting/listOptions.ts
@@ -47,6 +47,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/setting/removeOptions.ts b/packages/ozone/src/lexicon/types/tools/ozone/setting/removeOptions.ts
index 1d653b314da..3aa323a7fa6 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/setting/removeOptions.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/setting/removeOptions.ts
@@ -43,6 +43,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/setting/upsertOption.ts b/packages/ozone/src/lexicon/types/tools/ozone/setting/upsertOption.ts
index b2e66d073d9..ee541ffe817 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/setting/upsertOption.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/setting/upsertOption.ts
@@ -52,6 +52,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/signature/findCorrelation.ts b/packages/ozone/src/lexicon/types/tools/ozone/signature/findCorrelation.ts
index c3eced05a5e..f12bdf6a04f 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/signature/findCorrelation.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/signature/findCorrelation.ts
@@ -40,6 +40,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts b/packages/ozone/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts
index 821d5c6c080..b4773ac2e20 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/signature/searchAccounts.ts b/packages/ozone/src/lexicon/types/tools/ozone/signature/searchAccounts.ts
index 4e37745aa4a..ad1f3f3c3b8 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/signature/searchAccounts.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/signature/searchAccounts.ts
@@ -43,6 +43,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/team/addMember.ts b/packages/ozone/src/lexicon/types/tools/ozone/team/addMember.ts
index 85e40f2a461..ad33479adcf 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/team/addMember.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/team/addMember.ts
@@ -47,6 +47,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/team/deleteMember.ts b/packages/ozone/src/lexicon/types/tools/ozone/team/deleteMember.ts
index 3adf03313dc..14f0265fd6f 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/team/deleteMember.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/team/deleteMember.ts
@@ -33,6 +33,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/team/listMembers.ts b/packages/ozone/src/lexicon/types/tools/ozone/team/listMembers.ts
index 1995cc68cc1..813e86e9b16 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/team/listMembers.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/team/listMembers.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/team/updateMember.ts b/packages/ozone/src/lexicon/types/tools/ozone/team/updateMember.ts
index 57b0a318583..4c343144a1b 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/team/updateMember.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/team/updateMember.ts
@@ -48,6 +48,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/getPreferences.ts b/packages/pds/src/lexicon/types/app/bsky/actor/getPreferences.ts
index 305e80484be..f839ece0a4d 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/getPreferences.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/getPreferences.ts
@@ -38,6 +38,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/getProfile.ts b/packages/pds/src/lexicon/types/app/bsky/actor/getProfile.ts
index 5a7b1f25bfc..f9163fcf168 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/getProfile.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/getProfile.ts
@@ -36,6 +36,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/getProfiles.ts b/packages/pds/src/lexicon/types/app/bsky/actor/getProfiles.ts
index 16438505654..5c2ffb1f2cc 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/getProfiles.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/getProfiles.ts
@@ -40,6 +40,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/getSuggestions.ts b/packages/pds/src/lexicon/types/app/bsky/actor/getSuggestions.ts
index 6ecd43f1283..c7e254261a1 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/getSuggestions.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/getSuggestions.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/putPreferences.ts b/packages/pds/src/lexicon/types/app/bsky/actor/putPreferences.ts
index 670e752fea3..59aea81c2da 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/putPreferences.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/putPreferences.ts
@@ -33,6 +33,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/searchActors.ts b/packages/pds/src/lexicon/types/app/bsky/actor/searchActors.ts
index dcda0c41854..ebd81ececc5 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/searchActors.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/searchActors.ts
@@ -46,6 +46,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts b/packages/pds/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
index 0198b23d790..b7e9831b21d 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts b/packages/pds/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
index 5bf8699a3ca..0a7d253ce8f 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
@@ -39,6 +39,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getActorFeeds.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
index 0b8afff4ec8..6af507c6e03 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
@@ -43,6 +43,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getActorLikes.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getActorLikes.ts
index da315ae33c7..daf5060c8d2 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getActorLikes.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getActorLikes.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
index 70c2c439d2a..2a14f45d6da 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
@@ -53,6 +53,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getFeed.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getFeed.ts
index e03913a6fb3..5014c102155 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getFeed.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getFeed.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
index 7ab89057a8c..2b99efa318d 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
index 21963a91e2e..2dd6f136f17 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
@@ -40,6 +40,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
index ca1cef20f08..cd69f1a10b8 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getLikes.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getLikes.ts
index 275d99bba3d..b035c2ea609 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getLikes.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getLikes.ts
@@ -48,6 +48,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getListFeed.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getListFeed.ts
index 84e12deaa92..0720feb5b6b 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getListFeed.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getListFeed.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getPostThread.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getPostThread.ts
index 768977193ef..918faddfc1d 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getPostThread.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getPostThread.ts
@@ -51,6 +51,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getPosts.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getPosts.ts
index 85000c74787..b7048083583 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getPosts.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getPosts.ts
@@ -41,6 +41,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getQuotes.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getQuotes.ts
index 38d04ad88c1..23c7dd831f0 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getQuotes.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getQuotes.ts
@@ -48,6 +48,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getRepostedBy.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
index 40e008815d9..efae1c0b14f 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
@@ -48,6 +48,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
index d1ec590f33d..c660e995f9f 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getTimeline.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getTimeline.ts
index 5202c9eb6e3..f9cd3d702c5 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getTimeline.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getTimeline.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/searchPosts.ts b/packages/pds/src/lexicon/types/app/bsky/feed/searchPosts.ts
index 14efa5276f8..68e0b729b53 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/searchPosts.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/searchPosts.ts
@@ -66,6 +66,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/sendInteractions.ts b/packages/pds/src/lexicon/types/app/bsky/feed/sendInteractions.ts
index c22fc1cb2fb..b0280ad8028 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/sendInteractions.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/sendInteractions.ts
@@ -43,6 +43,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
index 10250d0f3b4..352c542990f 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
@@ -43,6 +43,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getBlocks.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getBlocks.ts
index 1fc9cd8ce37..1fdd49c6831 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getBlocks.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getBlocks.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getFollowers.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getFollowers.ts
index f5645eaef29..1f348e97d20 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getFollowers.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getFollowers.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getFollows.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getFollows.ts
index b9bd249da45..a9664991c88 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getFollows.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getFollows.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
index f5645eaef29..1f348e97d20 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getList.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getList.ts
index 864a81b3833..a8408edd622 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getList.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getList.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getListBlocks.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getListBlocks.ts
index 7399a14fadc..728892f4379 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getListBlocks.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getListBlocks.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getListMutes.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getListMutes.ts
index 7399a14fadc..728892f4379 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getListMutes.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getListMutes.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getLists.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getLists.ts
index dc0c4f18bea..0ed8abc586e 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getLists.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getLists.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getMutes.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getMutes.ts
index f450393522d..45c7966644e 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getMutes.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getMutes.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getRelationships.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getRelationships.ts
index bd6b6e765ed..677c8815d43 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getRelationships.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getRelationships.ts
@@ -49,6 +49,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPack.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPack.ts
index 93fe21f0b13..bbf8a537da0 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPack.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPack.ts
@@ -41,6 +41,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPacks.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
index 4b9757b941e..1ea054400b3 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
@@ -40,6 +40,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
index be577ecab54..8736dc71b45 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/muteActor.ts b/packages/pds/src/lexicon/types/app/bsky/graph/muteActor.ts
index baa9844046a..7d0057721d6 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/muteActor.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/muteActor.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/muteActorList.ts b/packages/pds/src/lexicon/types/app/bsky/graph/muteActorList.ts
index 6a68f680a1c..1d80ac0d3db 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/muteActorList.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/muteActorList.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/muteThread.ts b/packages/pds/src/lexicon/types/app/bsky/graph/muteThread.ts
index 928c56b6fc3..659ced88112 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/muteThread.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/muteThread.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts b/packages/pds/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
index dea496aa50f..70bc184bb43 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActor.ts b/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActor.ts
index baa9844046a..7d0057721d6 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActor.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActor.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActorList.ts b/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
index 6a68f680a1c..1d80ac0d3db 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/unmuteThread.ts b/packages/pds/src/lexicon/types/app/bsky/graph/unmuteThread.ts
index 928c56b6fc3..659ced88112 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/unmuteThread.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/unmuteThread.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/labeler/getServices.ts b/packages/pds/src/lexicon/types/app/bsky/labeler/getServices.ts
index faeb30b4798..e1d318b6177 100644
--- a/packages/pds/src/lexicon/types/app/bsky/labeler/getServices.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/labeler/getServices.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/notification/getUnreadCount.ts b/packages/pds/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
index 3931e24d3f0..d2cff779da4 100644
--- a/packages/pds/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
@@ -40,6 +40,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/notification/listNotifications.ts b/packages/pds/src/lexicon/types/app/bsky/notification/listNotifications.ts
index 88fe90a0518..69d05288acb 100644
--- a/packages/pds/src/lexicon/types/app/bsky/notification/listNotifications.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/notification/listNotifications.ts
@@ -49,6 +49,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/notification/putPreferences.ts b/packages/pds/src/lexicon/types/app/bsky/notification/putPreferences.ts
index 2c3a9d6fdbb..2271b658cb2 100644
--- a/packages/pds/src/lexicon/types/app/bsky/notification/putPreferences.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/notification/putPreferences.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/notification/registerPush.ts b/packages/pds/src/lexicon/types/app/bsky/notification/registerPush.ts
index cce8f95839d..c4ca7104764 100644
--- a/packages/pds/src/lexicon/types/app/bsky/notification/registerPush.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/notification/registerPush.ts
@@ -35,6 +35,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/notification/updateSeen.ts b/packages/pds/src/lexicon/types/app/bsky/notification/updateSeen.ts
index 93db017a152..690e68dbeeb 100644
--- a/packages/pds/src/lexicon/types/app/bsky/notification/updateSeen.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/notification/updateSeen.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/getConfig.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/getConfig.ts
index da202ab0d54..e922e1f10df 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/getConfig.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/getConfig.ts
@@ -37,6 +37,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
index 02f19f3cc6a..56ecba098be 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
@@ -43,6 +43,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
index a89065ffcde..4b68e768e20 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
@@ -50,6 +50,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
index a03f442140d..7febcd64994 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
@@ -37,6 +37,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
index 51b78652a74..469ecd63b79 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
@@ -43,6 +43,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
index 94295f45349..0cb2c5e0b9c 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
@@ -52,6 +52,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
index cd293454902..00318176398 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
@@ -68,6 +68,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
index e980d884fec..d488cb43fed 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
@@ -50,6 +50,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/video/getJobStatus.ts b/packages/pds/src/lexicon/types/app/bsky/video/getJobStatus.ts
index 3e075ba2195..846dbf5e0b5 100644
--- a/packages/pds/src/lexicon/types/app/bsky/video/getJobStatus.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/video/getJobStatus.ts
@@ -40,6 +40,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/video/getUploadLimits.ts b/packages/pds/src/lexicon/types/app/bsky/video/getUploadLimits.ts
index f0f23003b0b..d1930430c9d 100644
--- a/packages/pds/src/lexicon/types/app/bsky/video/getUploadLimits.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/video/getUploadLimits.ts
@@ -41,6 +41,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/app/bsky/video/uploadVideo.ts b/packages/pds/src/lexicon/types/app/bsky/video/uploadVideo.ts
index c23ff677a4b..99291559507 100644
--- a/packages/pds/src/lexicon/types/app/bsky/video/uploadVideo.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/video/uploadVideo.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/chat/bsky/actor/deleteAccount.ts b/packages/pds/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
index 08714990fcb..1ae84f6c7cc 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
@@ -36,6 +36,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/chat/bsky/actor/exportAccountData.ts b/packages/pds/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
index f6f38ab2fb3..363a8c68b97 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
index c05bc99b36a..2a70c63df4f 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/getConvo.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/getConvo.ts
index 1448c75b306..e6d1a651280 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/getConvo.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/getConvo.ts
@@ -40,6 +40,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
index 108dfd6ad5b..0062e2230e6 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
@@ -40,6 +40,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/getLog.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/getLog.ts
index 89f6778c4d3..2d1354f09bd 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/getLog.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/getLog.ts
@@ -47,6 +47,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/getMessages.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/getMessages.ts
index a615ba37674..689dd4539dd 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/getMessages.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/getMessages.ts
@@ -47,6 +47,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/leaveConvo.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
index 8b76a7b0c75..99af5702e29 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/listConvos.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/listConvos.ts
index 4d6f35bf39c..5e9a3dad264 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/listConvos.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/listConvos.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/muteConvo.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/muteConvo.ts
index ddb57623913..4d39442ff86 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/muteConvo.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/muteConvo.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessage.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessage.ts
index ab2d8b03f89..94acb7f018d 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessage.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessage.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
index b3c2c2bc252..29556e52e7a 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
index ddb57623913..4d39442ff86 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/updateRead.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/updateRead.ts
index b879cde82b0..6aa23309332 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/updateRead.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/updateRead.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts b/packages/pds/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
index 077a0076bab..f99260a1b85 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
@@ -41,6 +41,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts b/packages/pds/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
index 0a1f5b1b691..39489eb7c12 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
@@ -48,6 +48,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts b/packages/pds/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
index d9c95f69643..17324495c1c 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
@@ -34,6 +34,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/deleteAccount.ts b/packages/pds/src/lexicon/types/com/atproto/admin/deleteAccount.ts
index 003c1b5ebcd..1b0223ea303 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/deleteAccount.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/deleteAccount.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts b/packages/pds/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
index 68c6503d95e..d8f8ecad320 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
@@ -34,6 +34,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts b/packages/pds/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
index 2bf8de35583..75a9fb472a5 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
@@ -33,6 +33,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts b/packages/pds/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
index 3f2836e7142..b072ad7ec56 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
@@ -34,6 +34,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfo.ts b/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
index c7b840a153d..acea7749774 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
@@ -35,6 +35,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfos.ts b/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
index 99ef44a99f5..7d9fa3fdcbf 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
@@ -40,6 +40,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/getInviteCodes.ts b/packages/pds/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
index d68b97d775a..9619d5e4b5b 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
@@ -43,6 +43,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts b/packages/pds/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
index c13496638c8..3aff3e6f322 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
@@ -49,6 +49,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/searchAccounts.ts b/packages/pds/src/lexicon/types/com/atproto/admin/searchAccounts.ts
index 80d0eecd926..96b26867f41 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/searchAccounts.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/searchAccounts.ts
@@ -43,6 +43,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/sendEmail.ts b/packages/pds/src/lexicon/types/com/atproto/admin/sendEmail.ts
index 836fba39f79..5c8bebe791d 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/sendEmail.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/sendEmail.ts
@@ -48,6 +48,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts b/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
index ebabffbccdb..e3ea26f7298 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
@@ -34,6 +34,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts b/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
index d6dc4a2dc25..87d861faef5 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
@@ -33,6 +33,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts b/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
index 948568f0d3d..b6aef601e13 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
@@ -33,6 +33,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts b/packages/pds/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
index c03d9667cae..ae48689cb4f 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
@@ -56,6 +56,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts b/packages/pds/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
index 5fa374de737..33bd5f6fa05 100644
--- a/packages/pds/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
@@ -41,6 +41,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts b/packages/pds/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
index 82672f1d1c7..7620d0abb69 100644
--- a/packages/pds/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
@@ -25,6 +25,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/identity/resolveHandle.ts b/packages/pds/src/lexicon/types/com/atproto/identity/resolveHandle.ts
index 05019df6166..e319fbfbadb 100644
--- a/packages/pds/src/lexicon/types/com/atproto/identity/resolveHandle.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/resolveHandle.ts
@@ -40,6 +40,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/identity/signPlcOperation.ts b/packages/pds/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
index 3c908c049f2..9b0cb540b8e 100644
--- a/packages/pds/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
@@ -49,6 +49,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts b/packages/pds/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
index 5290b55d023..9b85d7dcb2f 100644
--- a/packages/pds/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/identity/updateHandle.ts b/packages/pds/src/lexicon/types/com/atproto/identity/updateHandle.ts
index f451d1f57c7..8a271d80264 100644
--- a/packages/pds/src/lexicon/types/com/atproto/identity/updateHandle.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/updateHandle.ts
@@ -33,6 +33,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/label/queryLabels.ts b/packages/pds/src/lexicon/types/com/atproto/label/queryLabels.ts
index 0c9d55a6961..9873f6914b4 100644
--- a/packages/pds/src/lexicon/types/com/atproto/label/queryLabels.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/label/queryLabels.ts
@@ -46,6 +46,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/moderation/createReport.ts b/packages/pds/src/lexicon/types/com/atproto/moderation/createReport.ts
index aa3f810a91c..dc7985c7685 100644
--- a/packages/pds/src/lexicon/types/com/atproto/moderation/createReport.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/moderation/createReport.ts
@@ -60,6 +60,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/applyWrites.ts b/packages/pds/src/lexicon/types/com/atproto/repo/applyWrites.ts
index 4e3c8dcef3d..a58fcc0a56b 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/applyWrites.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/applyWrites.ts
@@ -52,6 +52,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/createRecord.ts b/packages/pds/src/lexicon/types/com/atproto/repo/createRecord.ts
index 5cac0848bf1..0982f49bf3d 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/createRecord.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/createRecord.ts
@@ -59,6 +59,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/deleteRecord.ts b/packages/pds/src/lexicon/types/com/atproto/repo/deleteRecord.ts
index e594cd00adf..c86ab7ba47a 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/deleteRecord.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/deleteRecord.ts
@@ -54,6 +54,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/describeRepo.ts b/packages/pds/src/lexicon/types/com/atproto/repo/describeRepo.ts
index 749bedcfeb7..5b187f3758c 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/describeRepo.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/describeRepo.ts
@@ -47,6 +47,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/getRecord.ts b/packages/pds/src/lexicon/types/com/atproto/repo/getRecord.ts
index 9d03da19530..96ce9ee551f 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/getRecord.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/getRecord.ts
@@ -49,6 +49,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/importRepo.ts b/packages/pds/src/lexicon/types/com/atproto/repo/importRepo.ts
index 59288c7a027..685918f455f 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/importRepo.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/importRepo.ts
@@ -30,6 +30,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts b/packages/pds/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
index 40f4d385e47..f1be00d8e87 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
@@ -41,6 +41,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/listRecords.ts b/packages/pds/src/lexicon/types/com/atproto/repo/listRecords.ts
index f46f6eb0f7f..e328cfbb204 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/listRecords.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/listRecords.ts
@@ -52,6 +52,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/putRecord.ts b/packages/pds/src/lexicon/types/com/atproto/repo/putRecord.ts
index 5cde768d7c2..269244ede91 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/putRecord.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/putRecord.ts
@@ -61,6 +61,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/uploadBlob.ts b/packages/pds/src/lexicon/types/com/atproto/repo/uploadBlob.ts
index 4a712346a0b..7595e7295e6 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/uploadBlob.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/uploadBlob.ts
@@ -41,6 +41,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/activateAccount.ts b/packages/pds/src/lexicon/types/com/atproto/server/activateAccount.ts
index 82672f1d1c7..7620d0abb69 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/activateAccount.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/activateAccount.ts
@@ -25,6 +25,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/checkAccountStatus.ts b/packages/pds/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
index f17182a8dce..2ad98689303 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/confirmEmail.ts b/packages/pds/src/lexicon/types/com/atproto/server/confirmEmail.ts
index b667a04b996..d6338b80fc5 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/confirmEmail.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/confirmEmail.ts
@@ -34,6 +34,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/createAccount.ts b/packages/pds/src/lexicon/types/com/atproto/server/createAccount.ts
index 6e9b2f9f3c2..a85c83edffc 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/createAccount.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/createAccount.ts
@@ -71,6 +71,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/createAppPassword.ts b/packages/pds/src/lexicon/types/com/atproto/server/createAppPassword.ts
index 00657a2058f..65ad1d4b4cb 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/createAppPassword.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/createAppPassword.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/createInviteCode.ts b/packages/pds/src/lexicon/types/com/atproto/server/createInviteCode.ts
index 9cfeacc7e28..82daf7eea6f 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/createInviteCode.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/createInviteCode.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/createInviteCodes.ts b/packages/pds/src/lexicon/types/com/atproto/server/createInviteCodes.ts
index eb6cd2bb1b1..fa2c1f73c2a 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/createInviteCodes.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/createInviteCodes.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/createSession.ts b/packages/pds/src/lexicon/types/com/atproto/server/createSession.ts
index 4ed0ae70fb1..47ffaaaa0bd 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/createSession.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/createSession.ts
@@ -59,6 +59,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/deactivateAccount.ts b/packages/pds/src/lexicon/types/com/atproto/server/deactivateAccount.ts
index b3793d6b2e0..56b86424e61 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/deactivateAccount.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/deactivateAccount.ts
@@ -33,6 +33,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/deleteAccount.ts b/packages/pds/src/lexicon/types/com/atproto/server/deleteAccount.ts
index 4fcec360a11..93b7b78a0e5 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/deleteAccount.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/deleteAccount.ts
@@ -35,6 +35,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/deleteSession.ts b/packages/pds/src/lexicon/types/com/atproto/server/deleteSession.ts
index 82672f1d1c7..7620d0abb69 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/deleteSession.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/deleteSession.ts
@@ -25,6 +25,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/describeServer.ts b/packages/pds/src/lexicon/types/com/atproto/server/describeServer.ts
index e21868158b3..6964a59ffdf 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/describeServer.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/describeServer.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts b/packages/pds/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
index 82c3ffa8c31..1cdf1299961 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
@@ -43,6 +43,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/getServiceAuth.ts b/packages/pds/src/lexicon/types/com/atproto/server/getServiceAuth.ts
index 14f249fde44..1e9d1398be7 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/getServiceAuth.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/getServiceAuth.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/getSession.ts b/packages/pds/src/lexicon/types/com/atproto/server/getSession.ts
index be34cb92afd..cafa6bc7452 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/getSession.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/getSession.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/listAppPasswords.ts b/packages/pds/src/lexicon/types/com/atproto/server/listAppPasswords.ts
index 397e7043e67..99219e67f7f 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/listAppPasswords.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/listAppPasswords.ts
@@ -38,6 +38,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/refreshSession.ts b/packages/pds/src/lexicon/types/com/atproto/server/refreshSession.ts
index 1d6272a0d71..59e8f9d5a32 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/refreshSession.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/refreshSession.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/requestAccountDelete.ts b/packages/pds/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
index 82672f1d1c7..7620d0abb69 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
@@ -25,6 +25,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts b/packages/pds/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
index 82672f1d1c7..7620d0abb69 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
@@ -25,6 +25,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts b/packages/pds/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
index 24dce3e12af..87b9a094ccc 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
@@ -37,6 +37,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/requestPasswordReset.ts b/packages/pds/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
index d0f3f2ad769..ae541342aff 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/reserveSigningKey.ts b/packages/pds/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
index 0ec1e80c77c..72850ce061b 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/resetPassword.ts b/packages/pds/src/lexicon/types/com/atproto/server/resetPassword.ts
index 38f63382cf0..4b5b8ea1ecc 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/resetPassword.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/resetPassword.ts
@@ -34,6 +34,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/revokeAppPassword.ts b/packages/pds/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
index 769ad6aa521..80131f8c9e3 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/updateEmail.ts b/packages/pds/src/lexicon/types/com/atproto/server/updateEmail.ts
index 34fc7421979..a80982da4f8 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/updateEmail.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/updateEmail.ts
@@ -36,6 +36,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getBlob.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getBlob.ts
index b1581d6e473..659c71c1a8d 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getBlob.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getBlob.ts
@@ -43,6 +43,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getBlocks.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getBlocks.ts
index 925b4a7d50b..7fef8b7f64d 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getBlocks.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getBlocks.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getCheckout.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getCheckout.ts
index 51856b9088d..3d519f6916d 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getCheckout.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getCheckout.ts
@@ -35,6 +35,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getHead.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getHead.ts
index adedd4cf211..d9bb230cef5 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getHead.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getHead.ts
@@ -41,6 +41,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getLatestCommit.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
index f0e9a757d04..6041841e311 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getRecord.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getRecord.ts
index 83d88655228..afbd779faf1 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getRecord.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getRecord.ts
@@ -46,6 +46,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getRepo.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getRepo.ts
index 883ff37def1..62a86f56a38 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getRepo.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getRepo.ts
@@ -38,6 +38,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getRepoStatus.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
index 00abbeaa84b..743bcc45767 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
@@ -46,6 +46,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/listBlobs.ts b/packages/pds/src/lexicon/types/com/atproto/sync/listBlobs.ts
index c6ea955ee0c..abb1719f41b 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/listBlobs.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/listBlobs.ts
@@ -46,6 +46,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/listRepos.ts b/packages/pds/src/lexicon/types/com/atproto/sync/listRepos.ts
index 5628b0b5147..228d6a004b5 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/listRepos.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/listRepos.ts
@@ -41,6 +41,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts b/packages/pds/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
index 8a0af577c7c..b2d2e6b2e48 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
@@ -33,6 +33,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/requestCrawl.ts b/packages/pds/src/lexicon/types/com/atproto/sync/requestCrawl.ts
index 31180aabf58..fd54e157b7b 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/requestCrawl.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/requestCrawl.ts
@@ -33,6 +33,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/temp/addReservedHandle.ts b/packages/pds/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
index b884cb08998..69be85f72df 100644
--- a/packages/pds/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts b/packages/pds/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
index 9486bce2b2b..9c7ef1ae6ab 100644
--- a/packages/pds/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
@@ -39,6 +39,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/temp/fetchLabels.ts b/packages/pds/src/lexicon/types/com/atproto/temp/fetchLabels.ts
index 0fbdeed1196..0392ba06ea2 100644
--- a/packages/pds/src/lexicon/types/com/atproto/temp/fetchLabels.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/temp/fetchLabels.ts
@@ -41,6 +41,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts b/packages/pds/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
index c977500fc33..8ebee2ad46d 100644
--- a/packages/pds/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/tools/ozone/communication/createTemplate.ts b/packages/pds/src/lexicon/types/tools/ozone/communication/createTemplate.ts
index 6d29f93bdba..49d46cc6299 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/communication/createTemplate.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/communication/createTemplate.ts
@@ -51,6 +51,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts b/packages/pds/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts
index c5ae5cd469f..d773d84d8e6 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts
@@ -32,6 +32,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/tools/ozone/communication/listTemplates.ts b/packages/pds/src/lexicon/types/tools/ozone/communication/listTemplates.ts
index 4573ac7bbb9..aa2738f5ca2 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/communication/listTemplates.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/communication/listTemplates.ts
@@ -38,6 +38,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/tools/ozone/communication/updateTemplate.ts b/packages/pds/src/lexicon/types/tools/ozone/communication/updateTemplate.ts
index f8c5817b4d9..9f9c532e136 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/communication/updateTemplate.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/communication/updateTemplate.ts
@@ -54,6 +54,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/emitEvent.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
index 1399cf589ee..d409858ec7b 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
@@ -68,6 +68,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/getEvent.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/getEvent.ts
index b583510a791..c7e1b5943f3 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/getEvent.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/getEvent.ts
@@ -35,6 +35,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecord.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecord.ts
index a3832cd161c..67eca72d05f 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecord.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecord.ts
@@ -37,6 +37,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecords.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecords.ts
index 2559727bd65..46e11ef48e3 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecords.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecords.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepo.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepo.ts
index 853d6460e85..ff675e577dc 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepo.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepo.ts
@@ -36,6 +36,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepos.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepos.ts
index 71da4d1bac9..f113ef4395c 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepos.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepos.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/queryEvents.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/queryEvents.ts
index 51003984889..c29249690d4 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/queryEvents.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/queryEvents.ts
@@ -72,6 +72,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
index 28270425304..73a953e5176 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
@@ -103,6 +103,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/searchRepos.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/searchRepos.ts
index 7696df54d0f..2aca4ee5a97 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/searchRepos.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/searchRepos.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/tools/ozone/server/getConfig.ts b/packages/pds/src/lexicon/types/tools/ozone/server/getConfig.ts
index b05ce4246d9..78ac5c2fb85 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/server/getConfig.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/server/getConfig.ts
@@ -41,6 +41,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/tools/ozone/set/addValues.ts b/packages/pds/src/lexicon/types/tools/ozone/set/addValues.ts
index 1a48da4e682..41ae9830f30 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/addValues.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/addValues.ts
@@ -35,6 +35,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/tools/ozone/set/deleteSet.ts b/packages/pds/src/lexicon/types/tools/ozone/set/deleteSet.ts
index 8b1584c3a1a..4612b73d044 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/deleteSet.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/deleteSet.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/tools/ozone/set/deleteValues.ts b/packages/pds/src/lexicon/types/tools/ozone/set/deleteValues.ts
index d1090863925..f0a18ff3b26 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/deleteValues.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/deleteValues.ts
@@ -36,6 +36,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/tools/ozone/set/getValues.ts b/packages/pds/src/lexicon/types/tools/ozone/set/getValues.ts
index abae3c0b33a..d6f3af9e43e 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/getValues.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/getValues.ts
@@ -45,6 +45,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/tools/ozone/set/querySets.ts b/packages/pds/src/lexicon/types/tools/ozone/set/querySets.ts
index 1eea93a7c4c..a1fe230268e 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/querySets.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/querySets.ts
@@ -46,6 +46,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/tools/ozone/set/upsertSet.ts b/packages/pds/src/lexicon/types/tools/ozone/set/upsertSet.ts
index f51e375e425..843ad1029db 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/upsertSet.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/upsertSet.ts
@@ -37,6 +37,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/tools/ozone/setting/listOptions.ts b/packages/pds/src/lexicon/types/tools/ozone/setting/listOptions.ts
index 54ad9608df3..464cdf7c50b 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/setting/listOptions.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/setting/listOptions.ts
@@ -47,6 +47,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/tools/ozone/setting/removeOptions.ts b/packages/pds/src/lexicon/types/tools/ozone/setting/removeOptions.ts
index 1d653b314da..3aa323a7fa6 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/setting/removeOptions.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/setting/removeOptions.ts
@@ -43,6 +43,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/tools/ozone/setting/upsertOption.ts b/packages/pds/src/lexicon/types/tools/ozone/setting/upsertOption.ts
index b2e66d073d9..ee541ffe817 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/setting/upsertOption.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/setting/upsertOption.ts
@@ -52,6 +52,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/tools/ozone/signature/findCorrelation.ts b/packages/pds/src/lexicon/types/tools/ozone/signature/findCorrelation.ts
index c3eced05a5e..f12bdf6a04f 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/signature/findCorrelation.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/signature/findCorrelation.ts
@@ -40,6 +40,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts b/packages/pds/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts
index 821d5c6c080..b4773ac2e20 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts
@@ -44,6 +44,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/tools/ozone/signature/searchAccounts.ts b/packages/pds/src/lexicon/types/tools/ozone/signature/searchAccounts.ts
index 4e37745aa4a..ad1f3f3c3b8 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/signature/searchAccounts.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/signature/searchAccounts.ts
@@ -43,6 +43,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/tools/ozone/team/addMember.ts b/packages/pds/src/lexicon/types/tools/ozone/team/addMember.ts
index 85e40f2a461..ad33479adcf 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/team/addMember.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/team/addMember.ts
@@ -47,6 +47,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/tools/ozone/team/deleteMember.ts b/packages/pds/src/lexicon/types/tools/ozone/team/deleteMember.ts
index 3adf03313dc..14f0265fd6f 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/team/deleteMember.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/team/deleteMember.ts
@@ -33,6 +33,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/tools/ozone/team/listMembers.ts b/packages/pds/src/lexicon/types/tools/ozone/team/listMembers.ts
index 1995cc68cc1..813e86e9b16 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/team/listMembers.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/team/listMembers.ts
@@ -42,6 +42,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,
diff --git a/packages/pds/src/lexicon/types/tools/ozone/team/updateMember.ts b/packages/pds/src/lexicon/types/tools/ozone/team/updateMember.ts
index 57b0a318583..4c343144a1b 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/team/updateMember.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/team/updateMember.ts
@@ -48,6 +48,7 @@ export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   input: HandlerInput
   req: express.Request
   res: express.Response
+  resetRouteRateLimits: () => Promise<void>
 }
 export type Handler<HA extends HandlerAuth = never> = (
   ctx: HandlerReqCtx<HA>,

From b04943191b9f89a5263a77358d47d1362a6454a6 Mon Sep 17 00:00:00 2001
From: Matthieu Sieben <matthieusieben@users.noreply.github.com>
Date: Thu, 23 Jan 2025 11:01:37 +0100
Subject: [PATCH 026/101] Add description for transition:* scopes (#3432)

---
 .changeset/little-fishes-mate.md                             | 5 +++++
 .../oauth-provider/src/assets/app/components/accept-form.tsx | 4 ++++
 2 files changed, 9 insertions(+)
 create mode 100644 .changeset/little-fishes-mate.md

diff --git a/.changeset/little-fishes-mate.md b/.changeset/little-fishes-mate.md
new file mode 100644
index 00000000000..b4b449eaf65
--- /dev/null
+++ b/.changeset/little-fishes-mate.md
@@ -0,0 +1,5 @@
+---
+"@atproto/oauth-provider": patch
+---
+
+Add user friendly description for transition:\* scopes
diff --git a/packages/oauth/oauth-provider/src/assets/app/components/accept-form.tsx b/packages/oauth/oauth-provider/src/assets/app/components/accept-form.tsx
index 247bd69013c..27c2a1aecbf 100644
--- a/packages/oauth/oauth-provider/src/assets/app/components/accept-form.tsx
+++ b/packages/oauth/oauth-provider/src/assets/app/components/accept-form.tsx
@@ -127,6 +127,10 @@ function getScopeDescription(scope: string): string {
   switch (scope) {
     case 'atproto':
       return 'Uniquely identify you'
+    case 'transition:generic':
+      return 'Access your account data (except chat messages)'
+    case 'transition:chat.bsky':
+      return 'Access your chat messages'
     default:
       return scope
   }

From 8c6c7813a9c2110c8fe21acdca8f09554a1983ce Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Thu, 23 Jan 2025 14:22:55 +0000
Subject: [PATCH 027/101] Allow passing `allowTakendown` to createSession
 (#3441)

* allow passing `allowTakendown` to createSession

* changeset
---
 .changeset/new-owls-applaud.md | 5 +++++
 packages/api/src/atp-agent.ts  | 1 +
 packages/api/src/types.ts      | 1 +
 3 files changed, 7 insertions(+)
 create mode 100644 .changeset/new-owls-applaud.md

diff --git a/.changeset/new-owls-applaud.md b/.changeset/new-owls-applaud.md
new file mode 100644
index 00000000000..2242088c89c
--- /dev/null
+++ b/.changeset/new-owls-applaud.md
@@ -0,0 +1,5 @@
+---
+"@atproto/api": patch
+---
+
+Allow passing `allowTakendown` to createSession
diff --git a/packages/api/src/atp-agent.ts b/packages/api/src/atp-agent.ts
index 0d4129dc6d3..e82c78772bc 100644
--- a/packages/api/src/atp-agent.ts
+++ b/packages/api/src/atp-agent.ts
@@ -309,6 +309,7 @@ export class CredentialSession implements SessionManager {
         identifier: opts.identifier,
         password: opts.password,
         authFactorToken: opts.authFactorToken,
+        allowTakendown: opts.allowTakendown,
       })
       this.session = {
         accessJwt: res.data.accessJwt,
diff --git a/packages/api/src/types.ts b/packages/api/src/types.ts
index 582f9a70c15..fba5b2deebf 100644
--- a/packages/api/src/types.ts
+++ b/packages/api/src/types.ts
@@ -47,6 +47,7 @@ export interface AtpAgentLoginOpts {
   identifier: string
   password: string
   authFactorToken?: string | undefined
+  allowTakendown?: boolean
 }
 
 /**

From 3aa97a9dd3d222ae0087915e68a707ebcc128e31 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 23 Jan 2025 14:27:29 +0000
Subject: [PATCH 028/101] Version packages (#3438)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/little-fishes-mate.md           |  5 -----
 .changeset/new-owls-applaud.md             |  5 -----
 packages/api/CHANGELOG.md                  |  6 ++++++
 packages/api/package.json                  |  2 +-
 packages/bsky/CHANGELOG.md                 |  7 +++++++
 packages/bsky/package.json                 |  2 +-
 packages/dev-env/CHANGELOG.md              | 10 ++++++++++
 packages/dev-env/package.json              |  2 +-
 packages/oauth/oauth-provider/CHANGELOG.md |  6 ++++++
 packages/oauth/oauth-provider/package.json |  2 +-
 packages/ozone/CHANGELOG.md                |  7 +++++++
 packages/ozone/package.json                |  2 +-
 packages/pds/CHANGELOG.md                  |  8 ++++++++
 packages/pds/package.json                  |  2 +-
 14 files changed, 50 insertions(+), 16 deletions(-)
 delete mode 100644 .changeset/little-fishes-mate.md
 delete mode 100644 .changeset/new-owls-applaud.md

diff --git a/.changeset/little-fishes-mate.md b/.changeset/little-fishes-mate.md
deleted file mode 100644
index b4b449eaf65..00000000000
--- a/.changeset/little-fishes-mate.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/oauth-provider": patch
----
-
-Add user friendly description for transition:\* scopes
diff --git a/.changeset/new-owls-applaud.md b/.changeset/new-owls-applaud.md
deleted file mode 100644
index 2242088c89c..00000000000
--- a/.changeset/new-owls-applaud.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/api": patch
----
-
-Allow passing `allowTakendown` to createSession
diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md
index f3a524ae1e8..6c5179bf40c 100644
--- a/packages/api/CHANGELOG.md
+++ b/packages/api/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @atproto/api
 
+## 0.13.31
+
+### Patch Changes
+
+- [#3441](https://github.com/bluesky-social/atproto/pull/3441) [`8c6c7813a`](https://github.com/bluesky-social/atproto/commit/8c6c7813a9c2110c8fe21acdca8f09554a1983ce) Thanks [@mozzius](https://github.com/mozzius)! - Allow passing `allowTakendown` to createSession
+
 ## 0.13.30
 
 ### Patch Changes
diff --git a/packages/api/package.json b/packages/api/package.json
index 222027b7870..82978a9d811 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/api",
-  "version": "0.13.30",
+  "version": "0.13.31",
   "license": "MIT",
   "description": "Client library for atproto and Bluesky",
   "keywords": [
diff --git a/packages/bsky/CHANGELOG.md b/packages/bsky/CHANGELOG.md
index 1eecb2411b8..29a46b9a3df 100644
--- a/packages/bsky/CHANGELOG.md
+++ b/packages/bsky/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/bsky
 
+## 0.0.112
+
+### Patch Changes
+
+- Updated dependencies [[`8c6c7813a`](https://github.com/bluesky-social/atproto/commit/8c6c7813a9c2110c8fe21acdca8f09554a1983ce)]:
+  - @atproto/api@0.13.31
+
 ## 0.0.111
 
 ### Patch Changes
diff --git a/packages/bsky/package.json b/packages/bsky/package.json
index 58b6848f593..73db8c83dd8 100644
--- a/packages/bsky/package.json
+++ b/packages/bsky/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.111",
+  "version": "0.0.112",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
diff --git a/packages/dev-env/CHANGELOG.md b/packages/dev-env/CHANGELOG.md
index ff18c62f0ad..16932d5c00e 100644
--- a/packages/dev-env/CHANGELOG.md
+++ b/packages/dev-env/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @atproto/dev-env
 
+## 0.3.82
+
+### Patch Changes
+
+- Updated dependencies [[`8c6c7813a`](https://github.com/bluesky-social/atproto/commit/8c6c7813a9c2110c8fe21acdca8f09554a1983ce)]:
+  - @atproto/api@0.13.31
+  - @atproto/pds@0.4.90
+  - @atproto/bsky@0.0.112
+  - @atproto/ozone@0.1.73
+
 ## 0.3.81
 
 ### Patch Changes
diff --git a/packages/dev-env/package.json b/packages/dev-env/package.json
index ccc026bc702..a6104c1fafd 100644
--- a/packages/dev-env/package.json
+++ b/packages/dev-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/dev-env",
-  "version": "0.3.81",
+  "version": "0.3.82",
   "license": "MIT",
   "description": "Local development environment helper for atproto development",
   "keywords": [
diff --git a/packages/oauth/oauth-provider/CHANGELOG.md b/packages/oauth/oauth-provider/CHANGELOG.md
index 5ae5f34792b..188fd0930f4 100644
--- a/packages/oauth/oauth-provider/CHANGELOG.md
+++ b/packages/oauth/oauth-provider/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @atproto/oauth-provider
 
+## 0.2.15
+
+### Patch Changes
+
+- [#3432](https://github.com/bluesky-social/atproto/pull/3432) [`b04943191`](https://github.com/bluesky-social/atproto/commit/b04943191b9f89a5263a77358d47d1362a6454a6) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Add user friendly description for transition:\* scopes
+
 ## 0.2.14
 
 ### Patch Changes
diff --git a/packages/oauth/oauth-provider/package.json b/packages/oauth/oauth-provider/package.json
index 9b87ac0852d..6c65a12c480 100644
--- a/packages/oauth/oauth-provider/package.json
+++ b/packages/oauth/oauth-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/oauth-provider",
-  "version": "0.2.14",
+  "version": "0.2.15",
   "license": "MIT",
   "description": "Generic OAuth2 and OpenID Connect provider for Node.js. Currently only supports features needed for Atproto.",
   "keywords": [
diff --git a/packages/ozone/CHANGELOG.md b/packages/ozone/CHANGELOG.md
index 5a45d5e7ab0..9cc6c2b65af 100644
--- a/packages/ozone/CHANGELOG.md
+++ b/packages/ozone/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/ozone
 
+## 0.1.73
+
+### Patch Changes
+
+- Updated dependencies [[`8c6c7813a`](https://github.com/bluesky-social/atproto/commit/8c6c7813a9c2110c8fe21acdca8f09554a1983ce)]:
+  - @atproto/api@0.13.31
+
 ## 0.1.72
 
 ### Patch Changes
diff --git a/packages/ozone/package.json b/packages/ozone/package.json
index 781798bd26d..b783902b53d 100644
--- a/packages/ozone/package.json
+++ b/packages/ozone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.1.72",
+  "version": "0.1.73",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
diff --git a/packages/pds/CHANGELOG.md b/packages/pds/CHANGELOG.md
index 64ee066e01d..77e5df5bd00 100644
--- a/packages/pds/CHANGELOG.md
+++ b/packages/pds/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @atproto/pds
 
+## 0.4.90
+
+### Patch Changes
+
+- Updated dependencies [[`b04943191`](https://github.com/bluesky-social/atproto/commit/b04943191b9f89a5263a77358d47d1362a6454a6), [`8c6c7813a`](https://github.com/bluesky-social/atproto/commit/8c6c7813a9c2110c8fe21acdca8f09554a1983ce)]:
+  - @atproto/oauth-provider@0.2.15
+  - @atproto/api@0.13.31
+
 ## 0.4.89
 
 ### Patch Changes
diff --git a/packages/pds/package.json b/packages/pds/package.json
index 34858139bfc..c99bbc41799 100644
--- a/packages/pds/package.json
+++ b/packages/pds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/pds",
-  "version": "0.4.89",
+  "version": "0.4.90",
   "license": "MIT",
   "description": "Reference implementation of atproto Personal Data Server (PDS)",
   "keywords": [

From 4f2841efeb410e710e0c8da7c9204468f6256a75 Mon Sep 17 00:00:00 2001
From: Matthieu Sieben <matthieusieben@users.noreply.github.com>
Date: Thu, 23 Jan 2025 15:53:38 +0100
Subject: [PATCH 029/101] Improve error reporting in case of failed PLC update
 operation (#3439)

* Improve error reporting in case of failed PLC update operation

* Improve error message

* convert all PlcClientError XRPCError

* changeset
---
 .changeset/eighty-eggs-nail.md     |  5 +++
 .changeset/quiet-geese-begin.md    |  5 +++
 .changeset/weak-jobs-serve.md      |  5 +++
 packages/pds/src/index.ts          | 25 ++++++++++++++
 packages/xrpc-server/src/server.ts | 52 ++++++++++++++++--------------
 packages/xrpc-server/src/types.ts  | 13 ++++++++
 6 files changed, 81 insertions(+), 24 deletions(-)
 create mode 100644 .changeset/eighty-eggs-nail.md
 create mode 100644 .changeset/quiet-geese-begin.md
 create mode 100644 .changeset/weak-jobs-serve.md

diff --git a/.changeset/eighty-eggs-nail.md b/.changeset/eighty-eggs-nail.md
new file mode 100644
index 00000000000..3c98610c03b
--- /dev/null
+++ b/.changeset/eighty-eggs-nail.md
@@ -0,0 +1,5 @@
+---
+"@atproto/xrpc-server": patch
+---
+
+Export the `ResponseType` type used in the `XRPCError` constructor
diff --git a/.changeset/quiet-geese-begin.md b/.changeset/quiet-geese-begin.md
new file mode 100644
index 00000000000..0f503d3cfd7
--- /dev/null
+++ b/.changeset/quiet-geese-begin.md
@@ -0,0 +1,5 @@
+---
+"@atproto/xrpc-server": patch
+---
+
+Allow providing a custom `errorParser` option to XRPCServer
diff --git a/.changeset/weak-jobs-serve.md b/.changeset/weak-jobs-serve.md
new file mode 100644
index 00000000000..59de543c639
--- /dev/null
+++ b/.changeset/weak-jobs-serve.md
@@ -0,0 +1,5 @@
+---
+"@atproto/pds": patch
+---
+
+Improve error reporting in case of failed PLC update operation
diff --git a/packages/pds/src/index.ts b/packages/pds/src/index.ts
index fb73a3c3017..1508fe9b504 100644
--- a/packages/pds/src/index.ts
+++ b/packages/pds/src/index.ts
@@ -10,6 +10,9 @@ import http from 'http'
 import events from 'events'
 import { Options as XrpcServerOptions } from '@atproto/xrpc-server'
 import { DAY, HOUR, MINUTE, SECOND } from '@atproto/common'
+import { XRPCError, ResponseType } from '@atproto/xrpc-server'
+import { PlcClientError } from '@did-plc/lib'
+
 import API from './api'
 import * as authRoutes from './auth-routes'
 import * as basicRoutes from './basic-routes'
@@ -64,6 +67,28 @@ export class PDS {
         blobLimit: cfg.service.blobUploadLimit,
       },
       catchall: proxyHandler(ctx),
+      errorParser: (err) => {
+        if (err instanceof PlcClientError) {
+          const payloadMessage =
+            typeof err.data === 'object' &&
+            err.data != null &&
+            'message' in err.data &&
+            typeof err.data.message === 'string' &&
+            err.data.message
+
+          const type =
+            err.status >= 500
+              ? ResponseType.UpstreamFailure
+              : ResponseType.InvalidRequest
+
+          return new XRPCError(
+            type,
+            payloadMessage || 'Unable to perform PLC operation',
+          )
+        }
+
+        return XRPCError.fromError(err)
+      },
       rateLimits: ctx.ratelimitCreator
         ? {
             creator: ctx.ratelimitCreator,
diff --git a/packages/xrpc-server/src/server.ts b/packages/xrpc-server/src/server.ts
index ae0a5563c04..41dc8293dd6 100644
--- a/packages/xrpc-server/src/server.ts
+++ b/packages/xrpc-server/src/server.ts
@@ -68,17 +68,17 @@ export class Server {
   sharedRateLimiters: Record<string, RateLimiterI>
   routeRateLimiters: Record<string, RateLimiterI[]>
 
-  constructor(lexicons?: LexiconDoc[], opts?: Options) {
+  constructor(lexicons?: LexiconDoc[], opts: Options = {}) {
     if (lexicons) {
       this.addLexicons(lexicons)
     }
     this.router.use(this.routes)
     this.router.use('/xrpc/:methodId', this.catchall.bind(this))
-    this.router.use(errorMiddleware)
+    this.router.use(createErrorMiddleware(opts))
     this.router.once('mount', (app: Application) => {
       this.enableStreamingOnListen(app)
     })
-    this.options = opts ?? {}
+    this.options = opts
     this.middleware = {
       json: express.json({ limit: opts?.payload?.jsonLimit }),
       text: express.text({ limit: opts?.payload?.textLimit }),
@@ -535,26 +535,30 @@ function createAuthMiddleware(verifier: AuthVerifier): RequestHandler {
   }
 }
 
-const errorMiddleware: ErrorRequestHandler = function (err, req, res, next) {
-  const locals: RequestLocals | undefined = req[kRequestLocals]
-  const methodSuffix = locals ? ` method ${locals.nsid}` : ''
-  const xrpcError = XRPCError.fromError(err)
-  if (xrpcError instanceof InternalServerError) {
-    // log trace for unhandled exceptions
-    log.error(err, `unhandled exception in xrpc${methodSuffix}`)
-  } else {
-    // do not log trace for known xrpc errors
-    log.error(
-      {
-        status: xrpcError.type,
-        message: xrpcError.message,
-        name: xrpcError.customErrorName,
-      },
-      `error in xrpc${methodSuffix}`,
-    )
-  }
-  if (res.headersSent) {
-    return next(err)
+function createErrorMiddleware({
+  errorParser = (err) => XRPCError.fromError(err),
+}: Options): ErrorRequestHandler {
+  return (err, req, res, next) => {
+    const locals: RequestLocals | undefined = req[kRequestLocals]
+    const methodSuffix = locals ? ` method ${locals.nsid}` : ''
+    const xrpcError = errorParser(err)
+    if (xrpcError instanceof InternalServerError) {
+      // log trace for unhandled exceptions
+      log.error(err, `unhandled exception in xrpc${methodSuffix}`)
+    } else {
+      // do not log trace for known xrpc errors
+      log.error(
+        {
+          status: xrpcError.type,
+          message: xrpcError.message,
+          name: xrpcError.customErrorName,
+        },
+        `error in xrpc${methodSuffix}`,
+      )
+    }
+    if (res.headersSent) {
+      return next(err)
+    }
+    return res.status(xrpcError.type).json(xrpcError.payload)
   }
-  return res.status(xrpcError.type).json(xrpcError.payload)
 }
diff --git a/packages/xrpc-server/src/types.ts b/packages/xrpc-server/src/types.ts
index afc68150328..5ea430a9fd6 100644
--- a/packages/xrpc-server/src/types.ts
+++ b/packages/xrpc-server/src/types.ts
@@ -29,6 +29,17 @@ export type Options = {
     global?: ServerRateLimitDescription[]
     shared?: ServerRateLimitDescription[]
   }
+  /**
+   * By default, errors are converted to {@link XRPCError} using
+   * {@link XRPCError.fromError} before being rendered. If method handlers throw
+   * error objects that are not properly rendered in the HTTP response, this
+   * function can be used to properly convert them to {@link XRPCError}. The
+   * provided function will typically fallback to the default error conversion
+   * (`return XRPCError.fromError(err)`) if the error is not recognized.
+   *
+   * @note This function should not throw errors.
+   */
+  errorParser?: (err: unknown) => XRPCError
 }
 
 export type UndecodedParams = (typeof express.request)['query']
@@ -212,6 +223,8 @@ export type XRPCStreamHandlerConfig = {
   handler: XRPCStreamHandler
 }
 
+export { ResponseType }
+
 export class XRPCError extends Error {
   constructor(
     public type: ResponseType,

From 0904515069b104619096f7ef07691f4565bdc6fa Mon Sep 17 00:00:00 2001
From: devin ivy <devinivy@gmail.com>
Date: Fri, 24 Jan 2025 01:53:02 -0500
Subject: [PATCH 030/101] Add imax to contributors for disclosure (#3434)

---
 CONTRIBUTORS.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index bc6718114fc..3f0464adf01 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -19,3 +19,5 @@ ATProto receives so many contributions that we could never list everyone who des
 #### [goeo\_](https://bsky.app/profile/did:web:genco.me), Security disclosure, May 2024
 
 #### [DavidBuchanan314](https://github.com/DavidBuchanan314), Security disclosure, November 2024
+
+#### [imax](https://github.com/imax9000), Security disclosure, January 2025

From da7a831a7318343ba1ee98de3811ba337c043dbd Mon Sep 17 00:00:00 2001
From: Matthieu Sieben <matthieusieben@users.noreply.github.com>
Date: Fri, 24 Jan 2025 15:29:33 +0100
Subject: [PATCH 031/101] Code cleanup (#3437)

---
 .changeset/forty-carrots-doubt.md | 5 +++++
 packages/ozone/src/background.ts  | 2 --
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/forty-carrots-doubt.md

diff --git a/.changeset/forty-carrots-doubt.md b/.changeset/forty-carrots-doubt.md
new file mode 100644
index 00000000000..f9b66fdcabe
--- /dev/null
+++ b/.changeset/forty-carrots-doubt.md
@@ -0,0 +1,5 @@
+---
+"@atproto/ozone": patch
+---
+
+Code cleanup
diff --git a/packages/ozone/src/background.ts b/packages/ozone/src/background.ts
index 5730dd3963c..53aadbf4894 100644
--- a/packages/ozone/src/background.ts
+++ b/packages/ozone/src/background.ts
@@ -152,10 +152,8 @@ export class PeriodicBackgroundTask {
     // destroy it here.
 
     this.abortController.abort()
-    console.error('ABOOOORT')
 
     await this.intervalPromise
     this.intervalPromise = undefined
-    console.error('DONE -_-')
   }
 }

From e5d4c7462d70a495f7cc82c0ddf15a319e09dba1 Mon Sep 17 00:00:00 2001
From: Eric Bailey <git@esb.lol>
Date: Fri, 24 Jan 2025 14:59:31 -0600
Subject: [PATCH 032/101] Update confirm-email template (#2849)

---
 packages/pds/src/mailer/templates/confirm-email.hbs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/pds/src/mailer/templates/confirm-email.hbs b/packages/pds/src/mailer/templates/confirm-email.hbs
index 5fa9192c1d9..aaa14422f65 100644
--- a/packages/pds/src/mailer/templates/confirm-email.hbs
+++ b/packages/pds/src/mailer/templates/confirm-email.hbs
@@ -67,7 +67,12 @@
                     <p
                       style="font-size:16px;line-height:1.4;margin:0px 0px;letter-spacing:0.25px;color:hsl(211, 24%, 34.2%);font-family:-apple-system, BlinkMacSystemFont, &#x27;Roboto&#x27;, &#x27;Oxygen&#x27;, &#x27;Ubuntu&#x27;, &#x27;Cantarell&#x27;, &#x27;Fira Sans&#x27;, &#x27;Droid Sans&#x27;, &#x27;Helvetica Neue&#x27;, sans-serif;padding-top:12px;padding-bottom:12px;padding-right:32px"
                     >To confirm this email for your account, please enter the
-                      code below in the app.</p><code
+                      code below in the app or<!-- -->
+                      <a
+                        href="https://bsky.app/intent/verify-email?code={{token}}"
+                        style="color:#067df7;text-decoration:none;text-decoration-line:underline;font-size:16px;letter-spacing:0.25px"
+                        target="_blank"
+                      >click here.</a></p><code
                       style="display:block;padding:16px;border-radius:8px;border-width:1px;border-style:solid;background-color:hsl(211, 20%, 95.3%);border-color:hsl(211, 20%, 85.89999999999999%);font-size:14px;letter-spacing:0.25px;font-family:monospace;text-transform:uppercase"
                     >{{token}}</code>
                     <p

From 8c777f041f7899215709d1d59bcc8992d0e133b1 Mon Sep 17 00:00:00 2001
From: devin ivy <devinivy@gmail.com>
Date: Fri, 24 Jan 2025 18:07:59 -0500
Subject: [PATCH 033/101] Appview: add user-agent for feeds and resolving blobs
 (#3450)

appview: add user-agent for feeds and resolving blobs
---
 packages/bsky/src/api/app/bsky/feed/getFeed.ts | 3 ++-
 packages/bsky/src/api/blob-resolver.ts         | 3 +++
 packages/bsky/src/api/util.ts                  | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/bsky/src/api/app/bsky/feed/getFeed.ts b/packages/bsky/src/api/app/bsky/feed/getFeed.ts
index 8a89d956582..decd4a045fd 100644
--- a/packages/bsky/src/api/app/bsky/feed/getFeed.ts
+++ b/packages/bsky/src/api/app/bsky/feed/getFeed.ts
@@ -28,7 +28,7 @@ import {
   isDataplaneError,
   unpackIdentityServices,
 } from '../../../../data-plane'
-import { resHeaders } from '../../../util'
+import { BSKY_USER_AGENT, resHeaders } from '../../../util'
 import { ids } from '../../../../lexicon/lexicons'
 
 export default function (server: Server, ctx: AppContext) {
@@ -55,6 +55,7 @@ export default function (server: Server, ctx: AppContext) {
       const labelers = ctx.reqLabelers(req)
       const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer })
       const headers = noUndefinedVals({
+        'user-agent': BSKY_USER_AGENT,
         authorization: req.headers['authorization'],
         'accept-language': req.headers['accept-language'],
         'x-bsky-topics': Array.isArray(req.headers['x-bsky-topics'])
diff --git a/packages/bsky/src/api/blob-resolver.ts b/packages/bsky/src/api/blob-resolver.ts
index 95dc8f7ba1b..562c1003843 100644
--- a/packages/bsky/src/api/blob-resolver.ts
+++ b/packages/bsky/src/api/blob-resolver.ts
@@ -28,6 +28,7 @@ import {
 import { parseCid } from '../hydration/util'
 import { httpLogger as log } from '../logger'
 import { Middleware, proxyResponseHeaders, responseSignal } from '../util/http'
+import { BSKY_USER_AGENT } from './util'
 
 export function createMiddleware(ctx: AppContext): Middleware {
   return async (req, res, next) => {
@@ -298,6 +299,8 @@ function getBlobHeaders(
 ): Map<string, string> {
   const headers = new Map<string, string>()
 
+  headers.set('user-agent', BSKY_USER_AGENT)
+
   if (bypassKey && bypassHostname) {
     const matchesUrl = bypassHostname.startsWith('.')
       ? url.hostname.endsWith(bypassHostname)
diff --git a/packages/bsky/src/api/util.ts b/packages/bsky/src/api/util.ts
index 3ee0ea2c59b..e15cfe08499 100644
--- a/packages/bsky/src/api/util.ts
+++ b/packages/bsky/src/api/util.ts
@@ -1,5 +1,6 @@
 import { ParsedLabelers, formatLabelerHeader } from '../util'
 
+export const BSKY_USER_AGENT = 'BskyAppView'
 export const ATPROTO_CONTENT_LABELERS = 'Atproto-Content-Labelers'
 export const ATPROTO_REPO_REV = 'Atproto-Repo-Rev'
 

From a8f06939f94b3a5efee4b56c4de0e36502ff15fd Mon Sep 17 00:00:00 2001
From: devin ivy <devinivy@gmail.com>
Date: Fri, 24 Jan 2025 18:49:35 -0500
Subject: [PATCH 034/101] Appview: ensure takedowns on modlist authors always
 apply (#3192)

* appview: begin rewiring logic for applying modlist, based on owner status.

* appview: unify logic for checking list-block/mutes

* appview: apply actor takedowns for 3p list-blocks

* appview: apply actor takedowns for 1p list-blocks, fix dataplane method

* appview: test takedown on modlist author, application of list
---
 .../src/api/app/bsky/feed/getAuthorFeed.ts    |  10 +-
 .../data-plane/server/routes/relationships.ts | 104 +++++++++++-------
 packages/bsky/src/hydration/graph.ts          |  46 ++++----
 packages/bsky/src/hydration/hydrator.ts       |  85 ++++++++++----
 packages/bsky/src/views/index.ts              |  83 +++++++++-----
 packages/bsky/tests/views/author-feed.test.ts |   2 +-
 .../bsky/tests/views/labels-takedown.test.ts  |  29 +++++
 7 files changed, 248 insertions(+), 111 deletions(-)

diff --git a/packages/bsky/src/api/app/bsky/feed/getAuthorFeed.ts b/packages/bsky/src/api/app/bsky/feed/getAuthorFeed.ts
index 1aeaf65f291..d0804bde221 100644
--- a/packages/bsky/src/api/app/bsky/feed/getAuthorFeed.ts
+++ b/packages/bsky/src/api/app/bsky/feed/getAuthorFeed.ts
@@ -145,13 +145,19 @@ const noBlocksOrMutedReposts = (inputs: {
 }): Skeleton => {
   const { ctx, skeleton, hydration } = inputs
   const relationship = hydration.profileViewers?.get(skeleton.actor.did)
-  if (relationship?.blocking || relationship?.blockingByList) {
+  if (
+    relationship &&
+    (relationship.blocking || ctx.views.blockingByList(relationship, hydration))
+  ) {
     throw new InvalidRequestError(
       `Requester has blocked actor: ${skeleton.actor.did}`,
       'BlockedActor',
     )
   }
-  if (relationship?.blockedBy || relationship?.blockedByList) {
+  if (
+    relationship &&
+    (relationship.blockedBy || ctx.views.blockedByList(relationship, hydration))
+  ) {
     throw new InvalidRequestError(
       `Requester is blocked by actor: ${skeleton.actor.did}`,
       'BlockedByActor',
diff --git a/packages/bsky/src/data-plane/server/routes/relationships.ts b/packages/bsky/src/data-plane/server/routes/relationships.ts
index d6029e169e8..a291db9d20e 100644
--- a/packages/bsky/src/data-plane/server/routes/relationships.ts
+++ b/packages/bsky/src/data-plane/server/routes/relationships.ts
@@ -90,7 +90,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
   async getBlockExistence(req) {
     const { pairs } = req
     if (pairs.length === 0) {
-      return { exists: [] }
+      return { exists: [], blocks: [] }
     }
     const { ref } = db.db.dynamic
     const sourceRef = ref('pair.source')
@@ -101,48 +101,72 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       .select([
         sql<string>`${sourceRef}`.as('source'),
         sql<string>`${targetRef}`.as('target'),
+        (eb) =>
+          eb
+            .selectFrom('actor_block')
+            .whereRef('actor_block.creator', '=', sourceRef)
+            .whereRef('actor_block.subjectDid', '=', targetRef)
+            .select('uri')
+            .as('blocking'),
+        (eb) =>
+          eb
+            .selectFrom('actor_block')
+            .whereRef('actor_block.creator', '=', targetRef)
+            .whereRef('actor_block.subjectDid', '=', sourceRef)
+            .select('uri')
+            .as('blockedBy'),
+        (eb) =>
+          eb
+            .selectFrom('list_item')
+            .innerJoin(
+              'list_block',
+              'list_block.subjectUri',
+              'list_item.listUri',
+            )
+            .whereRef('list_block.creator', '=', sourceRef)
+            .whereRef('list_item.subjectDid', '=', targetRef)
+            .select('list_item.listUri')
+            .as('blockingByList'),
+        (eb) =>
+          eb
+            .selectFrom('list_item')
+            .innerJoin(
+              'list_block',
+              'list_block.subjectUri',
+              'list_item.listUri',
+            )
+            .whereRef('list_block.creator', '=', targetRef)
+            .whereRef('list_item.subjectDid', '=', sourceRef)
+            .select('list_item.listUri')
+            .as('blockedByList'),
       ])
-      .whereExists((qb) =>
-        qb
-          .selectFrom('actor_block')
-          .whereRef('actor_block.creator', '=', sourceRef)
-          .whereRef('actor_block.subjectDid', '=', targetRef)
-          .select('uri'),
-      )
-      .orWhereExists((qb) =>
-        qb
-          .selectFrom('actor_block')
-          .whereRef('actor_block.creator', '=', targetRef)
-          .whereRef('actor_block.subjectDid', '=', sourceRef)
-          .select('uri'),
-      )
-      .orWhereExists((qb) =>
-        qb
-          .selectFrom('list_item')
-          .innerJoin('list_block', 'list_block.subjectUri', 'list_item.listUri')
-          .whereRef('list_block.creator', '=', sourceRef)
-          .whereRef('list_item.subjectDid', '=', targetRef)
-          .select('list_item.listUri'),
-      )
-      .orWhereExists((qb) =>
-        qb
-          .selectFrom('list_item')
-          .innerJoin('list_block', 'list_block.subjectUri', 'list_item.listUri')
-          .whereRef('list_block.creator', '=', targetRef)
-          .whereRef('list_item.subjectDid', '=', sourceRef)
-          .select('list_item.listUri'),
-      )
       .execute()
-    const existMap = res.reduce((acc, cur) => {
-      const key = [cur.source, cur.target].sort().join(',')
-      return acc.set(key, true)
-    }, new Map<string, boolean>())
-    const exists = pairs.map((pair) => {
-      const key = [pair.a, pair.b].sort().join(',')
-      return existMap.get(key) === true
-    })
+    const getKey = (a, b) => [a, b].sort().join(',')
+    const lookup = res.reduce((acc, cur) => {
+      const key = getKey(cur.source, cur.target)
+      return acc.set(key, cur)
+    }, new Map<string, (typeof res)[0]>())
     return {
-      exists,
+      exists: pairs.map((pair) => {
+        const item = lookup.get(getKey(pair.a, pair.b))
+        if (!item) return false
+        return !!(
+          item.blocking ||
+          item.blockedBy ||
+          item.blockingByList ||
+          item.blockedByList
+        )
+      }),
+      blocks: pairs.map((pair) => {
+        const item = lookup.get(getKey(pair.a, pair.b))
+        if (!item) return {}
+        return {
+          blockedBy: item.blockedBy || undefined,
+          blocking: item.blocking || undefined,
+          blockedByList: item.blockedByList || undefined,
+          blockingByList: item.blockingByList || undefined,
+        }
+      }),
     }
   },
 })
diff --git a/packages/bsky/src/hydration/graph.ts b/packages/bsky/src/hydration/graph.ts
index 6556af42db0..a153e96ca65 100644
--- a/packages/bsky/src/hydration/graph.ts
+++ b/packages/bsky/src/hydration/graph.ts
@@ -46,50 +46,46 @@ export type ListAggs = HydrationMap<ListAgg>
 export type RelationshipPair = [didA: string, didB: string]
 
 const dedupePairs = (pairs: RelationshipPair[]): RelationshipPair[] => {
-  const mapped = pairs.reduce(
-    (acc, cur) => {
-      const sorted = ([...cur] as RelationshipPair).sort()
-      acc[sorted.join('-')] = sorted
-      return acc
-    },
-    {} as Record<string, RelationshipPair>,
-  )
-  return Object.values(mapped)
+  const deduped = pairs.reduce((acc, pair) => {
+    return acc.set(Blocks.key(...pair), pair)
+  }, new Map<string, RelationshipPair>())
+  return [...deduped.values()]
 }
 
 export class Blocks {
-  _blocks: Map<string, boolean> = new Map()
+  _blocks: Map<string, BlockEntry> = new Map() // did:a,did:b -> block
   constructor() {}
 
   static key(didA: string, didB: string): string {
     return [didA, didB].sort().join(',')
   }
 
-  set(didA: string, didB: string, exists: boolean): Blocks {
+  set(didA: string, didB: string, block: BlockEntry): Blocks {
     const key = Blocks.key(didA, didB)
-    this._blocks.set(key, exists)
+    this._blocks.set(key, block)
     return this
   }
 
-  has(didA: string, didB: string): boolean {
+  get(didA: string, didB: string): BlockEntry | null {
+    if (didA === didB) return null // ignore self-blocks
     const key = Blocks.key(didA, didB)
-    return this._blocks.has(key)
-  }
-
-  isBlocked(didA: string, didB: string): boolean {
-    if (didA === didB) return false // ignore self-blocks
-    const key = Blocks.key(didA, didB)
-    return this._blocks.get(key) ?? false
+    return this._blocks.get(key) ?? null
   }
 
   merge(blocks: Blocks): Blocks {
-    blocks._blocks.forEach((exists, key) => {
-      this._blocks.set(key, exists)
+    blocks._blocks.forEach((block, key) => {
+      this._blocks.set(key, block)
     })
     return this
   }
 }
 
+// No "blocking" vs. "blocked" directionality: only suitable for bidirectional block checks
+export type BlockEntry = {
+  blockUri: string | undefined
+  blockListUri: string | undefined
+}
+
 export class GraphHydrator {
   constructor(public dataplane: DataPlaneClient) {}
 
@@ -162,7 +158,11 @@ export class GraphHydrator {
     const blocks = new Blocks()
     for (let i = 0; i < deduped.length; i++) {
       const pair = deduped[i]
-      blocks.set(pair.a, pair.b, res.exists[i] ?? false)
+      const block = res.blocks[i]
+      blocks.set(pair.a, pair.b, {
+        blockUri: block.blockedBy || block.blocking || undefined,
+        blockListUri: block.blockedByList || block.blockingByList || undefined,
+      })
     }
     return blocks
   }
diff --git a/packages/bsky/src/hydration/hydrator.ts b/packages/bsky/src/hydration/hydrator.ts
index fb19a5cbf3a..39d6015e6a9 100644
--- a/packages/bsky/src/hydration/hydrator.ts
+++ b/packages/bsky/src/hydration/hydrator.ts
@@ -43,7 +43,7 @@ import {
   mergeNestedMaps,
   mergeManyMaps,
 } from './util'
-import { uriToDid as didFromUri } from '../util/uris'
+import { uriToDid as didFromUri, uriToDid } from '../util/uris'
 import {
   FeedGenAggs,
   FeedGens,
@@ -279,10 +279,11 @@ export class Hydrator {
   //   - profile basic
   async hydrateLists(uris: string[], ctx: HydrateCtx): Promise<HydrationState> {
     const [listsState, profilesState] = await Promise.all([
-      await this.hydrateListsBasic(uris, ctx),
-      await this.hydrateProfilesBasic(uris.map(didFromUri), ctx),
+      this.hydrateListsBasic(uris, ctx, {
+        skipAuthors: true, // handled via author profile hydration
+      }),
+      this.hydrateProfilesBasic(uris.map(didFromUri), ctx),
     ])
-
     return mergeStates(listsState, profilesState)
   }
 
@@ -291,19 +292,26 @@ export class Hydrator {
   async hydrateListsBasic(
     uris: string[],
     ctx: HydrateCtx,
+    opts?: { skipAuthors: boolean },
   ): Promise<HydrationState> {
-    const [lists, listAggs, listViewers, labels] = await Promise.all([
+    const includeAuthorDids = opts?.skipAuthors ? [] : uris.map(uriToDid)
+    const [lists, listAggs, listViewers, labels, actors] = await Promise.all([
       this.graph.getLists(uris, ctx.includeTakedowns),
       this.graph.getListAggregates(uris.map((uri) => ({ uri }))),
       ctx.viewer ? this.graph.getListViewerStates(uris, ctx.viewer) : undefined,
-      this.label.getLabelsForSubjects(uris, ctx.labelers),
+      this.label.getLabelsForSubjects(
+        [...uris, ...includeAuthorDids],
+        ctx.labelers,
+      ),
+      this.actor.getActors(includeAuthorDids, ctx.includeTakedowns),
     ])
 
     if (!ctx.includeTakedowns) {
       actionTakedownLabels(uris, lists, labels)
+      actionTakedownLabels(includeAuthorDids, actors, labels)
     }
 
-    return { lists, listAggs, listViewers, labels, ctx }
+    return { lists, listAggs, listViewers, labels, actors, ctx }
   }
 
   // app.bsky.graph.defs#listItemView
@@ -533,12 +541,14 @@ export class Hydrator {
       }
     }
     // replace embed/parent/root pairs with block state
-    const blocks = await this.graph.getBidirectionalBlocks(relationships)
+    const blocks = await this.hydrateBidirectionalBlocks(
+      pairsToMap(relationships),
+    )
     for (const [uri, { embed, parent, root }] of postBlocksPairs) {
       postBlocks.set(uri, {
-        embed: !!embed && blocks.isBlocked(...embed),
-        parent: !!parent && blocks.isBlocked(...parent),
-        root: !!root && blocks.isBlocked(...root),
+        embed: !!embed && !!isBlocked(blocks, embed),
+        parent: !!parent && !!isBlocked(blocks, parent),
+        root: !!root && !!isBlocked(blocks, root),
       })
     }
     return postBlocks
@@ -756,8 +766,8 @@ export class Hydrator {
         )
       },
     )
-    const blocks = await this.graph.getBidirectionalBlocks(
-      listCreatorMemberPairs,
+    const blocks = await this.hydrateBidirectionalBlocks(
+      pairsToMap(listCreatorMemberPairs),
     )
     // sample top list items per starter pack based on their follows
     const listMemberAggs = await this.actor.getProfileAggregates(listMemberDids)
@@ -772,7 +782,8 @@ export class Hydrator {
       // update aggregation with list items for top 12 most followed members
       agg.listItemSampleUris = [
         ...members.listitems.filter(
-          (li) => ctx.viewer === creator || !blocks?.isBlocked(creator, li.did),
+          (li) =>
+            ctx.viewer === creator || !isBlocked(blocks, [creator, li.did]),
         ),
       ]
         .sort((li1, li2) => {
@@ -814,11 +825,11 @@ export class Hydrator {
         pairs.push([authorDid, didFromUri(uri)])
       }
     }
-    const blocks = await this.graph.getBidirectionalBlocks(pairs)
+    const blocks = await this.hydrateBidirectionalBlocks(pairsToMap(pairs))
     const likeBlocks = new HydrationMap<LikeBlock>()
     for (const [uri, like] of likes) {
       if (like) {
-        likeBlocks.set(uri, blocks.isBlocked(authorDid, didFromUri(uri)))
+        likeBlocks.set(uri, isBlocked(blocks, [authorDid, didFromUri(uri)]))
       } else {
         likeBlocks.set(uri, null)
       }
@@ -898,13 +909,13 @@ export class Hydrator {
         pairs.push([didFromUri(uri), follow.record.subject])
       }
     }
-    const blocks = await this.graph.getBidirectionalBlocks(pairs)
+    const blocks = await this.hydrateBidirectionalBlocks(pairsToMap(pairs))
     const followBlocks = new HydrationMap<FollowBlock>()
     for (const [uri, follow] of follows) {
       if (follow) {
         followBlocks.set(
           uri,
-          blocks.isBlocked(didFromUri(uri), follow.record.subject),
+          isBlocked(blocks, [didFromUri(uri), follow.record.subject]),
         )
       } else {
         followBlocks.set(uri, null)
@@ -926,10 +937,32 @@ export class Hydrator {
     const result = new HydrationMap<HydrationMap<boolean>>()
     const blocks = await this.graph.getBidirectionalBlocks(pairs)
 
+    // lookup list authors to apply takedown status to blocklists
+    const listAuthorDids = new Set<string>()
+    for (const [source, targets] of didMap) {
+      for (const target of targets) {
+        const block = blocks.get(source, target)
+        if (block?.blockListUri) {
+          listAuthorDids.add(uriToDid(block.blockListUri))
+        }
+      }
+    }
+
+    const activeListAuthors = await this.actor.getActors(
+      [...listAuthorDids],
+      false,
+    )
+
     for (const [source, targets] of didMap) {
       const didBlocks = new HydrationMap<boolean>()
       for (const target of targets) {
-        didBlocks.set(target, blocks.isBlocked(source, target))
+        const block = blocks.get(source, target)
+        const isBlocked = !!(
+          block?.blockUri ||
+          (block?.blockListUri &&
+            activeListAuthors.get(uriToDid(block.blockListUri)))
+        )
+        didBlocks.set(target, isBlocked)
       }
       result.set(source, didBlocks)
     }
@@ -1198,6 +1231,20 @@ const getListUrisFromThreadgates = (gates: Threadgates) => {
   return uris
 }
 
+const isBlocked = (blocks: BidirectionalBlocks, [a, b]: RelationshipPair) => {
+  return blocks.get(a)?.get(b) ?? null
+}
+
+const pairsToMap = (pairs: RelationshipPair[]): Map<string, string[]> => {
+  const map = new Map<string, string[]>()
+  for (const [a, b] of pairs) {
+    const list = map.get(a) ?? []
+    list.push(b)
+    map.set(a, list)
+  }
+  return map
+}
+
 export const mergeStates = (
   stateA: HydrationState,
   stateB: HydrationState,
diff --git a/packages/bsky/src/views/index.ts b/packages/bsky/src/views/index.ts
index 0d3d2ec576b..e0290eb9b83 100644
--- a/packages/bsky/src/views/index.ts
+++ b/packages/bsky/src/views/index.ts
@@ -7,7 +7,7 @@ import {
   ProfileViewDetailed,
   ProfileView,
   ProfileViewBasic,
-  ViewerState as ProfileViewerState,
+  ViewerState as ProfileViewer,
 } from '../lexicon/types/app/bsky/actor/defs'
 import {
   BlockedPost,
@@ -35,7 +35,11 @@ import {
   VideoUriBuilder,
   parsePostgate,
 } from './util'
-import { uriToDid as creatorFromUri, safePinnedPost } from '../util/uris'
+import {
+  uriToDid as creatorFromUri,
+  safePinnedPost,
+  uriToDid,
+} from '../util/uris'
 import { isListRule } from '../lexicon/types/app/bsky/feed/threadgate'
 import { isSelfLabels } from '../lexicon/types/com/atproto/label/defs'
 import {
@@ -73,6 +77,7 @@ import {
 } from '../lexicon/types/app/bsky/labeler/defs'
 import { Notification } from '../proto/bsky_pb'
 import { postUriToThreadgateUri, postUriToPostgateUri } from '../util/uris'
+import { ProfileViewerState } from '../hydration/actor'
 
 export class Views {
   public imgUriBuilder: ImageUriBuilder = this.opts.imgUriBuilder
@@ -101,9 +106,10 @@ export class Views {
   }
 
   actorIsTakendown(did: string, state: HydrationState): boolean {
-    if (state.actors?.get(did)?.takedownRef) return true
-    if (state.actors?.get(did)?.upstreamStatus === 'takendown') return true
-    if (state.actors?.get(did)?.upstreamStatus === 'suspended') return true
+    const actor = state.actors?.get(did)
+    if (actor?.takedownRef) return true
+    if (actor?.upstreamStatus === 'takendown') return true
+    if (actor?.upstreamStatus === 'suspended') return true
     if (state.labels?.get(did)?.isTakendown) return true
     return false
   }
@@ -111,18 +117,45 @@ export class Views {
   viewerBlockExists(did: string, state: HydrationState): boolean {
     const actor = state.profileViewers?.get(did)
     if (!actor) return false
-    return (
-      !!actor.blockedBy ||
-      !!actor.blocking ||
-      !!actor.blockedByList ||
-      !!actor.blockingByList
+    return !!(
+      actor.blockedBy ||
+      actor.blocking ||
+      this.blockedByList(actor, state) ||
+      this.blockingByList(actor, state)
     )
   }
 
   viewerMuteExists(did: string, state: HydrationState): boolean {
     const actor = state.profileViewers?.get(did)
     if (!actor) return false
-    return actor.muted || !!actor.mutedByList
+    return !!(actor.muted || this.mutedByList(actor, state))
+  }
+
+  blockingByList(viewer: ProfileViewerState, state: HydrationState) {
+    return (
+      viewer.blockingByList && this.recordActive(viewer.blockingByList, state)
+    )
+  }
+
+  blockedByList(viewer: ProfileViewerState, state: HydrationState) {
+    return (
+      viewer.blockedByList && this.recordActive(viewer.blockedByList, state)
+    )
+  }
+
+  mutedByList(viewer: ProfileViewerState, state: HydrationState) {
+    return viewer.mutedByList && this.recordActive(viewer.mutedByList, state)
+  }
+
+  recordActive(uri: string, state: HydrationState) {
+    const did = uriToDid(uri)
+    const actor = state.actors?.get(did)
+    if (!actor || this.actorIsTakendown(did, state)) {
+      // actor may not be present when takedowns are eagerly applied during hydration.
+      // so it's important to _try_ to hydrate the actor for records checked this way.
+      return
+    }
+    return uri
   }
 
   viewerSeesNeedsReview(did: string, state: HydrationState): boolean {
@@ -276,24 +309,22 @@ export class Views {
     }
   }
 
-  profileViewer(
-    did: string,
-    state: HydrationState,
-  ): ProfileViewerState | undefined {
+  profileViewer(did: string, state: HydrationState): ProfileViewer | undefined {
     const viewer = state.profileViewers?.get(did)
     if (!viewer) return
-    const blockedByUri = viewer.blockedBy || viewer.blockedByList
-    const blockingUri = viewer.blocking || viewer.blockingByList
+    const blockedByList = this.blockedByList(viewer, state)
+    const blockedByUri = viewer.blockedBy || blockedByList
+    const blockingByList = this.blockingByList(viewer, state)
+    const blockingUri = viewer.blocking || blockingByList
     const block = !!blockedByUri || !!blockingUri
+    const mutedByList = this.mutedByList(viewer, state)
     return {
-      muted: viewer.muted || !!viewer.mutedByList,
-      mutedByList: viewer.mutedByList
-        ? this.listBasic(viewer.mutedByList, state)
-        : undefined,
+      muted: !!(viewer.muted || mutedByList),
+      mutedByList: mutedByList ? this.listBasic(mutedByList, state) : undefined,
       blockedBy: !!blockedByUri,
       blocking: blockingUri,
-      blockingByList: viewer.blockingByList
-        ? this.listBasic(viewer.blockingByList, state)
+      blockingByList: blockingByList
+        ? this.listBasic(blockingByList, state)
         : undefined,
       following: viewer.following && !block ? viewer.following : undefined,
       followedBy: viewer.followedBy && !block ? viewer.followedBy : undefined,
@@ -323,11 +354,11 @@ export class Views {
   blockedProfileViewer(
     did: string,
     state: HydrationState,
-  ): ProfileViewerState | undefined {
+  ): ProfileViewer | undefined {
     const viewer = state.profileViewers?.get(did)
     if (!viewer) return
-    const blockedByUri = viewer.blockedBy || viewer.blockedByList
-    const blockingUri = viewer.blocking || viewer.blockingByList
+    const blockedByUri = viewer.blockedBy || this.blockedByList(viewer, state)
+    const blockingUri = viewer.blocking || this.blockingByList(viewer, state)
     return {
       blockedBy: !!blockedByUri,
       blocking: blockingUri,
diff --git a/packages/bsky/tests/views/author-feed.test.ts b/packages/bsky/tests/views/author-feed.test.ts
index 50c105d2342..6c42ab04c45 100644
--- a/packages/bsky/tests/views/author-feed.test.ts
+++ b/packages/bsky/tests/views/author-feed.test.ts
@@ -487,7 +487,7 @@ describe('pds author feed views', () => {
       await sc.post(alice, 'not pinned post')
       const post = await createAndPinPost()
       await sc.post(alice, 'not pinned post')
-
+      await network.processAll()
       const { data } = await agent.api.app.bsky.feed.getAuthorFeed(
         { actor: sc.accounts[alice].handle, includePins: true },
         {
diff --git a/packages/bsky/tests/views/labels-takedown.test.ts b/packages/bsky/tests/views/labels-takedown.test.ts
index 5e2e58581bb..f77e9820c8b 100644
--- a/packages/bsky/tests/views/labels-takedown.test.ts
+++ b/packages/bsky/tests/views/labels-takedown.test.ts
@@ -37,6 +37,16 @@ describe('bsky takedown labels', () => {
       sc.getHeaders(sc.dids.carol),
     )
     carolListRef = await sc.createList(sc.dids.carol, 'carol list', 'mod')
+    // alice blocks dan via carol's list, and carol is takendown
+    await sc.addToList(sc.dids.carol, sc.dids.dan, carolListRef)
+    await pdsAgent.app.bsky.graph.listblock.create(
+      { repo: sc.dids.alice },
+      {
+        subject: carolListRef.uriStr,
+        createdAt: new Date().toISOString(),
+      },
+      sc.getHeaders(sc.dids.alice),
+    )
     aliceGenRef = await sc.createFeedGen(
       sc.dids.alice,
       'did:web:example.com',
@@ -190,6 +200,25 @@ describe('bsky takedown labels', () => {
     expect(profile.viewer?.blockingByList).toBeUndefined()
   })
 
+  it('author takedown halts application of mod lists', async () => {
+    const { data: profile } = await agent.app.bsky.actor.getProfile(
+      {
+        actor: sc.dids.dan, // blocked via carol's list, and carol is takendown
+      },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.alice,
+          ids.AppBskyActorGetProfile,
+        ),
+      },
+    )
+    expect(profile.did).toBe(sc.dids.dan)
+    expect(profile.viewer).not.toBeUndefined()
+    expect(profile.viewer?.blockedBy).toBe(false)
+    expect(profile.viewer?.blocking).toBeUndefined()
+    expect(profile.viewer?.blockingByList).toBeUndefined()
+  })
+
   it('takesdown feed generators', async () => {
     const res = await agent.api.app.bsky.feed.getFeedGenerators({
       feeds: [aliceGenRef.uriStr, bobGenRef.uriStr, carolGenRef.uriStr],

From 933b6ba36e6bb5ec2d5d1aa4a72cb80375e3cbcb Mon Sep 17 00:00:00 2001
From: Matthieu Sieben <matthieusieben@users.noreply.github.com>
Date: Sun, 26 Jan 2025 21:29:28 +0100
Subject: [PATCH 035/101] Improve codegen script (#3465)

paralellize codegen
---
 Makefile     | 7 +------
 package.json | 1 +
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index d7424038a49..81b7b8acf67 100644
--- a/Makefile
+++ b/Makefile
@@ -28,12 +28,7 @@ run-dev-env-logged: ## Run a "development environment" shell (with logging)
 
 .PHONY: codegen
 codegen: ## Re-generate packages from lexicon/ files
-	cd packages/api; pnpm run codegen
-	cd packages/pds; pnpm run codegen
-	cd packages/bsky; pnpm run codegen
-	cd packages/ozone; pnpm run codegen
-	# clean up codegen output
-	pnpm format
+	pnpm codegen
 
 .PHONY: lint
 lint: ## Run style checks and verify syntax
diff --git a/package.json b/package.json
index 080ec6fcdbf..e9de3327688 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
     "verify:lint": "pnpm lint",
     "verify:types": "tsc --build tsconfig.json",
     "format": "pnpm lint:fix && pnpm style:fix",
+    "codegen": "pnpm run --recursive --stream --filter '@atproto/lex-cli...' build --force && pnpm run --recursive --stream --parallel codegen",
     "build": "pnpm --recursive --stream build",
     "dev": "NODE_ENV=development pnpm --stream '/^dev:.+$/'",
     "dev:tsc": "tsc --build tsconfig.json --watch",

From 8810885b8e7fa0377e6c000c091eec1dd85ed261 Mon Sep 17 00:00:00 2001
From: Matthieu Sieben <matthieusieben@users.noreply.github.com>
Date: Sun, 26 Jan 2025 22:24:03 +0100
Subject: [PATCH 036/101] fix pds tests flakiness (#3463)

---
 .changeset/lemon-adults-sparkle.md                   |  5 +++++
 .changeset/tall-kings-poke.md                        |  5 +++++
 packages/ozone/src/mod-service/views.ts              |  2 +-
 .../tests/__snapshots__/get-record.test.ts.snap      |  4 ++--
 .../tests/__snapshots__/get-records.test.ts.snap     |  2 +-
 .../ozone/tests/__snapshots__/get-repo.test.ts.snap  |  2 +-
 .../ozone/tests/__snapshots__/get-repos.test.ts.snap |  2 +-
 .../__snapshots__/moderation-events.test.ts.snap     |  2 +-
 .../__snapshots__/moderation-statuses.test.ts.snap   | 12 ++++++------
 .../tests/__snapshots__/takedown-appeal.test.ts.snap |  7 ++++++-
 .../tests/proxied/__snapshots__/admin.test.ts.snap   |  6 +++---
 packages/pds/tests/sequencer.test.ts                 |  4 ++++
 packages/pds/tests/takedown-appeal.test.ts           |  2 ++
 13 files changed, 38 insertions(+), 17 deletions(-)
 create mode 100644 .changeset/lemon-adults-sparkle.md
 create mode 100644 .changeset/tall-kings-poke.md

diff --git a/.changeset/lemon-adults-sparkle.md b/.changeset/lemon-adults-sparkle.md
new file mode 100644
index 00000000000..1b6104750ac
--- /dev/null
+++ b/.changeset/lemon-adults-sparkle.md
@@ -0,0 +1,5 @@
+---
+"@atproto/ozone": patch
+---
+
+Fix typo in recordsStats's $type property
diff --git a/.changeset/tall-kings-poke.md b/.changeset/tall-kings-poke.md
new file mode 100644
index 00000000000..de58a7ff90f
--- /dev/null
+++ b/.changeset/tall-kings-poke.md
@@ -0,0 +1,5 @@
+---
+"@atproto/pds": patch
+---
+
+Fix flaky tests
diff --git a/packages/ozone/src/mod-service/views.ts b/packages/ozone/src/mod-service/views.ts
index 12a3d9f018c..b52f8b47a9c 100644
--- a/packages/ozone/src/mod-service/views.ts
+++ b/packages/ozone/src/mod-service/views.ts
@@ -628,7 +628,7 @@ export class ModerationViews {
 
       recordsStats: {
         // Explicitly typing to allow for easy manipulation (e.g. to strip from tests snapshots)
-        $type: 'tools.ozone.moderation.defs#recordStats',
+        $type: 'tools.ozone.moderation.defs#recordsStats',
 
         // account_record_events_stats
         totalReports: status.totalReports ?? undefined,
diff --git a/packages/ozone/tests/__snapshots__/get-record.test.ts.snap b/packages/ozone/tests/__snapshots__/get-record.test.ts.snap
index bed827aced6..43eb46abd6b 100644
--- a/packages/ozone/tests/__snapshots__/get-record.test.ts.snap
+++ b/packages/ozone/tests/__snapshots__/get-record.test.ts.snap
@@ -41,7 +41,7 @@ Object {
       "lastReviewedAt": "1970-01-01T00:00:00.000Z",
       "lastReviewedBy": "user(1)",
       "recordsStats": Object {
-        "$type": "tools.ozone.moderation.defs#recordStats",
+        "$type": "tools.ozone.moderation.defs#recordsStats",
         "appealedCount": 0,
         "escalatedCount": 0,
         "pendingCount": 0,
@@ -161,7 +161,7 @@ Object {
       "lastReviewedAt": "1970-01-01T00:00:00.000Z",
       "lastReviewedBy": "user(1)",
       "recordsStats": Object {
-        "$type": "tools.ozone.moderation.defs#recordStats",
+        "$type": "tools.ozone.moderation.defs#recordsStats",
         "appealedCount": 0,
         "escalatedCount": 0,
         "pendingCount": 0,
diff --git a/packages/ozone/tests/__snapshots__/get-records.test.ts.snap b/packages/ozone/tests/__snapshots__/get-records.test.ts.snap
index 05f6f6f3273..4c95700ffe3 100644
--- a/packages/ozone/tests/__snapshots__/get-records.test.ts.snap
+++ b/packages/ozone/tests/__snapshots__/get-records.test.ts.snap
@@ -44,7 +44,7 @@ Object {
           "lastReviewedAt": "1970-01-01T00:00:00.000Z",
           "lastReviewedBy": "user(1)",
           "recordsStats": Object {
-            "$type": "tools.ozone.moderation.defs#recordStats",
+            "$type": "tools.ozone.moderation.defs#recordsStats",
             "appealedCount": 0,
             "escalatedCount": 0,
             "pendingCount": 0,
diff --git a/packages/ozone/tests/__snapshots__/get-repo.test.ts.snap b/packages/ozone/tests/__snapshots__/get-repo.test.ts.snap
index d548cd9d844..87c9000dbc0 100644
--- a/packages/ozone/tests/__snapshots__/get-repo.test.ts.snap
+++ b/packages/ozone/tests/__snapshots__/get-repo.test.ts.snap
@@ -40,7 +40,7 @@ Object {
       "lastReviewedAt": "1970-01-01T00:00:00.000Z",
       "lastReviewedBy": "user(1)",
       "recordsStats": Object {
-        "$type": "tools.ozone.moderation.defs#recordStats",
+        "$type": "tools.ozone.moderation.defs#recordsStats",
       },
       "reviewState": "tools.ozone.moderation.defs#reviewClosed",
       "subject": Object {
diff --git a/packages/ozone/tests/__snapshots__/get-repos.test.ts.snap b/packages/ozone/tests/__snapshots__/get-repos.test.ts.snap
index 1da0c8ab0fb..2f6c4f81fb0 100644
--- a/packages/ozone/tests/__snapshots__/get-repos.test.ts.snap
+++ b/packages/ozone/tests/__snapshots__/get-repos.test.ts.snap
@@ -43,7 +43,7 @@ Object {
           "lastReviewedAt": "1970-01-01T00:00:00.000Z",
           "lastReviewedBy": "user(1)",
           "recordsStats": Object {
-            "$type": "tools.ozone.moderation.defs#recordStats",
+            "$type": "tools.ozone.moderation.defs#recordsStats",
           },
           "reviewState": "tools.ozone.moderation.defs#reviewClosed",
           "subject": Object {
diff --git a/packages/ozone/tests/__snapshots__/moderation-events.test.ts.snap b/packages/ozone/tests/__snapshots__/moderation-events.test.ts.snap
index 3aaf889373b..cca025f41b3 100644
--- a/packages/ozone/tests/__snapshots__/moderation-events.test.ts.snap
+++ b/packages/ozone/tests/__snapshots__/moderation-events.test.ts.snap
@@ -36,7 +36,7 @@ Object {
         "lastReviewedAt": "1970-01-01T00:00:00.000Z",
         "lastReviewedBy": "user(1)",
         "recordsStats": Object {
-          "$type": "tools.ozone.moderation.defs#recordStats",
+          "$type": "tools.ozone.moderation.defs#recordsStats",
           "appealedCount": 0,
           "escalatedCount": 0,
           "pendingCount": 2,
diff --git a/packages/ozone/tests/__snapshots__/moderation-statuses.test.ts.snap b/packages/ozone/tests/__snapshots__/moderation-statuses.test.ts.snap
index 9e1258212db..cc145f6bf2f 100644
--- a/packages/ozone/tests/__snapshots__/moderation-statuses.test.ts.snap
+++ b/packages/ozone/tests/__snapshots__/moderation-statuses.test.ts.snap
@@ -19,7 +19,7 @@ Array [
     "id": 7,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
     "recordsStats": Object {
-      "$type": "tools.ozone.moderation.defs#recordStats",
+      "$type": "tools.ozone.moderation.defs#recordsStats",
       "appealedCount": 0,
       "escalatedCount": 0,
       "pendingCount": 1,
@@ -62,7 +62,7 @@ Array [
     "id": 5,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
     "recordsStats": Object {
-      "$type": "tools.ozone.moderation.defs#recordStats",
+      "$type": "tools.ozone.moderation.defs#recordsStats",
       "appealedCount": 0,
       "escalatedCount": 0,
       "pendingCount": 1,
@@ -109,7 +109,7 @@ Array [
     "id": 7,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
     "recordsStats": Object {
-      "$type": "tools.ozone.moderation.defs#recordStats",
+      "$type": "tools.ozone.moderation.defs#recordsStats",
       "appealedCount": 0,
       "escalatedCount": 0,
       "pendingCount": 1,
@@ -152,7 +152,7 @@ Array [
     "id": 5,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
     "recordsStats": Object {
-      "$type": "tools.ozone.moderation.defs#recordStats",
+      "$type": "tools.ozone.moderation.defs#recordsStats",
       "appealedCount": 0,
       "escalatedCount": 0,
       "pendingCount": 1,
@@ -194,7 +194,7 @@ Array [
     "id": 3,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
     "recordsStats": Object {
-      "$type": "tools.ozone.moderation.defs#recordStats",
+      "$type": "tools.ozone.moderation.defs#recordsStats",
       "appealedCount": 0,
       "escalatedCount": 0,
       "pendingCount": 1,
@@ -236,7 +236,7 @@ Array [
     "id": 1,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
     "recordsStats": Object {
-      "$type": "tools.ozone.moderation.defs#recordStats",
+      "$type": "tools.ozone.moderation.defs#recordsStats",
       "appealedCount": 0,
       "escalatedCount": 0,
       "pendingCount": 1,
diff --git a/packages/pds/tests/__snapshots__/takedown-appeal.test.ts.snap b/packages/pds/tests/__snapshots__/takedown-appeal.test.ts.snap
index 1e7e1c31845..cb103a8defa 100644
--- a/packages/pds/tests/__snapshots__/takedown-appeal.test.ts.snap
+++ b/packages/pds/tests/__snapshots__/takedown-appeal.test.ts.snap
@@ -4,6 +4,11 @@ exports[`appeal account takedown actor takedown allows appeal request. 1`] = `
 Object {
   "accountStats": Object {
     "$type": "tools.ozone.moderation.defs#accountStats",
+    "appealCount": 0,
+    "escalateCount": 0,
+    "reportCount": 0,
+    "suspendCount": 0,
+    "takedownCount": 1,
   },
   "appealed": true,
   "createdAt": "1970-01-01T00:00:00.000Z",
@@ -17,7 +22,7 @@ Object {
   "lastReviewedAt": "1970-01-01T00:00:00.000Z",
   "lastReviewedBy": "user(0)",
   "recordsStats": Object {
-    "$type": "tools.ozone.moderation.defs#recordStats",
+    "$type": "tools.ozone.moderation.defs#recordsStats",
   },
   "reviewState": "tools.ozone.moderation.defs#reviewEscalated",
   "subject": Object {
diff --git a/packages/pds/tests/proxied/__snapshots__/admin.test.ts.snap b/packages/pds/tests/proxied/__snapshots__/admin.test.ts.snap
index 32f98e2ae62..1886696a4ac 100644
--- a/packages/pds/tests/proxied/__snapshots__/admin.test.ts.snap
+++ b/packages/pds/tests/proxied/__snapshots__/admin.test.ts.snap
@@ -160,7 +160,7 @@ Object {
         "lastReviewedAt": "1970-01-01T00:00:00.000Z",
         "lastReviewedBy": "user(1)",
         "recordsStats": Object {
-          "$type": "tools.ozone.moderation.defs#recordStats",
+          "$type": "tools.ozone.moderation.defs#recordsStats",
           "appealedCount": 0,
           "escalatedCount": 0,
           "pendingCount": 0,
@@ -276,7 +276,7 @@ Object {
       "lastReviewedAt": "1970-01-01T00:00:00.000Z",
       "lastReviewedBy": "user(1)",
       "recordsStats": Object {
-        "$type": "tools.ozone.moderation.defs#recordStats",
+        "$type": "tools.ozone.moderation.defs#recordsStats",
         "appealedCount": 0,
         "escalatedCount": 0,
         "pendingCount": 0,
@@ -357,7 +357,7 @@ Object {
         "lastReviewedAt": "1970-01-01T00:00:00.000Z",
         "lastReviewedBy": "user(1)",
         "recordsStats": Object {
-          "$type": "tools.ozone.moderation.defs#recordStats",
+          "$type": "tools.ozone.moderation.defs#recordsStats",
           "appealedCount": 0,
           "escalatedCount": 0,
           "pendingCount": 0,
diff --git a/packages/pds/tests/sequencer.test.ts b/packages/pds/tests/sequencer.test.ts
index 137f4c99978..184463b8ddc 100644
--- a/packages/pds/tests/sequencer.test.ts
+++ b/packages/pds/tests/sequencer.test.ts
@@ -37,6 +37,10 @@ describe('sequencer', () => {
     totalEvts = 14
   })
 
+  beforeEach(async () => {
+    await network.processAll()
+  })
+
   afterAll(async () => {
     await network.close()
   })
diff --git a/packages/pds/tests/takedown-appeal.test.ts b/packages/pds/tests/takedown-appeal.test.ts
index 498b42a379c..afe1bbd791e 100644
--- a/packages/pds/tests/takedown-appeal.test.ts
+++ b/packages/pds/tests/takedown-appeal.test.ts
@@ -61,6 +61,8 @@ describe('appeal account takedown', () => {
       },
     )
 
+    await network.processAll()
+
     // Verify user can not get session token without setting the optional param
     await expect(
       agent.com.atproto.server.createSession({

From fb64d50ee220316b9f1183e5c3259629489734c9 Mon Sep 17 00:00:00 2001
From: Matthieu Sieben <matthieusieben@users.noreply.github.com>
Date: Sun, 26 Jan 2025 22:24:27 +0100
Subject: [PATCH 037/101] Explicitly allow "undefined" values in `headers`
 (#3456)

* Explicitly allow "undefined" values in `headers`

* fix tests types
---
 .changeset/rude-laws-join.md                               | 5 +++++
 packages/bsky/src/api/app/bsky/actor/getSuggestions.ts     | 7 ++++---
 .../src/api/app/bsky/graph/getSuggestedFollowsByActor.ts   | 5 +++--
 packages/bsky/tests/label-hydration.test.ts                | 7 +++++--
 packages/pds/tests/proxied/read-after-write.test.ts        | 2 +-
 packages/xrpc/src/types.ts                                 | 2 +-
 6 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 .changeset/rude-laws-join.md

diff --git a/.changeset/rude-laws-join.md b/.changeset/rude-laws-join.md
new file mode 100644
index 00000000000..894032e2262
--- /dev/null
+++ b/.changeset/rude-laws-join.md
@@ -0,0 +1,5 @@
+---
+"@atproto/xrpc": patch
+---
+
+Explicitly allow "undefined" values in `headers`
diff --git a/packages/bsky/src/api/app/bsky/actor/getSuggestions.ts b/packages/bsky/src/api/app/bsky/actor/getSuggestions.ts
index 911b9cdcefe..4af0927feed 100644
--- a/packages/bsky/src/api/app/bsky/actor/getSuggestions.ts
+++ b/packages/bsky/src/api/app/bsky/actor/getSuggestions.ts
@@ -1,4 +1,6 @@
 import { mapDefined, noUndefinedVals } from '@atproto/common'
+import { AtpAgent } from '@atproto/api'
+import { HeadersMap } from '@atproto/xrpc'
 import AppContext from '../../../../context'
 import { Server } from '../../../../lexicon'
 import { QueryParams } from '../../../../lexicon/types/app/bsky/actor/getSuggestions'
@@ -12,7 +14,6 @@ import { Views } from '../../../../views'
 import { DataPlaneClient } from '../../../../data-plane'
 import { parseString } from '../../../../hydration/util'
 import { resHeaders } from '../../../util'
-import { AtpAgent } from '@atproto/api'
 
 export default function (server: Server, ctx: AppContext) {
   const getSuggestions = createPipeline(
@@ -144,12 +145,12 @@ type Context = {
 
 type Params = QueryParams & {
   hydrateCtx: HydrateCtx
-  headers: Record<string, string>
+  headers: HeadersMap
 }
 
 type Skeleton = {
   dids: string[]
   cursor?: string
   recId?: number
-  resHeaders?: Record<string, string>
+  resHeaders?: HeadersMap
 }
diff --git a/packages/bsky/src/api/app/bsky/graph/getSuggestedFollowsByActor.ts b/packages/bsky/src/api/app/bsky/graph/getSuggestedFollowsByActor.ts
index b8d2b563ba6..c7eec21bad9 100644
--- a/packages/bsky/src/api/app/bsky/graph/getSuggestedFollowsByActor.ts
+++ b/packages/bsky/src/api/app/bsky/graph/getSuggestedFollowsByActor.ts
@@ -1,6 +1,7 @@
 import { mapDefined, noUndefinedVals } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import AtpAgent from '@atproto/api'
+import { HeadersMap } from '@atproto/xrpc'
 import { Server } from '../../../../lexicon'
 import { QueryParams } from '../../../../lexicon/types/app/bsky/graph/getSuggestedFollowsByActor'
 import AppContext from '../../../../context'
@@ -133,12 +134,12 @@ type Context = {
 
 type Params = QueryParams & {
   hydrateCtx: HydrateCtx & { viewer: string }
-  headers: Record<string, string>
+  headers: HeadersMap
 }
 
 type SkeletonState = {
   isFallback: boolean
   suggestedDids: string[]
   recId?: number
-  headers?: Record<string, string>
+  headers?: HeadersMap
 }
diff --git a/packages/bsky/tests/label-hydration.test.ts b/packages/bsky/tests/label-hydration.test.ts
index 9198c9fe29e..ad5ceb482f6 100644
--- a/packages/bsky/tests/label-hydration.test.ts
+++ b/packages/bsky/tests/label-hydration.test.ts
@@ -73,8 +73,11 @@ describe('label hydration', () => {
     expect(res.data.labels?.find((l) => l.src === labelerDid)?.val).toEqual(
       'misleading',
     )
-    const labelerHeaderDids = res.headers['atproto-content-labelers'].split(',')
-    expect(labelerHeaderDids.sort()).toEqual(
+    const labelerHeaderDids = res.headers['atproto-content-labelers']
+      ?.split(',')
+      .sort()
+
+    expect(labelerHeaderDids).toEqual(
       [alice, `${bob};redact`, labelerDid].sort(),
     )
   })
diff --git a/packages/pds/tests/proxied/read-after-write.test.ts b/packages/pds/tests/proxied/read-after-write.test.ts
index 0461efeac75..72aa7f59035 100644
--- a/packages/pds/tests/proxied/read-after-write.test.ts
+++ b/packages/pds/tests/proxied/read-after-write.test.ts
@@ -282,7 +282,7 @@ describe('proxy read after write', () => {
       { headers: { ...sc.getHeaders(alice) } },
     )
     const lag = res.headers['atproto-upstream-lag']
-    expect(lag).toBeDefined()
+    assert(lag !== undefined)
     const parsed = parseInt(lag)
     expect(parsed > 0).toBe(true)
   })
diff --git a/packages/xrpc/src/types.ts b/packages/xrpc/src/types.ts
index 11e88445271..bf79f25b2e6 100644
--- a/packages/xrpc/src/types.ts
+++ b/packages/xrpc/src/types.ts
@@ -2,7 +2,7 @@ import { z } from 'zod'
 import { ValidationError } from '@atproto/lexicon'
 
 export type QueryParams = Record<string, any>
-export type HeadersMap = Record<string, string>
+export type HeadersMap = Record<string, string | undefined>
 
 export type {
   /** @deprecated not to be confused with the WHATWG Headers constructor */

From cc2a1222bd2b8ddd70d70dad174c1c63246a2d87 Mon Sep 17 00:00:00 2001
From: Matthieu Sieben <matthieusieben@users.noreply.github.com>
Date: Mon, 27 Jan 2025 01:06:06 +0100
Subject: [PATCH 038/101] Fix did:web encoding/decoding (#3454)

---
 .changeset/gorgeous-lies-warn.md              |   5 +
 .changeset/lovely-news-prove.md               |   5 +
 packages/did/jest.config.js                   |  13 +++
 packages/did/package.json                     |   5 +-
 packages/did/src/methods/plc.ts               |   8 +-
 packages/did/src/methods/web.ts               |  40 ++++---
 packages/did/tests/methods/plc.test.ts        |  72 ++++++++++++
 packages/did/tests/methods/web.test.ts        | 109 ++++++++++++++++++
 .../did-resolver/src/did-resolver-base.ts     |   9 +-
 .../internal/did-resolver/src/methods/plc.ts  |   1 +
 .../internal/did-resolver/src/methods/web.ts  |   8 +-
 pnpm-lock.yaml                                |   6 +
 12 files changed, 254 insertions(+), 27 deletions(-)
 create mode 100644 .changeset/gorgeous-lies-warn.md
 create mode 100644 .changeset/lovely-news-prove.md
 create mode 100644 packages/did/jest.config.js
 create mode 100644 packages/did/tests/methods/plc.test.ts
 create mode 100644 packages/did/tests/methods/web.test.ts

diff --git a/.changeset/gorgeous-lies-warn.md b/.changeset/gorgeous-lies-warn.md
new file mode 100644
index 00000000000..541ffc83479
--- /dev/null
+++ b/.changeset/gorgeous-lies-warn.md
@@ -0,0 +1,5 @@
+---
+"@atproto-labs/did-resolver": patch
+---
+
+Improve error descriptions
diff --git a/.changeset/lovely-news-prove.md b/.changeset/lovely-news-prove.md
new file mode 100644
index 00000000000..62cb5f6e114
--- /dev/null
+++ b/.changeset/lovely-news-prove.md
@@ -0,0 +1,5 @@
+---
+"@atproto/did": patch
+---
+
+Fix encoding and decoding of did:web
diff --git a/packages/did/jest.config.js b/packages/did/jest.config.js
new file mode 100644
index 00000000000..5e6f9c6f3f7
--- /dev/null
+++ b/packages/did/jest.config.js
@@ -0,0 +1,13 @@
+/** @type {import('jest').Config} */
+module.exports = {
+  displayName: 'PDS',
+  transform: { '^.+\\.(t|j)s$': '@swc/jest' },
+  // Jest requires all ESM dependencies to be transpiled (even if they are
+  // dynamically import()ed).
+  transformIgnorePatterns: [
+    `/node_modules/.pnpm/(?!(get-port|lande|toygrad)@)`,
+  ],
+  testTimeout: 60000,
+  setupFiles: ['<rootDir>/../../jest.setup.ts'],
+  moduleNameMapper: { '^(\\.\\.?\\/.+)\\.js$': ['$1.ts', '$1.js'] },
+}
diff --git a/packages/did/package.json b/packages/did/package.json
index f1b90b7be2e..a34ccd2bb43 100644
--- a/packages/did/package.json
+++ b/packages/did/package.json
@@ -28,9 +28,12 @@
     "zod": "^3.23.8"
   },
   "devDependencies": {
+    "@swc/jest": "^0.2.24",
+    "jest": "^28.1.2",
     "typescript": "^5.6.3"
   },
   "scripts": {
-    "build": "tsc --build tsconfig.build.json"
+    "build": "tsc --build tsconfig.build.json",
+    "test": "jest"
   }
 }
diff --git a/packages/did/src/methods/plc.ts b/packages/did/src/methods/plc.ts
index 69f6dc632e9..4e603a7255c 100644
--- a/packages/did/src/methods/plc.ts
+++ b/packages/did/src/methods/plc.ts
@@ -28,6 +28,10 @@ export function assertDidPlc(input: unknown): asserts input is Did<'plc'> {
     throw new InvalidDidError(typeof input, `DID must be a string`)
   }
 
+  if (!input.startsWith(DID_PLC_PREFIX)) {
+    throw new InvalidDidError(input, `Invalid did:plc prefix`)
+  }
+
   if (input.length !== DID_PLC_LENGTH) {
     throw new InvalidDidError(
       input,
@@ -35,10 +39,6 @@ export function assertDidPlc(input: unknown): asserts input is Did<'plc'> {
     )
   }
 
-  if (!input.startsWith(DID_PLC_PREFIX)) {
-    throw new InvalidDidError(input, `Invalid did:plc prefix`)
-  }
-
   // The following check is not necessary, as the check below is more strict:
 
   // assertDidMsid(input, DID_PLC_PREFIX.length)
diff --git a/packages/did/src/methods/web.ts b/packages/did/src/methods/web.ts
index 31405ccb023..b281822be28 100644
--- a/packages/did/src/methods/web.ts
+++ b/packages/did/src/methods/web.ts
@@ -9,9 +9,11 @@ export const DID_WEB_PREFIX = `did:web:` satisfies Did<'web'>
 export function isDidWeb(input: unknown): input is Did<'web'> {
   // Optimization: make cheap checks first
   if (typeof input !== 'string') return false
+  if (!input.startsWith(DID_WEB_PREFIX)) return false
+  if (input.charAt(DID_WEB_PREFIX.length) === ':') return false
 
   try {
-    assertDidWeb(input)
+    didWebToUrl(input as Did<'web'>)
     return true
   } catch {
     return false
@@ -28,25 +30,31 @@ export function assertDidWeb(input: unknown): asserts input is Did<'web'> {
     throw new InvalidDidError(typeof input, `DID must be a string`)
   }
 
-  void didWebToUrl(input)
-}
-
-export function didWebToUrl(did: string): URL {
-  if (!did.startsWith(DID_WEB_PREFIX)) {
-    throw new InvalidDidError(did, `did:web must start with ${DID_WEB_PREFIX}`)
+  if (!input.startsWith(DID_WEB_PREFIX)) {
+    throw new InvalidDidError(input, `Invalid did:web prefix`)
   }
 
-  if (did.charAt(DID_WEB_PREFIX.length) === ':') {
-    throw new InvalidDidError(did, 'did:web MSID must not start with a colon')
+  if (input.charAt(DID_WEB_PREFIX.length) === ':') {
+    throw new InvalidDidError(input, 'did:web MSID must not start with a colon')
   }
 
+  void didWebToUrl(input as Did<'web'>)
+}
+
+export function didWebToUrl(did: Did<'web'>) {
   // Make sure every char is valid (per DID spec)
   assertDidMsid(did, DID_WEB_PREFIX.length)
 
+  const hostIdx = DID_WEB_PREFIX.length
+  const pathIdx = did.indexOf(':', hostIdx)
+
+  const host = pathIdx === -1 ? did.slice(hostIdx) : did.slice(hostIdx, pathIdx)
+  const path = pathIdx === -1 ? '' : did.slice(pathIdx)
+
   try {
-    const msid = did.slice(DID_WEB_PREFIX.length)
-    const parts = msid.split(':').map(decodeURIComponent)
-    const url = new URL(`https://${parts.join('/')}`)
+    const url = new URL(
+      `https://${host.replaceAll('%3A', ':')}${path.replaceAll(':', '/')}`,
+    ) as URL & { protocol: 'http:' | 'https:' }
     if (url.hostname === 'localhost') {
       url.protocol = 'http:'
     }
@@ -57,10 +65,8 @@ export function didWebToUrl(did: string): URL {
 }
 
 export function urlToDidWeb(url: URL): Did<'web'> {
-  const path =
-    url.pathname === '/'
-      ? ''
-      : url.pathname.slice(1).split('/').map(encodeURIComponent).join(':')
+  const port = url.port ? `%3A${url.port}` : ''
+  const path = url.pathname === '/' ? '' : url.pathname.replaceAll('/', ':')
 
-  return `did:web:${encodeURIComponent(url.host)}${path ? `:${path}` : ''}`
+  return `did:web:${url.hostname}${port}${path}`
 }
diff --git a/packages/did/tests/methods/plc.test.ts b/packages/did/tests/methods/plc.test.ts
new file mode 100644
index 00000000000..51ce7daaa7a
--- /dev/null
+++ b/packages/did/tests/methods/plc.test.ts
@@ -0,0 +1,72 @@
+import { InvalidDidError } from '../../src/did-error.js'
+import { Did } from '../../src/did.js'
+import { asDidPlc, assertDidPlc, isDidPlc } from '../../src/methods/plc.js'
+
+const VALID: Did<'plc'>[] = [
+  'did:plc:l3rouwludahu3ui3bt66mfvj',
+  'did:plc:aaaaaaaaaaaaaaaaaaaaaaaa',
+  'did:plc:zzzzzzzzzzzzzzzzzzzzzzzz',
+]
+
+const INVALID: [value: unknown, message: string][] = [
+  ['did:plc:l3rouwludahu3ui3bt66mfv0', 'Invalid character at position 31'],
+  ['did:plc:l3rouwludahu3ui3bt66mfv1', 'Invalid character at position 31'],
+  ['did:plc:l3rouwludahu3ui3bt66mfv9', 'Invalid character at position 31'],
+  ['did:plc:l3rouwludahu3ui3bt66mfv', 'did:plc must be 32 characters long'],
+  ['did:plc:l3rouwludahu3ui3bt66mfvja', 'did:plc must be 32 characters long'],
+  ['did:plc:example.com:', 'did:plc must be 32 characters long'],
+  ['did:plc:exam%3Aple.com%3A8080', 'did:plc must be 32 characters long'],
+  [3, 'DID must be a string'],
+  [{ toString: () => 'did:plc:foo.com' }, 'DID must be a string'],
+  [[''], 'DID must be a string'],
+  ['random-string', 'Invalid did:plc prefix'],
+  ['did plc', 'Invalid did:plc prefix'],
+  ['lorem ipsum dolor sit', 'Invalid did:plc prefix'],
+]
+
+describe('isDidPlc', () => {
+  it('returns true for various valid dids', () => {
+    for (const did of VALID) {
+      expect(isDidPlc(did)).toBe(true)
+    }
+  })
+
+  it('returns false for invalid dids', () => {
+    for (const [did] of INVALID) {
+      expect(isDidPlc(did)).toBe(false)
+    }
+  })
+})
+
+describe('assertDidPlc', () => {
+  it('does not throw on valid dids', () => {
+    for (const did of VALID) {
+      expect(() => assertDidPlc(did)).not.toThrow()
+    }
+  })
+
+  it('throws if called with non string argument', () => {
+    for (const [val, message] of INVALID) {
+      expect(() => assertDidPlc(val)).toThrowError(
+        new InvalidDidError(
+          typeof val === 'string' ? val : typeof val,
+          message,
+        ),
+      )
+    }
+  })
+})
+
+describe('asDidPlc', () => {
+  it('returns the input for valid dids', () => {
+    for (const did of VALID) {
+      expect(asDidPlc(did)).toBe(did)
+    }
+  })
+
+  it('throws if called with invalid dids', () => {
+    for (const [val] of INVALID) {
+      expect(() => asDidPlc(val)).toThrowError(InvalidDidError)
+    }
+  })
+})
diff --git a/packages/did/tests/methods/web.test.ts b/packages/did/tests/methods/web.test.ts
new file mode 100644
index 00000000000..61591653a07
--- /dev/null
+++ b/packages/did/tests/methods/web.test.ts
@@ -0,0 +1,109 @@
+import { InvalidDidError } from '../../src/did-error.js'
+import { Did } from '../../src/did.js'
+import {
+  asDidWeb,
+  assertDidWeb,
+  didWebToUrl,
+  isDidWeb,
+  urlToDidWeb,
+} from '../../src/methods/web.js'
+
+const VALID: [Did<'web'>, string][] = [
+  ['did:web:example.com', 'https://example.com/'],
+  ['did:web:sub.example.com', 'https://sub.example.com/'],
+  ['did:web:example.com%3A8080', 'https://example.com:8080/'],
+  [
+    'did:web:example.com:path:to:resource',
+    'https://example.com/path/to/resource',
+  ],
+  [
+    'did:web:example.com%3A8080:path:to:resource',
+    'https://example.com:8080/path/to/resource',
+  ],
+  [
+    'did:web:xn--b48h.com%3A8080:path:to:resource',
+    'https://🙃.com:8080/path/to/resource',
+  ],
+]
+
+const INVALID: [value: unknown, message: string][] = [
+  ['did:web:', 'DID method-specific id must not be empty'],
+  ['did:web:foo@example.com', 'Disallowed character in DID at position 11'],
+  ['did:web::example.com', 'did:web MSID must not start with a colon'],
+  ['did:web:example.com:', 'DID cannot end with ":"'],
+  ['did:web:exam%3Aple.com%3A8080', 'Invalid Web DID'],
+  [3, 'DID must be a string'],
+  [{ toString: () => 'did:web:foo.com' }, 'DID must be a string'],
+  [[''], 'DID must be a string'],
+  ['random-string', 'Invalid did:web prefix'],
+  ['did web', 'Invalid did:web prefix'],
+  ['lorem ipsum dolor sit', 'Invalid did:web prefix'],
+]
+
+describe('isDidWeb', () => {
+  it('returns true for various valid dids', () => {
+    for (const [did] of VALID) {
+      expect(isDidWeb(did)).toBe(true)
+    }
+  })
+
+  it('returns false for invalid dids', () => {
+    for (const did of INVALID) {
+      expect(isDidWeb(did)).toBe(false)
+    }
+  })
+})
+
+describe('assertDidWeb', () => {
+  it('does not throw on valid dids', () => {
+    for (const [did] of VALID) {
+      expect(() => assertDidWeb(did)).not.toThrow()
+    }
+  })
+
+  it('throws if called with non string argument', () => {
+    for (const [val, message] of INVALID) {
+      expect(() => assertDidWeb(val)).toThrowError(
+        new InvalidDidError(
+          typeof val === 'string' ? val : typeof val,
+          message,
+        ),
+      )
+    }
+  })
+})
+
+describe('didWebToUrl', () => {
+  it('converts valid did:web to URL', () => {
+    for (const [did, url] of VALID) {
+      expect(didWebToUrl(did)).toStrictEqual(new URL(url))
+    }
+  })
+})
+
+describe('urlToDidWeb', () => {
+  it('converts URL to valid did:web', () => {
+    for (const [did, url] of VALID) {
+      expect(urlToDidWeb(new URL(url))).toBe(did)
+    }
+  })
+})
+
+describe('asDidWeb', () => {
+  it('returns the input for valid dids', () => {
+    for (const [did] of VALID) {
+      expect(asDidWeb(did)).toBe(did)
+    }
+  })
+
+  it('throws if called with invalid dids', () => {
+    for (const [val, message] of INVALID) {
+      expect(() => asDidWeb(val)).toThrowError(
+        new InvalidDidError(
+          typeof val === 'string' ? val : typeof val,
+          message,
+        ),
+      )
+    }
+  })
+})
diff --git a/packages/internal/did-resolver/src/did-resolver-base.ts b/packages/internal/did-resolver/src/did-resolver-base.ts
index 93c9c24ff1e..5c31347e165 100644
--- a/packages/internal/did-resolver/src/did-resolver-base.ts
+++ b/packages/internal/did-resolver/src/did-resolver-base.ts
@@ -1,4 +1,4 @@
-import { FetchRequestError } from '@atproto-labs/fetch'
+import { FetchError, FetchResponseError } from '@atproto-labs/fetch'
 import { Did, DidError, extractDidMethod } from '@atproto/did'
 import { ZodError } from 'zod'
 
@@ -46,7 +46,12 @@ export class DidResolverBase<M extends string = string>
 
       return document as ResolvedDocument<D, M>
     } catch (err) {
-      if (err instanceof FetchRequestError) {
+      if (err instanceof FetchResponseError) {
+        const status = err.response.status >= 500 ? 502 : err.response.status
+        throw new DidError(did, err.message, 'did-fetch-error', status, err)
+      }
+
+      if (err instanceof FetchError) {
         throw new DidError(did, err.message, 'did-fetch-error', 400, err)
       }
 
diff --git a/packages/internal/did-resolver/src/methods/plc.ts b/packages/internal/did-resolver/src/methods/plc.ts
index 00125db1ef7..5d930ecd462 100644
--- a/packages/internal/did-resolver/src/methods/plc.ts
+++ b/packages/internal/did-resolver/src/methods/plc.ts
@@ -45,6 +45,7 @@ export class DidPlcMethod implements DidMethod<'plc'> {
     // should still check if the msid is valid.
     assertDidPlc(did)
 
+    // Should never throw
     const url = new URL(`/${encodeURIComponent(did)}`, this.plcDirectoryUrl)
 
     return this.fetch(url, {
diff --git a/packages/internal/did-resolver/src/methods/web.ts b/packages/internal/did-resolver/src/methods/web.ts
index 5130309884b..b366cde98ab 100644
--- a/packages/internal/did-resolver/src/methods/web.ts
+++ b/packages/internal/did-resolver/src/methods/web.ts
@@ -6,7 +6,7 @@ import {
   fetchOkProcessor,
 } from '@atproto-labs/fetch'
 import { pipe } from '@atproto-labs/pipe'
-import { Did, didDocumentValidator, didWebToUrl } from '@atproto/did'
+import { Did, didDocumentValidator, DidError, didWebToUrl } from '@atproto/did'
 
 import { DidMethod, ResolveDidOptions } from '../did-method.js'
 
@@ -38,8 +38,10 @@ export class DidWebMethod implements DidMethod<'web'> {
     const didDocumentUrl = buildDidWebDocumentUrl(did)
 
     if (!this.allowHttp && didDocumentUrl.protocol === 'http:') {
-      throw new Error(
-        `Cannot resolve DID document for localhost: ${didDocumentUrl}`,
+      throw new DidError(
+        did,
+        'Resolution of "http" did:web is not allowed',
+        'did-web-http-not-allowed',
       )
     }
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 88318f4e346..feb0d2272e0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -521,6 +521,12 @@ importers:
         specifier: ^3.23.8
         version: 3.23.8
     devDependencies:
+      '@swc/jest':
+        specifier: ^0.2.24
+        version: 0.2.24(@swc/core@1.3.42)
+      jest:
+        specifier: ^28.1.2
+        version: 28.1.2(@types/node@18.19.67)(ts-node@10.8.2)
       typescript:
         specifier: ^5.6.3
         version: 5.6.3

From 8fd5dcea9267bc1e1f91a5dd94f18481e3857354 Mon Sep 17 00:00:00 2001
From: Foysal Ahamed <foysal@blueskyweb.xyz>
Date: Fri, 31 Jan 2025 11:46:45 -0800
Subject: [PATCH 039/101] :bug: Add account, record and identity events to the
 list of allowed event filter (#3464)

:bug: Add account, record and identity events to he list of allowed event filter
---
 packages/ozone/src/api/util.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/ozone/src/api/util.ts b/packages/ozone/src/api/util.ts
index 7d9c335c876..30cd23d1cd4 100644
--- a/packages/ozone/src/api/util.ts
+++ b/packages/ozone/src/api/util.ts
@@ -154,6 +154,9 @@ const eventTypes = new Set([
   'tools.ozone.moderation.defs#modEventResolveAppeal',
   'tools.ozone.moderation.defs#modEventTag',
   'tools.ozone.moderation.defs#modEventDivert',
+  'tools.ozone.moderation.defs#accountEvent',
+  'tools.ozone.moderation.defs#identityEvent',
+  'tools.ozone.moderation.defs#recordEvent',
 ])
 
 export const getMemberRole = (role: string) => {

From d377d1a9be6bdd4508c090e37f47af15bca81540 Mon Sep 17 00:00:00 2001
From: Foysal Ahamed <foysal@blueskyweb.xyz>
Date: Fri, 31 Jan 2025 11:48:10 -0800
Subject: [PATCH 040/101] :sparkles: Allow creating labels with expiry (#3476)

* :sparkles: Allow creating labels with expiry

* :broom: Cleanup
---
 lexicons/tools/ozone/moderation/defs.json     |  4 +++
 packages/api/src/client/lexicons.ts           |  5 +++
 .../types/tools/ozone/moderation/defs.ts      |  2 ++
 .../ozone/src/api/moderation/emitEvent.ts     |  1 +
 packages/ozone/src/lexicon/lexicons.ts        |  5 +++
 .../types/tools/ozone/moderation/defs.ts      |  2 ++
 packages/ozone/src/mod-service/index.ts       |  6 ++++
 packages/ozone/src/mod-service/views.ts       |  1 +
 packages/ozone/tests/moderation.test.ts       | 36 ++++++++++++++++---
 packages/pds/src/lexicon/lexicons.ts          |  5 +++
 .../types/tools/ozone/moderation/defs.ts      |  2 ++
 11 files changed, 64 insertions(+), 5 deletions(-)

diff --git a/lexicons/tools/ozone/moderation/defs.json b/lexicons/tools/ozone/moderation/defs.json
index 23bba198f24..daa0c4e8a68 100644
--- a/lexicons/tools/ozone/moderation/defs.json
+++ b/lexicons/tools/ozone/moderation/defs.json
@@ -374,6 +374,10 @@
         "negateLabelVals": {
           "type": "array",
           "items": { "type": "string" }
+        },
+        "durationInHours": {
+          "type": "integer",
+          "description": "Indicates how long the label will remain on the subject. Only applies on labels that are being added."
         }
       }
     },
diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
index 36604fa13ae..b8f90be1cce 100644
--- a/packages/api/src/client/lexicons.ts
+++ b/packages/api/src/client/lexicons.ts
@@ -11549,6 +11549,11 @@ export const schemaDict = {
               type: 'string',
             },
           },
+          durationInHours: {
+            type: 'integer',
+            description:
+              'Indicates how long the label will remain on the subject. Only applies on labels that are being added.',
+          },
         },
       },
       modEventAcknowledge: {
diff --git a/packages/api/src/client/types/tools/ozone/moderation/defs.ts b/packages/api/src/client/types/tools/ozone/moderation/defs.ts
index df753c9cfc4..796e32d5749 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/defs.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/defs.ts
@@ -347,6 +347,8 @@ export interface ModEventLabel {
   comment?: string
   createLabelVals: string[]
   negateLabelVals: string[]
+  /** Indicates how long the label will remain on the subject. Only applies on labels that are being added. */
+  durationInHours?: number
   [k: string]: unknown
 }
 
diff --git a/packages/ozone/src/api/moderation/emitEvent.ts b/packages/ozone/src/api/moderation/emitEvent.ts
index 7bf337e005b..47b421ad53b 100644
--- a/packages/ozone/src/api/moderation/emitEvent.ts
+++ b/packages/ozone/src/api/moderation/emitEvent.ts
@@ -207,6 +207,7 @@ const handleModerationEvent = async ({
             ? result.event.negateLabelVals.split(' ')
             : undefined,
         },
+        result.event.durationInHours ?? undefined,
       )
     }
 
diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
index 36604fa13ae..b8f90be1cce 100644
--- a/packages/ozone/src/lexicon/lexicons.ts
+++ b/packages/ozone/src/lexicon/lexicons.ts
@@ -11549,6 +11549,11 @@ export const schemaDict = {
               type: 'string',
             },
           },
+          durationInHours: {
+            type: 'integer',
+            description:
+              'Indicates how long the label will remain on the subject. Only applies on labels that are being added.',
+          },
         },
       },
       modEventAcknowledge: {
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts
index 572d323a298..e31a6d03dba 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts
@@ -347,6 +347,8 @@ export interface ModEventLabel {
   comment?: string
   createLabelVals: string[]
   negateLabelVals: string[]
+  /** Indicates how long the label will remain on the subject. Only applies on labels that are being added. */
+  durationInHours?: number
   [k: string]: unknown
 }
 
diff --git a/packages/ozone/src/mod-service/index.ts b/packages/ozone/src/mod-service/index.ts
index ff3891ed225..b298f28a43a 100644
--- a/packages/ozone/src/mod-service/index.ts
+++ b/packages/ozone/src/mod-service/index.ts
@@ -1159,13 +1159,19 @@ export class ModerationService {
     uri: string,
     cid: string | null,
     labels: { create?: string[]; negate?: string[] },
+    durationInHours?: number,
   ): Promise<Label[]> {
+    const exp =
+      durationInHours !== undefined
+        ? addHoursToDate(durationInHours).toISOString()
+        : undefined
     const { create = [], negate = [] } = labels
     const toCreate = create.map((val) => ({
       src: this.cfg.service.did,
       uri,
       cid: cid ?? undefined,
       val,
+      exp,
       cts: new Date().toISOString(),
     }))
     const toNegate = negate.map((val) => ({
diff --git a/packages/ozone/src/mod-service/views.ts b/packages/ozone/src/mod-service/views.ts
index b52f8b47a9c..b4183f0a4d3 100644
--- a/packages/ozone/src/mod-service/views.ts
+++ b/packages/ozone/src/mod-service/views.ts
@@ -113,6 +113,7 @@ export class ModerationViews {
       [
         'tools.ozone.moderation.defs#modEventMuteReporter',
         'tools.ozone.moderation.defs#modEventTakedown',
+        'tools.ozone.moderation.defs#modEventLabel',
         'tools.ozone.moderation.defs#modEventMute',
       ].includes(event.action)
     ) {
diff --git a/packages/ozone/tests/moderation.test.ts b/packages/ozone/tests/moderation.test.ts
index b3eae62a7d5..9b9bfb17c3c 100644
--- a/packages/ozone/tests/moderation.test.ts
+++ b/packages/ozone/tests/moderation.test.ts
@@ -24,6 +24,7 @@ import { EventReverser } from '../src'
 import { ImageInvalidator } from '../src/image-invalidator'
 import { TAKEDOWN_LABEL } from '../src/mod-service'
 import { ids } from '../src/lexicon/lexicons'
+import { HOUR } from '@atproto/common'
 
 describe('moderation', () => {
   let network: TestNetwork
@@ -514,6 +515,24 @@ describe('moderation', () => {
       await expect(getRepoLabels(sc.dids.bob)).resolves.toEqual(['kittens'])
     })
 
+    it('creates expiring label', async () => {
+      await emitLabelEvent({
+        createLabelVals: ['temp'],
+        negateLabelVals: [],
+        subject: {
+          $type: 'com.atproto.admin.defs#repoRef',
+          did: sc.dids.bob,
+        },
+        durationInHours: 24,
+      })
+      const repo = await getRepo(sc.dids.bob)
+      // Losely check that the expiry date is set to above 23 hours from now
+      expect(
+        `${repo?.labels?.[0].exp}` >
+          new Date(Date.now() + 23 * HOUR).toISOString(),
+      ).toBeTruthy()
+    })
+
     it('does not allow triage moderators to label.', async () => {
       const attemptLabel = modClient.emitEvent(
         {
@@ -708,14 +727,16 @@ describe('moderation', () => {
         subject: ToolsOzoneModerationEmitEvent.InputSchema['subject']
         createLabelVals: ModEventLabel['createLabelVals']
         negateLabelVals: ModEventLabel['negateLabelVals']
+        durationInHours?: ModEventLabel['durationInHours']
       },
     ) {
-      const { createLabelVals, negateLabelVals } = opts
+      const { createLabelVals, negateLabelVals, durationInHours } = opts
       const result = await modClient.emitEvent({
         event: {
           $type: 'tools.ozone.moderation.defs#modEventLabel',
           createLabelVals,
           negateLabelVals,
+          durationInHours,
         },
         createdBy: 'did:example:admin',
         reason: 'Y',
@@ -740,7 +761,7 @@ describe('moderation', () => {
     }
 
     async function getRecordLabels(uri: string) {
-      const result = await agent.api.tools.ozone.moderation.getRecord(
+      const result = await agent.tools.ozone.moderation.getRecord(
         { uri },
         {
           headers: await network.ozone.modHeaders(
@@ -752,8 +773,8 @@ describe('moderation', () => {
       return labels.map((l) => l.val)
     }
 
-    async function getRepoLabels(did: string) {
-      const result = await agent.api.tools.ozone.moderation.getRepo(
+    async function getRepo(did: string) {
+      const result = await agent.tools.ozone.moderation.getRepo(
         { did },
         {
           headers: await network.ozone.modHeaders(
@@ -761,7 +782,12 @@ describe('moderation', () => {
           ),
         },
       )
-      const labels = result.data.labels ?? []
+      return result.data
+    }
+
+    async function getRepoLabels(did: string) {
+      const result = await getRepo(did)
+      const labels = result.labels ?? []
       return labels.map((l) => l.val)
     }
   })
diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
index 36604fa13ae..b8f90be1cce 100644
--- a/packages/pds/src/lexicon/lexicons.ts
+++ b/packages/pds/src/lexicon/lexicons.ts
@@ -11549,6 +11549,11 @@ export const schemaDict = {
               type: 'string',
             },
           },
+          durationInHours: {
+            type: 'integer',
+            description:
+              'Indicates how long the label will remain on the subject. Only applies on labels that are being added.',
+          },
         },
       },
       modEventAcknowledge: {
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts
index 572d323a298..e31a6d03dba 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts
@@ -347,6 +347,8 @@ export interface ModEventLabel {
   comment?: string
   createLabelVals: string[]
   negateLabelVals: string[]
+  /** Indicates how long the label will remain on the subject. Only applies on labels that are being added. */
+  durationInHours?: number
   [k: string]: unknown
 }
 

From 7f52e67354906c3bf9830d7a2924ab58d6160905 Mon Sep 17 00:00:00 2001
From: Foysal Ahamed <foysal@blueskyweb.xyz>
Date: Fri, 31 Jan 2025 12:01:17 -0800
Subject: [PATCH 041/101] :sparkles: Mark appeals as resolved when takedown is
 issued (#3352)

* :sparkles: Mark appeals as resolved when takedown is issued

* :sparkles: Only set appealed false if in appealed state

* :memo: Add changeset
---
 .changeset/funny-beers-clap.md           | 7 +++++++
 packages/ozone/src/mod-service/status.ts | 2 ++
 2 files changed, 9 insertions(+)
 create mode 100644 .changeset/funny-beers-clap.md

diff --git a/.changeset/funny-beers-clap.md b/.changeset/funny-beers-clap.md
new file mode 100644
index 00000000000..ecd201f289d
--- /dev/null
+++ b/.changeset/funny-beers-clap.md
@@ -0,0 +1,7 @@
+---
+"@atproto/ozone": patch
+"@atproto/api": patch
+"@atproto/pds": patch
+---
+
+Auto resolve appeals when taking down
diff --git a/packages/ozone/src/mod-service/status.ts b/packages/ozone/src/mod-service/status.ts
index 67fb3b4a20c..76f2fb08948 100644
--- a/packages/ozone/src/mod-service/status.ts
+++ b/packages/ozone/src/mod-service/status.ts
@@ -77,6 +77,8 @@ const getSubjectStatusForModerationEvent = ({
       }
     case 'tools.ozone.moderation.defs#modEventTakedown':
       return {
+        // If we are doing a takedown, safe to move the item out of appealed state
+        ...(currentStatus?.appealed ? { appealed: false } : {}),
         takendown: true,
         lastReviewedBy: createdBy,
         reviewState: REVIEWCLOSED,

From 52c687a05c70d5660fae1de9e1bbc6297f37f1f4 Mon Sep 17 00:00:00 2001
From: Daniel Holmgren <dtholmgren@gmail.com>
Date: Fri, 31 Jan 2025 17:57:48 -0600
Subject: [PATCH 042/101] CBOR: parse safe uint64 as number (#3481)

* parse safe uint64 as number

* rename test
---
 .changeset/three-papayas-begin.md        | 5 +++++
 packages/common/src/ipld-multi.ts        | 8 +++++++-
 packages/common/tests/ipld-multi.test.ts | 9 +++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/three-papayas-begin.md

diff --git a/.changeset/three-papayas-begin.md b/.changeset/three-papayas-begin.md
new file mode 100644
index 00000000000..0b2f0513d91
--- /dev/null
+++ b/.changeset/three-papayas-begin.md
@@ -0,0 +1,5 @@
+---
+"@atproto/common": patch
+---
+
+Parse safe uint64 as number
diff --git a/packages/common/src/ipld-multi.ts b/packages/common/src/ipld-multi.ts
index 3b3f766d8b0..9ca9dc5ff81 100644
--- a/packages/common/src/ipld-multi.ts
+++ b/packages/common/src/ipld-multi.ts
@@ -18,9 +18,15 @@ cborx.addExtension({
   },
 })
 
+const decoder = new cborx.Decoder({
+  // @ts-ignore
+  int64AsNumber: true, // not in types for some reason
+  useRecords: false,
+})
+
 export const cborDecodeMulti = (encoded: Uint8Array): unknown[] => {
   const decoded: unknown[] = []
-  cborx.decodeMultiple(encoded, (value) => {
+  decoder.decodeMultiple(encoded, (value) => {
     decoded.push(value)
   })
   return decoded
diff --git a/packages/common/tests/ipld-multi.test.ts b/packages/common/tests/ipld-multi.test.ts
index 52604860064..6cdecccaef9 100644
--- a/packages/common/tests/ipld-multi.test.ts
+++ b/packages/common/tests/ipld-multi.test.ts
@@ -22,4 +22,13 @@ describe('ipld decode multi', () => {
     expect(decoded[0]).toEqual(one)
     expect(decoded[1]).toEqual(two)
   })
+
+  it('parses safe ints as number', async () => {
+    const one = {
+      test: Number.MAX_SAFE_INTEGER,
+    }
+    const encoded = cborEncode(one)
+    const decoded = cborDecodeMulti(encoded)
+    expect(Number.isInteger(decoded[0]?.['test'])).toBe(true)
+  })
 })

From 1c195a384549ed371cdf7ce51495da37388f9c62 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 31 Jan 2025 18:01:32 -0600
Subject: [PATCH 043/101] Version packages (#3442)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/eighty-eggs-nail.md                |  5 -----
 .changeset/forty-carrots-doubt.md             |  5 -----
 .changeset/funny-beers-clap.md                |  7 -------
 .changeset/gorgeous-lies-warn.md              |  5 -----
 .changeset/lemon-adults-sparkle.md            |  5 -----
 .changeset/lovely-news-prove.md               |  5 -----
 .changeset/quiet-geese-begin.md               |  5 -----
 .changeset/rude-laws-join.md                  |  5 -----
 .changeset/tall-kings-poke.md                 |  5 -----
 .changeset/three-papayas-begin.md             |  5 -----
 .changeset/weak-jobs-serve.md                 |  5 -----
 packages/api/CHANGELOG.md                     |  9 ++++++++
 packages/api/package.json                     |  2 +-
 packages/aws/CHANGELOG.md                     |  9 ++++++++
 packages/aws/package.json                     |  2 +-
 packages/bsky/CHANGELOG.md                    | 14 +++++++++++++
 packages/bsky/package.json                    |  2 +-
 packages/bsync/CHANGELOG.md                   |  7 +++++++
 packages/bsync/package.json                   |  2 +-
 packages/common/CHANGELOG.md                  |  6 ++++++
 packages/common/package.json                  |  2 +-
 packages/dev-env/CHANGELOG.md                 | 14 +++++++++++++
 packages/dev-env/package.json                 |  2 +-
 packages/did/CHANGELOG.md                     |  6 ++++++
 packages/did/package.json                     |  2 +-
 packages/internal/did-resolver/CHANGELOG.md   |  9 ++++++++
 packages/internal/did-resolver/package.json   |  2 +-
 .../handle-resolver-node/CHANGELOG.md         |  8 +++++++
 .../handle-resolver-node/package.json         |  2 +-
 .../internal/handle-resolver/CHANGELOG.md     |  7 +++++++
 .../internal/handle-resolver/package.json     |  2 +-
 .../internal/identity-resolver/CHANGELOG.md   |  8 +++++++
 .../internal/identity-resolver/package.json   |  2 +-
 packages/internal/xrpc-utils/CHANGELOG.md     |  8 +++++++
 packages/internal/xrpc-utils/package.json     |  2 +-
 .../oauth/oauth-client-browser/CHANGELOG.md   | 10 +++++++++
 .../oauth/oauth-client-browser/package.json   |  2 +-
 packages/oauth/oauth-client-node/CHANGELOG.md | 10 +++++++++
 packages/oauth/oauth-client-node/package.json |  2 +-
 packages/oauth/oauth-client/CHANGELOG.md      | 11 ++++++++++
 packages/oauth/oauth-client/package.json      |  2 +-
 packages/oauth/oauth-provider/CHANGELOG.md    |  7 +++++++
 packages/oauth/oauth-provider/package.json    |  2 +-
 packages/ozone/CHANGELOG.md                   | 17 +++++++++++++++
 packages/ozone/package.json                   |  2 +-
 packages/pds/CHANGELOG.md                     | 21 +++++++++++++++++++
 packages/pds/package.json                     |  2 +-
 packages/repo/CHANGELOG.md                    |  8 +++++++
 packages/repo/package.json                    |  2 +-
 packages/sync/CHANGELOG.md                    |  9 ++++++++
 packages/sync/package.json                    |  2 +-
 packages/xrpc-server/CHANGELOG.md             | 13 ++++++++++++
 packages/xrpc-server/package.json             |  2 +-
 packages/xrpc/CHANGELOG.md                    |  6 ++++++
 packages/xrpc/package.json                    |  2 +-
 55 files changed, 239 insertions(+), 79 deletions(-)
 delete mode 100644 .changeset/eighty-eggs-nail.md
 delete mode 100644 .changeset/forty-carrots-doubt.md
 delete mode 100644 .changeset/funny-beers-clap.md
 delete mode 100644 .changeset/gorgeous-lies-warn.md
 delete mode 100644 .changeset/lemon-adults-sparkle.md
 delete mode 100644 .changeset/lovely-news-prove.md
 delete mode 100644 .changeset/quiet-geese-begin.md
 delete mode 100644 .changeset/rude-laws-join.md
 delete mode 100644 .changeset/tall-kings-poke.md
 delete mode 100644 .changeset/three-papayas-begin.md
 delete mode 100644 .changeset/weak-jobs-serve.md

diff --git a/.changeset/eighty-eggs-nail.md b/.changeset/eighty-eggs-nail.md
deleted file mode 100644
index 3c98610c03b..00000000000
--- a/.changeset/eighty-eggs-nail.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/xrpc-server": patch
----
-
-Export the `ResponseType` type used in the `XRPCError` constructor
diff --git a/.changeset/forty-carrots-doubt.md b/.changeset/forty-carrots-doubt.md
deleted file mode 100644
index f9b66fdcabe..00000000000
--- a/.changeset/forty-carrots-doubt.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/ozone": patch
----
-
-Code cleanup
diff --git a/.changeset/funny-beers-clap.md b/.changeset/funny-beers-clap.md
deleted file mode 100644
index ecd201f289d..00000000000
--- a/.changeset/funny-beers-clap.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-"@atproto/ozone": patch
-"@atproto/api": patch
-"@atproto/pds": patch
----
-
-Auto resolve appeals when taking down
diff --git a/.changeset/gorgeous-lies-warn.md b/.changeset/gorgeous-lies-warn.md
deleted file mode 100644
index 541ffc83479..00000000000
--- a/.changeset/gorgeous-lies-warn.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto-labs/did-resolver": patch
----
-
-Improve error descriptions
diff --git a/.changeset/lemon-adults-sparkle.md b/.changeset/lemon-adults-sparkle.md
deleted file mode 100644
index 1b6104750ac..00000000000
--- a/.changeset/lemon-adults-sparkle.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/ozone": patch
----
-
-Fix typo in recordsStats's $type property
diff --git a/.changeset/lovely-news-prove.md b/.changeset/lovely-news-prove.md
deleted file mode 100644
index 62cb5f6e114..00000000000
--- a/.changeset/lovely-news-prove.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/did": patch
----
-
-Fix encoding and decoding of did:web
diff --git a/.changeset/quiet-geese-begin.md b/.changeset/quiet-geese-begin.md
deleted file mode 100644
index 0f503d3cfd7..00000000000
--- a/.changeset/quiet-geese-begin.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/xrpc-server": patch
----
-
-Allow providing a custom `errorParser` option to XRPCServer
diff --git a/.changeset/rude-laws-join.md b/.changeset/rude-laws-join.md
deleted file mode 100644
index 894032e2262..00000000000
--- a/.changeset/rude-laws-join.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/xrpc": patch
----
-
-Explicitly allow "undefined" values in `headers`
diff --git a/.changeset/tall-kings-poke.md b/.changeset/tall-kings-poke.md
deleted file mode 100644
index de58a7ff90f..00000000000
--- a/.changeset/tall-kings-poke.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/pds": patch
----
-
-Fix flaky tests
diff --git a/.changeset/three-papayas-begin.md b/.changeset/three-papayas-begin.md
deleted file mode 100644
index 0b2f0513d91..00000000000
--- a/.changeset/three-papayas-begin.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/common": patch
----
-
-Parse safe uint64 as number
diff --git a/.changeset/weak-jobs-serve.md b/.changeset/weak-jobs-serve.md
deleted file mode 100644
index 59de543c639..00000000000
--- a/.changeset/weak-jobs-serve.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/pds": patch
----
-
-Improve error reporting in case of failed PLC update operation
diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md
index 6c5179bf40c..b3ca864102f 100644
--- a/packages/api/CHANGELOG.md
+++ b/packages/api/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @atproto/api
 
+## 0.13.32
+
+### Patch Changes
+
+- [#3352](https://github.com/bluesky-social/atproto/pull/3352) [`7f52e6735`](https://github.com/bluesky-social/atproto/commit/7f52e67354906c3bf9830d7a2924ab58d6160905) Thanks [@foysalit](https://github.com/foysalit)! - Auto resolve appeals when taking down
+
+- Updated dependencies [[`fb64d50ee`](https://github.com/bluesky-social/atproto/commit/fb64d50ee220316b9f1183e5c3259629489734c9)]:
+  - @atproto/xrpc@0.6.7
+
 ## 0.13.31
 
 ### Patch Changes
diff --git a/packages/api/package.json b/packages/api/package.json
index 82978a9d811..4960c141a1d 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/api",
-  "version": "0.13.31",
+  "version": "0.13.32",
   "license": "MIT",
   "description": "Client library for atproto and Bluesky",
   "keywords": [
diff --git a/packages/aws/CHANGELOG.md b/packages/aws/CHANGELOG.md
index 068696e3cde..b6d6739da25 100644
--- a/packages/aws/CHANGELOG.md
+++ b/packages/aws/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @atproto/aws
 
+## 0.2.13
+
+### Patch Changes
+
+- Updated dependencies [[`52c687a05`](https://github.com/bluesky-social/atproto/commit/52c687a05c70d5660fae1de9e1bbc6297f37f1f4)]:
+  - @atproto/common@0.4.7
+  - @atproto/crypto@0.4.3
+  - @atproto/repo@0.6.3
+
 ## 0.2.12
 
 ### Patch Changes
diff --git a/packages/aws/package.json b/packages/aws/package.json
index 47bd621e0ae..b277284b583 100644
--- a/packages/aws/package.json
+++ b/packages/aws/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/aws",
-  "version": "0.2.12",
+  "version": "0.2.13",
   "license": "MIT",
   "description": "Shared AWS cloud API helpers for atproto services",
   "keywords": [
diff --git a/packages/bsky/CHANGELOG.md b/packages/bsky/CHANGELOG.md
index 29a46b9a3df..9f7f0538a17 100644
--- a/packages/bsky/CHANGELOG.md
+++ b/packages/bsky/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @atproto/bsky
 
+## 0.0.113
+
+### Patch Changes
+
+- Updated dependencies [[`4f2841efe`](https://github.com/bluesky-social/atproto/commit/4f2841efeb410e710e0c8da7c9204468f6256a75), [`7f52e6735`](https://github.com/bluesky-social/atproto/commit/7f52e67354906c3bf9830d7a2924ab58d6160905), [`cc2a1222b`](https://github.com/bluesky-social/atproto/commit/cc2a1222bd2b8ddd70d70dad174c1c63246a2d87), [`4f2841efe`](https://github.com/bluesky-social/atproto/commit/4f2841efeb410e710e0c8da7c9204468f6256a75), [`52c687a05`](https://github.com/bluesky-social/atproto/commit/52c687a05c70d5660fae1de9e1bbc6297f37f1f4)]:
+  - @atproto/xrpc-server@0.7.9
+  - @atproto/api@0.13.32
+  - @atproto/did@0.1.4
+  - @atproto/common@0.4.7
+  - @atproto-labs/xrpc-utils@0.0.5
+  - @atproto/sync@0.1.12
+  - @atproto/crypto@0.4.3
+  - @atproto/repo@0.6.3
+
 ## 0.0.112
 
 ### Patch Changes
diff --git a/packages/bsky/package.json b/packages/bsky/package.json
index 73db8c83dd8..796460106de 100644
--- a/packages/bsky/package.json
+++ b/packages/bsky/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.112",
+  "version": "0.0.113",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
diff --git a/packages/bsync/CHANGELOG.md b/packages/bsync/CHANGELOG.md
index 9da1d09e711..b9199f5a189 100644
--- a/packages/bsync/CHANGELOG.md
+++ b/packages/bsync/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/bsync
 
+## 0.0.12
+
+### Patch Changes
+
+- Updated dependencies [[`52c687a05`](https://github.com/bluesky-social/atproto/commit/52c687a05c70d5660fae1de9e1bbc6297f37f1f4)]:
+  - @atproto/common@0.4.7
+
 ## 0.0.11
 
 ### Patch Changes
diff --git a/packages/bsync/package.json b/packages/bsync/package.json
index f7865bede52..d9d48fe2f5a 100644
--- a/packages/bsync/package.json
+++ b/packages/bsync/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsync",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "license": "MIT",
   "description": "Sychronizing service for app.bsky App View (Bluesky API)",
   "keywords": [
diff --git a/packages/common/CHANGELOG.md b/packages/common/CHANGELOG.md
index d367fe5d148..d4f689a9837 100644
--- a/packages/common/CHANGELOG.md
+++ b/packages/common/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @atproto/common
 
+## 0.4.7
+
+### Patch Changes
+
+- [#3481](https://github.com/bluesky-social/atproto/pull/3481) [`52c687a05`](https://github.com/bluesky-social/atproto/commit/52c687a05c70d5660fae1de9e1bbc6297f37f1f4) Thanks [@dholms](https://github.com/dholms)! - Parse safe uint64 as number
+
 ## 0.4.6
 
 ### Patch Changes
diff --git a/packages/common/package.json b/packages/common/package.json
index 4060a4c3027..a02a0492510 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/common",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "license": "MIT",
   "description": "Shared web-platform-friendly code for atproto libraries",
   "keywords": [
diff --git a/packages/dev-env/CHANGELOG.md b/packages/dev-env/CHANGELOG.md
index 16932d5c00e..d4f01bcf4e7 100644
--- a/packages/dev-env/CHANGELOG.md
+++ b/packages/dev-env/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @atproto/dev-env
 
+## 0.3.83
+
+### Patch Changes
+
+- Updated dependencies [[`4f2841efe`](https://github.com/bluesky-social/atproto/commit/4f2841efeb410e710e0c8da7c9204468f6256a75), [`da7a831a7`](https://github.com/bluesky-social/atproto/commit/da7a831a7318343ba1ee98de3811ba337c043dbd), [`7f52e6735`](https://github.com/bluesky-social/atproto/commit/7f52e67354906c3bf9830d7a2924ab58d6160905), [`8810885b8`](https://github.com/bluesky-social/atproto/commit/8810885b8e7fa0377e6c000c091eec1dd85ed261), [`4f2841efe`](https://github.com/bluesky-social/atproto/commit/4f2841efeb410e710e0c8da7c9204468f6256a75), [`8810885b8`](https://github.com/bluesky-social/atproto/commit/8810885b8e7fa0377e6c000c091eec1dd85ed261), [`4f2841efe`](https://github.com/bluesky-social/atproto/commit/4f2841efeb410e710e0c8da7c9204468f6256a75)]:
+  - @atproto/xrpc-server@0.7.9
+  - @atproto/ozone@0.1.74
+  - @atproto/api@0.13.32
+  - @atproto/pds@0.4.91
+  - @atproto/bsky@0.0.113
+  - @atproto/sync@0.1.12
+  - @atproto/bsync@0.0.12
+  - @atproto/crypto@0.4.3
+
 ## 0.3.82
 
 ### Patch Changes
diff --git a/packages/dev-env/package.json b/packages/dev-env/package.json
index a6104c1fafd..8dad75d48c0 100644
--- a/packages/dev-env/package.json
+++ b/packages/dev-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/dev-env",
-  "version": "0.3.82",
+  "version": "0.3.83",
   "license": "MIT",
   "description": "Local development environment helper for atproto development",
   "keywords": [
diff --git a/packages/did/CHANGELOG.md b/packages/did/CHANGELOG.md
index bb87e9d5ed3..f2f30038474 100644
--- a/packages/did/CHANGELOG.md
+++ b/packages/did/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @atproto/did
 
+## 0.1.4
+
+### Patch Changes
+
+- [#3454](https://github.com/bluesky-social/atproto/pull/3454) [`cc2a1222b`](https://github.com/bluesky-social/atproto/commit/cc2a1222bd2b8ddd70d70dad174c1c63246a2d87) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Fix encoding and decoding of did:web
+
 ## 0.1.3
 
 ### Patch Changes
diff --git a/packages/did/package.json b/packages/did/package.json
index a34ccd2bb43..b9d89b1d943 100644
--- a/packages/did/package.json
+++ b/packages/did/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/did",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "license": "MIT",
   "description": "DID resolution and verification library",
   "keywords": [
diff --git a/packages/internal/did-resolver/CHANGELOG.md b/packages/internal/did-resolver/CHANGELOG.md
index 46c68212291..a5290a84fe8 100644
--- a/packages/internal/did-resolver/CHANGELOG.md
+++ b/packages/internal/did-resolver/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @atproto-labs/did-resolver
 
+## 0.1.9
+
+### Patch Changes
+
+- [#3454](https://github.com/bluesky-social/atproto/pull/3454) [`cc2a1222b`](https://github.com/bluesky-social/atproto/commit/cc2a1222bd2b8ddd70d70dad174c1c63246a2d87) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Improve error descriptions
+
+- Updated dependencies [[`cc2a1222b`](https://github.com/bluesky-social/atproto/commit/cc2a1222bd2b8ddd70d70dad174c1c63246a2d87)]:
+  - @atproto/did@0.1.4
+
 ## 0.1.8
 
 ### Patch Changes
diff --git a/packages/internal/did-resolver/package.json b/packages/internal/did-resolver/package.json
index 3c8162419dd..b0717b4e995 100644
--- a/packages/internal/did-resolver/package.json
+++ b/packages/internal/did-resolver/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto-labs/did-resolver",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "license": "MIT",
   "description": "DID resolution and verification library",
   "keywords": [
diff --git a/packages/internal/handle-resolver-node/CHANGELOG.md b/packages/internal/handle-resolver-node/CHANGELOG.md
index 7167efbf0d3..762e606b4da 100644
--- a/packages/internal/handle-resolver-node/CHANGELOG.md
+++ b/packages/internal/handle-resolver-node/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @atproto-labs/handle-resolver-node
 
+## 0.1.12
+
+### Patch Changes
+
+- Updated dependencies [[`cc2a1222b`](https://github.com/bluesky-social/atproto/commit/cc2a1222bd2b8ddd70d70dad174c1c63246a2d87)]:
+  - @atproto/did@0.1.4
+  - @atproto-labs/handle-resolver@0.1.6
+
 ## 0.1.11
 
 ### Patch Changes
diff --git a/packages/internal/handle-resolver-node/package.json b/packages/internal/handle-resolver-node/package.json
index b32221d7ce3..95436279198 100644
--- a/packages/internal/handle-resolver-node/package.json
+++ b/packages/internal/handle-resolver-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto-labs/handle-resolver-node",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "license": "MIT",
   "description": "Node specific ATProto handle to DID resolver",
   "keywords": [
diff --git a/packages/internal/handle-resolver/CHANGELOG.md b/packages/internal/handle-resolver/CHANGELOG.md
index 20538c57ee5..672c17ff799 100644
--- a/packages/internal/handle-resolver/CHANGELOG.md
+++ b/packages/internal/handle-resolver/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto-labs/handle-resolver
 
+## 0.1.6
+
+### Patch Changes
+
+- Updated dependencies [[`cc2a1222b`](https://github.com/bluesky-social/atproto/commit/cc2a1222bd2b8ddd70d70dad174c1c63246a2d87)]:
+  - @atproto/did@0.1.4
+
 ## 0.1.5
 
 ### Patch Changes
diff --git a/packages/internal/handle-resolver/package.json b/packages/internal/handle-resolver/package.json
index 15908ac0c24..22efe8605ed 100644
--- a/packages/internal/handle-resolver/package.json
+++ b/packages/internal/handle-resolver/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto-labs/handle-resolver",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "license": "MIT",
   "description": "Isomorphic ATProto handle to DID resolver",
   "keywords": [
diff --git a/packages/internal/identity-resolver/CHANGELOG.md b/packages/internal/identity-resolver/CHANGELOG.md
index 914790c809f..a69835949fe 100644
--- a/packages/internal/identity-resolver/CHANGELOG.md
+++ b/packages/internal/identity-resolver/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @atproto-labs/identity-resolver
 
+## 0.1.11
+
+### Patch Changes
+
+- Updated dependencies [[`cc2a1222b`](https://github.com/bluesky-social/atproto/commit/cc2a1222bd2b8ddd70d70dad174c1c63246a2d87)]:
+  - @atproto-labs/did-resolver@0.1.9
+  - @atproto-labs/handle-resolver@0.1.6
+
 ## 0.1.10
 
 ### Patch Changes
diff --git a/packages/internal/identity-resolver/package.json b/packages/internal/identity-resolver/package.json
index 8eee0567a9a..da95f9e9f70 100644
--- a/packages/internal/identity-resolver/package.json
+++ b/packages/internal/identity-resolver/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto-labs/identity-resolver",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "license": "MIT",
   "description": "A library resolving ATPROTO identities",
   "keywords": [
diff --git a/packages/internal/xrpc-utils/CHANGELOG.md b/packages/internal/xrpc-utils/CHANGELOG.md
index 79220dbb390..9f68eb38da5 100644
--- a/packages/internal/xrpc-utils/CHANGELOG.md
+++ b/packages/internal/xrpc-utils/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @atproto-labs/xrpc-utils
 
+## 0.0.5
+
+### Patch Changes
+
+- Updated dependencies [[`4f2841efe`](https://github.com/bluesky-social/atproto/commit/4f2841efeb410e710e0c8da7c9204468f6256a75), [`4f2841efe`](https://github.com/bluesky-social/atproto/commit/4f2841efeb410e710e0c8da7c9204468f6256a75), [`fb64d50ee`](https://github.com/bluesky-social/atproto/commit/fb64d50ee220316b9f1183e5c3259629489734c9)]:
+  - @atproto/xrpc-server@0.7.9
+  - @atproto/xrpc@0.6.7
+
 ## 0.0.4
 
 ### Patch Changes
diff --git a/packages/internal/xrpc-utils/package.json b/packages/internal/xrpc-utils/package.json
index 935cc8a9e62..4e4304f4457 100644
--- a/packages/internal/xrpc-utils/package.json
+++ b/packages/internal/xrpc-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto-labs/xrpc-utils",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "license": "MIT",
   "description": "XRPC server utilities for Node.JS",
   "keywords": [
diff --git a/packages/oauth/oauth-client-browser/CHANGELOG.md b/packages/oauth/oauth-client-browser/CHANGELOG.md
index 27b107666fb..f0f0722c01a 100644
--- a/packages/oauth/oauth-client-browser/CHANGELOG.md
+++ b/packages/oauth/oauth-client-browser/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @atproto/oauth-client-browser
 
+## 0.3.8
+
+### Patch Changes
+
+- Updated dependencies [[`cc2a1222b`](https://github.com/bluesky-social/atproto/commit/cc2a1222bd2b8ddd70d70dad174c1c63246a2d87), [`cc2a1222b`](https://github.com/bluesky-social/atproto/commit/cc2a1222bd2b8ddd70d70dad174c1c63246a2d87)]:
+  - @atproto-labs/did-resolver@0.1.9
+  - @atproto/did@0.1.4
+  - @atproto/oauth-client@0.3.8
+  - @atproto-labs/handle-resolver@0.1.6
+
 ## 0.3.7
 
 ### Patch Changes
diff --git a/packages/oauth/oauth-client-browser/package.json b/packages/oauth/oauth-client-browser/package.json
index 8b2e58d36b2..6f258e8227a 100644
--- a/packages/oauth/oauth-client-browser/package.json
+++ b/packages/oauth/oauth-client-browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/oauth-client-browser",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "license": "MIT",
   "description": "ATPROTO OAuth client for the browser (relies on WebCrypto & Indexed DB)",
   "keywords": [
diff --git a/packages/oauth/oauth-client-node/CHANGELOG.md b/packages/oauth/oauth-client-node/CHANGELOG.md
index 63db2e9e6ad..7b9ee7d32ab 100644
--- a/packages/oauth/oauth-client-node/CHANGELOG.md
+++ b/packages/oauth/oauth-client-node/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @atproto/oauth-client-node
 
+## 0.2.9
+
+### Patch Changes
+
+- Updated dependencies [[`cc2a1222b`](https://github.com/bluesky-social/atproto/commit/cc2a1222bd2b8ddd70d70dad174c1c63246a2d87), [`cc2a1222b`](https://github.com/bluesky-social/atproto/commit/cc2a1222bd2b8ddd70d70dad174c1c63246a2d87)]:
+  - @atproto-labs/did-resolver@0.1.9
+  - @atproto/did@0.1.4
+  - @atproto/oauth-client@0.3.8
+  - @atproto-labs/handle-resolver-node@0.1.12
+
 ## 0.2.8
 
 ### Patch Changes
diff --git a/packages/oauth/oauth-client-node/package.json b/packages/oauth/oauth-client-node/package.json
index abd1f6efafb..eb5de30cc3a 100644
--- a/packages/oauth/oauth-client-node/package.json
+++ b/packages/oauth/oauth-client-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/oauth-client-node",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "license": "MIT",
   "description": "ATPROTO OAuth client for the NodeJS",
   "keywords": [
diff --git a/packages/oauth/oauth-client/CHANGELOG.md b/packages/oauth/oauth-client/CHANGELOG.md
index eed6a2857aa..bd1abda094b 100644
--- a/packages/oauth/oauth-client/CHANGELOG.md
+++ b/packages/oauth/oauth-client/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @atproto/oauth-client
 
+## 0.3.8
+
+### Patch Changes
+
+- Updated dependencies [[`cc2a1222b`](https://github.com/bluesky-social/atproto/commit/cc2a1222bd2b8ddd70d70dad174c1c63246a2d87), [`cc2a1222b`](https://github.com/bluesky-social/atproto/commit/cc2a1222bd2b8ddd70d70dad174c1c63246a2d87), [`fb64d50ee`](https://github.com/bluesky-social/atproto/commit/fb64d50ee220316b9f1183e5c3259629489734c9)]:
+  - @atproto-labs/did-resolver@0.1.9
+  - @atproto/did@0.1.4
+  - @atproto/xrpc@0.6.7
+  - @atproto-labs/identity-resolver@0.1.11
+  - @atproto-labs/handle-resolver@0.1.6
+
 ## 0.3.7
 
 ### Patch Changes
diff --git a/packages/oauth/oauth-client/package.json b/packages/oauth/oauth-client/package.json
index c59bf2446aa..04d7dea7e33 100644
--- a/packages/oauth/oauth-client/package.json
+++ b/packages/oauth/oauth-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/oauth-client",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "license": "MIT",
   "description": "OAuth client for ATPROTO PDS. This package serves as common base for environment-specific implementations (NodeJS, Browser, React-Native).",
   "keywords": [
diff --git a/packages/oauth/oauth-provider/CHANGELOG.md b/packages/oauth/oauth-provider/CHANGELOG.md
index 188fd0930f4..8026c2e2f81 100644
--- a/packages/oauth/oauth-provider/CHANGELOG.md
+++ b/packages/oauth/oauth-provider/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/oauth-provider
 
+## 0.2.16
+
+### Patch Changes
+
+- Updated dependencies [[`52c687a05`](https://github.com/bluesky-social/atproto/commit/52c687a05c70d5660fae1de9e1bbc6297f37f1f4)]:
+  - @atproto/common@0.4.7
+
 ## 0.2.15
 
 ### Patch Changes
diff --git a/packages/oauth/oauth-provider/package.json b/packages/oauth/oauth-provider/package.json
index 6c65a12c480..21fb54b806e 100644
--- a/packages/oauth/oauth-provider/package.json
+++ b/packages/oauth/oauth-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/oauth-provider",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "license": "MIT",
   "description": "Generic OAuth2 and OpenID Connect provider for Node.js. Currently only supports features needed for Atproto.",
   "keywords": [
diff --git a/packages/ozone/CHANGELOG.md b/packages/ozone/CHANGELOG.md
index 9cc6c2b65af..d57ad6a54de 100644
--- a/packages/ozone/CHANGELOG.md
+++ b/packages/ozone/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @atproto/ozone
 
+## 0.1.74
+
+### Patch Changes
+
+- [#3437](https://github.com/bluesky-social/atproto/pull/3437) [`da7a831a7`](https://github.com/bluesky-social/atproto/commit/da7a831a7318343ba1ee98de3811ba337c043dbd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Code cleanup
+
+- [#3352](https://github.com/bluesky-social/atproto/pull/3352) [`7f52e6735`](https://github.com/bluesky-social/atproto/commit/7f52e67354906c3bf9830d7a2924ab58d6160905) Thanks [@foysalit](https://github.com/foysalit)! - Auto resolve appeals when taking down
+
+- [#3463](https://github.com/bluesky-social/atproto/pull/3463) [`8810885b8`](https://github.com/bluesky-social/atproto/commit/8810885b8e7fa0377e6c000c091eec1dd85ed261) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Fix typo in recordsStats's $type property
+
+- Updated dependencies [[`4f2841efe`](https://github.com/bluesky-social/atproto/commit/4f2841efeb410e710e0c8da7c9204468f6256a75), [`7f52e6735`](https://github.com/bluesky-social/atproto/commit/7f52e67354906c3bf9830d7a2924ab58d6160905), [`4f2841efe`](https://github.com/bluesky-social/atproto/commit/4f2841efeb410e710e0c8da7c9204468f6256a75), [`fb64d50ee`](https://github.com/bluesky-social/atproto/commit/fb64d50ee220316b9f1183e5c3259629489734c9), [`52c687a05`](https://github.com/bluesky-social/atproto/commit/52c687a05c70d5660fae1de9e1bbc6297f37f1f4)]:
+  - @atproto/xrpc-server@0.7.9
+  - @atproto/api@0.13.32
+  - @atproto/xrpc@0.6.7
+  - @atproto/common@0.4.7
+  - @atproto/crypto@0.4.3
+
 ## 0.1.73
 
 ### Patch Changes
diff --git a/packages/ozone/package.json b/packages/ozone/package.json
index b783902b53d..45ee74b391e 100644
--- a/packages/ozone/package.json
+++ b/packages/ozone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.1.73",
+  "version": "0.1.74",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
diff --git a/packages/pds/CHANGELOG.md b/packages/pds/CHANGELOG.md
index 77e5df5bd00..9d013841fab 100644
--- a/packages/pds/CHANGELOG.md
+++ b/packages/pds/CHANGELOG.md
@@ -1,5 +1,26 @@
 # @atproto/pds
 
+## 0.4.91
+
+### Patch Changes
+
+- [#3352](https://github.com/bluesky-social/atproto/pull/3352) [`7f52e6735`](https://github.com/bluesky-social/atproto/commit/7f52e67354906c3bf9830d7a2924ab58d6160905) Thanks [@foysalit](https://github.com/foysalit)! - Auto resolve appeals when taking down
+
+- [#3463](https://github.com/bluesky-social/atproto/pull/3463) [`8810885b8`](https://github.com/bluesky-social/atproto/commit/8810885b8e7fa0377e6c000c091eec1dd85ed261) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Fix flaky tests
+
+- [#3439](https://github.com/bluesky-social/atproto/pull/3439) [`4f2841efe`](https://github.com/bluesky-social/atproto/commit/4f2841efeb410e710e0c8da7c9204468f6256a75) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Improve error reporting in case of failed PLC update operation
+
+- Updated dependencies [[`4f2841efe`](https://github.com/bluesky-social/atproto/commit/4f2841efeb410e710e0c8da7c9204468f6256a75), [`7f52e6735`](https://github.com/bluesky-social/atproto/commit/7f52e67354906c3bf9830d7a2924ab58d6160905), [`4f2841efe`](https://github.com/bluesky-social/atproto/commit/4f2841efeb410e710e0c8da7c9204468f6256a75), [`fb64d50ee`](https://github.com/bluesky-social/atproto/commit/fb64d50ee220316b9f1183e5c3259629489734c9), [`52c687a05`](https://github.com/bluesky-social/atproto/commit/52c687a05c70d5660fae1de9e1bbc6297f37f1f4)]:
+  - @atproto/xrpc-server@0.7.9
+  - @atproto/api@0.13.32
+  - @atproto/xrpc@0.6.7
+  - @atproto/common@0.4.7
+  - @atproto-labs/xrpc-utils@0.0.5
+  - @atproto/aws@0.2.13
+  - @atproto/crypto@0.4.3
+  - @atproto/oauth-provider@0.2.16
+  - @atproto/repo@0.6.3
+
 ## 0.4.90
 
 ### Patch Changes
diff --git a/packages/pds/package.json b/packages/pds/package.json
index c99bbc41799..06668d2ee54 100644
--- a/packages/pds/package.json
+++ b/packages/pds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/pds",
-  "version": "0.4.90",
+  "version": "0.4.91",
   "license": "MIT",
   "description": "Reference implementation of atproto Personal Data Server (PDS)",
   "keywords": [
diff --git a/packages/repo/CHANGELOG.md b/packages/repo/CHANGELOG.md
index 40bc230c983..4ce908fac26 100644
--- a/packages/repo/CHANGELOG.md
+++ b/packages/repo/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @atproto/repo
 
+## 0.6.3
+
+### Patch Changes
+
+- Updated dependencies [[`52c687a05`](https://github.com/bluesky-social/atproto/commit/52c687a05c70d5660fae1de9e1bbc6297f37f1f4)]:
+  - @atproto/common@0.4.7
+  - @atproto/crypto@0.4.3
+
 ## 0.6.2
 
 ### Patch Changes
diff --git a/packages/repo/package.json b/packages/repo/package.json
index b17d0cf1b27..548759d9a77 100644
--- a/packages/repo/package.json
+++ b/packages/repo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/repo",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "license": "MIT",
   "description": "atproto repo and MST implementation",
   "keywords": [
diff --git a/packages/sync/CHANGELOG.md b/packages/sync/CHANGELOG.md
index 49ff04e5723..5a9f659f7ad 100644
--- a/packages/sync/CHANGELOG.md
+++ b/packages/sync/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @atproto/sync
 
+## 0.1.12
+
+### Patch Changes
+
+- Updated dependencies [[`4f2841efe`](https://github.com/bluesky-social/atproto/commit/4f2841efeb410e710e0c8da7c9204468f6256a75), [`4f2841efe`](https://github.com/bluesky-social/atproto/commit/4f2841efeb410e710e0c8da7c9204468f6256a75), [`52c687a05`](https://github.com/bluesky-social/atproto/commit/52c687a05c70d5660fae1de9e1bbc6297f37f1f4)]:
+  - @atproto/xrpc-server@0.7.9
+  - @atproto/common@0.4.7
+  - @atproto/repo@0.6.3
+
 ## 0.1.11
 
 ### Patch Changes
diff --git a/packages/sync/package.json b/packages/sync/package.json
index 306e7b535c5..353c45b2fd8 100644
--- a/packages/sync/package.json
+++ b/packages/sync/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/sync",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "license": "MIT",
   "description": "atproto sync library",
   "keywords": [
diff --git a/packages/xrpc-server/CHANGELOG.md b/packages/xrpc-server/CHANGELOG.md
index 38786a39bff..78578a49a90 100644
--- a/packages/xrpc-server/CHANGELOG.md
+++ b/packages/xrpc-server/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @atproto/xrpc-server
 
+## 0.7.9
+
+### Patch Changes
+
+- [#3439](https://github.com/bluesky-social/atproto/pull/3439) [`4f2841efe`](https://github.com/bluesky-social/atproto/commit/4f2841efeb410e710e0c8da7c9204468f6256a75) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Export the `ResponseType` type used in the `XRPCError` constructor
+
+- [#3439](https://github.com/bluesky-social/atproto/pull/3439) [`4f2841efe`](https://github.com/bluesky-social/atproto/commit/4f2841efeb410e710e0c8da7c9204468f6256a75) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Allow providing a custom `errorParser` option to XRPCServer
+
+- Updated dependencies [[`fb64d50ee`](https://github.com/bluesky-social/atproto/commit/fb64d50ee220316b9f1183e5c3259629489734c9), [`52c687a05`](https://github.com/bluesky-social/atproto/commit/52c687a05c70d5660fae1de9e1bbc6297f37f1f4)]:
+  - @atproto/xrpc@0.6.7
+  - @atproto/common@0.4.7
+  - @atproto/crypto@0.4.3
+
 ## 0.7.8
 
 ### Patch Changes
diff --git a/packages/xrpc-server/package.json b/packages/xrpc-server/package.json
index 4c5037995ac..21f52aa8d9f 100644
--- a/packages/xrpc-server/package.json
+++ b/packages/xrpc-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/xrpc-server",
-  "version": "0.7.8",
+  "version": "0.7.9",
   "license": "MIT",
   "description": "atproto HTTP API (XRPC) server library",
   "keywords": [
diff --git a/packages/xrpc/CHANGELOG.md b/packages/xrpc/CHANGELOG.md
index c19de445ef8..d5f666eff40 100644
--- a/packages/xrpc/CHANGELOG.md
+++ b/packages/xrpc/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @atproto/xrpc
 
+## 0.6.7
+
+### Patch Changes
+
+- [#3456](https://github.com/bluesky-social/atproto/pull/3456) [`fb64d50ee`](https://github.com/bluesky-social/atproto/commit/fb64d50ee220316b9f1183e5c3259629489734c9) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Explicitly allow "undefined" values in `headers`
+
 ## 0.6.6
 
 ### Patch Changes
diff --git a/packages/xrpc/package.json b/packages/xrpc/package.json
index bc699f3318a..c3a2ecb8996 100644
--- a/packages/xrpc/package.json
+++ b/packages/xrpc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/xrpc",
-  "version": "0.6.6",
+  "version": "0.6.7",
   "license": "MIT",
   "description": "atproto HTTP API (XRPC) client library",
   "keywords": [

From 8f88623c99af699453e0117b6abed15be8cf9ec8 Mon Sep 17 00:00:00 2001
From: Kyle Mathews <mathews.kyle@gmail.com>
Date: Sat, 1 Feb 2025 19:03:41 -0700
Subject: [PATCH 044/101] Fix typo in README (#3483)

---
 packages/api/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/api/README.md b/packages/api/README.md
index ca9768453c5..41e7913d861 100644
--- a/packages/api/README.md
+++ b/packages/api/README.md
@@ -85,7 +85,7 @@ are available:
 - [@atproto/oauth-client-node](https://www.npmjs.com/package/@atproto/oauth-client-node): for
   Node.js.
 - [@atproto/oauth-client](https://www.npmjs.com/package/@atproto/oauth-client):
-  Lower lever; compatible with most JS engines.
+  Lower level; compatible with most JS engines.
 
 Every `@atproto/oauth-client-*` implementation has a different way to obtain an
 `OAuthSession` instance that can be used to instantiate an `Agent` (from

From 8a30e0ed9239cb2037d54fb98e70e8b0cfbc3e39 Mon Sep 17 00:00:00 2001
From: rafael <rafael@blueskyweb.xyz>
Date: Tue, 4 Feb 2025 11:37:48 -0800
Subject: [PATCH 045/101] [SH] fixes base (#3445)

Co-authored-by: Eric Bailey <git@esb.lol>
---
 .changeset/honest-windows-appear.md           |  5 ++++
 .changeset/rich-rocks-think.md                |  5 ++++
 .../src/data-plane/server/routes/follows.ts   |  2 +-
 .../data-plane/server/routes/interactions.ts  | 24 ++++++++++---------
 .../src/data-plane/server/routes/likes.ts     |  3 +--
 .../src/data-plane/server/routes/lists.ts     |  2 +-
 .../src/data-plane/server/routes/mutes.ts     |  2 +-
 .../src/data-plane/server/routes/posts.ts     |  2 +-
 .../src/data-plane/server/routes/profile.ts   |  4 ++--
 .../src/data-plane/server/routes/records.ts   | 10 ++++----
 .../data-plane/server/routes/relationships.ts | 18 +++++++-------
 .../src/data-plane/server/routes/reposts.ts   |  3 +--
 packages/common-web/src/arrays.ts             | 16 ++++++-------
 13 files changed, 53 insertions(+), 43 deletions(-)
 create mode 100644 .changeset/honest-windows-appear.md
 create mode 100644 .changeset/rich-rocks-think.md

diff --git a/.changeset/honest-windows-appear.md b/.changeset/honest-windows-appear.md
new file mode 100644
index 00000000000..33be6073426
--- /dev/null
+++ b/.changeset/honest-windows-appear.md
@@ -0,0 +1,5 @@
+---
+"@atproto/common-web": minor
+---
+
+Make keyBy typing stricter
diff --git a/.changeset/rich-rocks-think.md b/.changeset/rich-rocks-think.md
new file mode 100644
index 00000000000..330e675fb38
--- /dev/null
+++ b/.changeset/rich-rocks-think.md
@@ -0,0 +1,5 @@
+---
+"@atproto/bsky": patch
+---
+
+Replace undefined values with empty strings in mock dataplane
diff --git a/packages/bsky/src/data-plane/server/routes/follows.ts b/packages/bsky/src/data-plane/server/routes/follows.ts
index b4dd62654d3..8ef27fdfe05 100644
--- a/packages/bsky/src/data-plane/server/routes/follows.ts
+++ b/packages/bsky/src/data-plane/server/routes/follows.ts
@@ -18,7 +18,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       .selectAll()
       .execute()
     const bySubject = keyBy(res, 'subjectDid')
-    const uris = targetDids.map((did) => bySubject[did]?.uri ?? '')
+    const uris = targetDids.map((did) => bySubject.get(did)?.uri ?? '')
     return {
       uris,
     }
diff --git a/packages/bsky/src/data-plane/server/routes/interactions.ts b/packages/bsky/src/data-plane/server/routes/interactions.ts
index a9ec11e0eed..2a0e00f2cfc 100644
--- a/packages/bsky/src/data-plane/server/routes/interactions.ts
+++ b/packages/bsky/src/data-plane/server/routes/interactions.ts
@@ -17,10 +17,10 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       .execute()
     const byUri = keyBy(res, 'uri')
     return {
-      likes: uris.map((uri) => byUri[uri]?.likeCount ?? 0),
-      replies: uris.map((uri) => byUri[uri]?.replyCount ?? 0),
-      reposts: uris.map((uri) => byUri[uri]?.repostCount ?? 0),
-      quotes: uris.map((uri) => byUri[uri]?.quoteCount ?? 0),
+      likes: uris.map((uri) => byUri.get(uri)?.likeCount ?? 0),
+      replies: uris.map((uri) => byUri.get(uri)?.replyCount ?? 0),
+      reposts: uris.map((uri) => byUri.get(uri)?.repostCount ?? 0),
+      quotes: uris.map((uri) => byUri.get(uri)?.quoteCount ?? 0),
     }
   },
   async getCountsForUsers(req) {
@@ -52,12 +52,14 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       .execute()
     const byDid = keyBy(res, 'did')
     return {
-      followers: req.dids.map((uri) => byDid[uri]?.followersCount ?? 0),
-      following: req.dids.map((uri) => byDid[uri]?.followsCount ?? 0),
-      posts: req.dids.map((uri) => byDid[uri]?.postsCount ?? 0),
-      lists: req.dids.map((uri) => byDid[uri]?.listsCount ?? 0),
-      feeds: req.dids.map((uri) => byDid[uri]?.feedGensCount ?? 0),
-      starterPacks: req.dids.map((uri) => byDid[uri]?.starterPacksCount ?? 0),
+      followers: req.dids.map((uri) => byDid.get(uri)?.followersCount ?? 0),
+      following: req.dids.map((uri) => byDid.get(uri)?.followsCount ?? 0),
+      posts: req.dids.map((uri) => byDid.get(uri)?.postsCount ?? 0),
+      lists: req.dids.map((uri) => byDid.get(uri)?.listsCount ?? 0),
+      feeds: req.dids.map((uri) => byDid.get(uri)?.feedGensCount ?? 0),
+      starterPacks: req.dids.map(
+        (uri) => byDid.get(uri)?.starterPacksCount ?? 0,
+      ),
     }
   },
   async getStarterPackCounts(req) {
@@ -105,7 +107,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       .execute()
     const countsByUri = keyBy(countsListItems, 'uri')
     return {
-      listItems: uris.map((uri) => countsByUri[uri]?.count ?? 0),
+      listItems: uris.map((uri) => countsByUri.get(uri)?.count ?? 0),
     }
   },
 })
diff --git a/packages/bsky/src/data-plane/server/routes/likes.ts b/packages/bsky/src/data-plane/server/routes/likes.ts
index 00199dca77a..cb9af0b80d5 100644
--- a/packages/bsky/src/data-plane/server/routes/likes.ts
+++ b/packages/bsky/src/data-plane/server/routes/likes.ts
@@ -58,8 +58,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       .selectAll()
       .execute()
     const bySubject = keyBy(res, 'subject')
-    // @TODO handling undefineds properly, or do we need to turn them into empty strings?
-    const uris = refs.map(({ uri }) => bySubject[uri]?.uri)
+    const uris = refs.map(({ uri }) => bySubject.get(uri)?.uri ?? '')
     return { uris }
   },
 
diff --git a/packages/bsky/src/data-plane/server/routes/lists.ts b/packages/bsky/src/data-plane/server/routes/lists.ts
index d757b1d39e4..064d0e9c604 100644
--- a/packages/bsky/src/data-plane/server/routes/lists.ts
+++ b/packages/bsky/src/data-plane/server/routes/lists.ts
@@ -69,7 +69,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       .selectAll()
       .execute()
     const byListUri = keyBy(res, 'listUri')
-    const listitemUris = listUris.map((uri) => byListUri[uri]?.uri ?? '')
+    const listitemUris = listUris.map((uri) => byListUri.get(uri)?.uri ?? '')
     return {
       listitemUris,
     }
diff --git a/packages/bsky/src/data-plane/server/routes/mutes.ts b/packages/bsky/src/data-plane/server/routes/mutes.ts
index 7e93af53acc..d941ffc66a8 100644
--- a/packages/bsky/src/data-plane/server/routes/mutes.ts
+++ b/packages/bsky/src/data-plane/server/routes/mutes.ts
@@ -180,7 +180,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       .where('rootUri', 'in', threadRoots)
       .execute()
     const byRootUri = keyBy(res, 'rootUri')
-    const muted = threadRoots.map((uri) => !!byRootUri[uri])
+    const muted = threadRoots.map((uri) => !!byRootUri.get(uri))
     return { muted }
   },
 })
diff --git a/packages/bsky/src/data-plane/server/routes/posts.ts b/packages/bsky/src/data-plane/server/routes/posts.ts
index 8f90a34b3cc..b400490576d 100644
--- a/packages/bsky/src/data-plane/server/routes/posts.ts
+++ b/packages/bsky/src/data-plane/server/routes/posts.ts
@@ -15,7 +15,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       .where('uri', 'in', uris)
       .execute()
     const byUri = keyBy(res, 'uri')
-    const counts = uris.map((uri) => byUri[uri]?.replyCount ?? 0)
+    const counts = uris.map((uri) => byUri.get(uri)?.replyCount ?? 0)
     return { counts }
   },
 })
diff --git a/packages/bsky/src/data-plane/server/routes/profile.ts b/packages/bsky/src/data-plane/server/routes/profile.ts
index ae3819ebd5a..7f56ff95a82 100644
--- a/packages/bsky/src/data-plane/server/routes/profile.ts
+++ b/packages/bsky/src/data-plane/server/routes/profile.ts
@@ -39,7 +39,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
     ])
     const byDid = keyBy(handlesRes, 'did')
     const actors = dids.map((did, i) => {
-      const row = byDid[did]
+      const row = byDid.get(did)
       const chatDeclaration = parseRecordBytes(
         chatDeclarations.records[i].record,
       )
@@ -74,7 +74,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       .selectAll()
       .execute()
     const byHandle = keyBy(res, 'handle')
-    const dids = handles.map((handle) => byHandle[handle]?.did ?? '')
+    const dids = handles.map((handle) => byHandle.get(handle)?.did ?? '')
     return { dids }
   },
 
diff --git a/packages/bsky/src/data-plane/server/routes/records.ts b/packages/bsky/src/data-plane/server/routes/records.ts
index 769208c26c1..97c5c57375c 100644
--- a/packages/bsky/src/data-plane/server/routes/records.ts
+++ b/packages/bsky/src/data-plane/server/routes/records.ts
@@ -41,7 +41,7 @@ export const getRecords =
       : []
     const byUri = keyBy(res, 'uri')
     const records: Record[] = req.uris.map((uri) => {
-      const row = byUri[uri]
+      const row = byUri.get(uri)
       const json = row ? row.json : JSON.stringify(null)
       const createdAtRaw = new Date(JSON.parse(json)?.['createdAt'])
       const createdAt = !isNaN(createdAtRaw.getTime())
@@ -88,10 +88,10 @@ export const getPostRecords = (db: Database) => {
     const byKey = keyBy(details, 'uri')
     const meta = req.uris.map((uri) => {
       return new PostRecordMeta({
-        violatesThreadGate: !!byKey[uri]?.violatesThreadGate,
-        violatesEmbeddingRules: !!byKey[uri]?.violatesEmbeddingRules,
-        hasThreadGate: !!byKey[uri]?.hasThreadGate,
-        hasPostGate: !!byKey[uri]?.hasPostGate,
+        violatesThreadGate: !!byKey.get(uri)?.violatesThreadGate,
+        violatesEmbeddingRules: !!byKey.get(uri)?.violatesEmbeddingRules,
+        hasThreadGate: !!byKey.get(uri)?.hasThreadGate,
+        hasPostGate: !!byKey.get(uri)?.hasPostGate,
       })
     })
     return { records, meta }
diff --git a/packages/bsky/src/data-plane/server/routes/relationships.ts b/packages/bsky/src/data-plane/server/routes/relationships.ts
index a291db9d20e..b6a16d4b05f 100644
--- a/packages/bsky/src/data-plane/server/routes/relationships.ts
+++ b/packages/bsky/src/data-plane/server/routes/relationships.ts
@@ -72,16 +72,16 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       .execute()
     const byDid = keyBy(res, 'did')
     const relationships = targetDids.map((did) => {
-      const row = byDid[did] ?? {}
+      const row = byDid.get(did)
       return {
-        muted: row.muted ?? false,
-        mutedByList: row.mutedByList ?? '',
-        blockedBy: row.blockedBy ?? '',
-        blocking: row.blocking ?? '',
-        blockedByList: row.blockedByList ?? '',
-        blockingByList: row.blockingByList ?? '',
-        following: row.following ?? '',
-        followedBy: row.followedBy ?? '',
+        muted: row?.muted ?? false,
+        mutedByList: row?.mutedByList ?? '',
+        blockedBy: row?.blockedBy ?? '',
+        blocking: row?.blocking ?? '',
+        blockedByList: row?.blockedByList ?? '',
+        blockingByList: row?.blockingByList ?? '',
+        following: row?.following ?? '',
+        followedBy: row?.followedBy ?? '',
       }
     })
     return { relationships }
diff --git a/packages/bsky/src/data-plane/server/routes/reposts.ts b/packages/bsky/src/data-plane/server/routes/reposts.ts
index 9c6f72435c0..4b9e1f9f87b 100644
--- a/packages/bsky/src/data-plane/server/routes/reposts.ts
+++ b/packages/bsky/src/data-plane/server/routes/reposts.ts
@@ -45,8 +45,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       .selectAll()
       .execute()
     const bySubject = keyBy(res, 'subject')
-    // @TODO handling undefineds properly, or do we need to turn them into empty strings?
-    const uris = refs.map(({ uri }) => bySubject[uri]?.uri)
+    const uris = refs.map(({ uri }) => bySubject.get(uri)?.uri ?? '')
     return { uris }
   },
 
diff --git a/packages/common-web/src/arrays.ts b/packages/common-web/src/arrays.ts
index 69fb9415cbe..cfaa81e82cb 100644
--- a/packages/common-web/src/arrays.ts
+++ b/packages/common-web/src/arrays.ts
@@ -1,11 +1,11 @@
-export const keyBy = <T>(arr: T[], key: string): Record<string, T> => {
-  return arr.reduce(
-    (acc, cur) => {
-      acc[cur[key]] = cur
-      return acc
-    },
-    {} as Record<string, T>,
-  )
+export function keyBy<T, K extends keyof T>(
+  arr: readonly T[],
+  key: K,
+): Map<T[K], T> {
+  return arr.reduce((acc, cur) => {
+    acc.set(cur[key], cur)
+    return acc
+  }, new Map<T[K], T>())
 }
 
 export const mapDefined = <T, S>(

From 53a577fd4bfb1c7301e14db85b42f4758b053dee Mon Sep 17 00:00:00 2001
From: Matthieu Sieben <matthieusieben@users.noreply.github.com>
Date: Wed, 5 Feb 2025 13:37:16 +0100
Subject: [PATCH 046/101] PDS: ActorStore Refactor (#3492)

* Similification of the `pds` package by:
- Removing `DetailedAccountStore` class (moving its logic inside `AccountManager`)
- Factorizes image URL building into its own class (for easy re-use from `AccountManager`)
- Adds an `AppView` class that exposes an `agent: AtpAgent` and url builder function (used by the `ImageUrlBuilder`).
- Reworks the `ActorStore` to avoid circular dependency between `AccountManager` and `LocalViewerCreator` (needed because of first item)

* tidy

* move classes in their own file
---
 .changeset/serious-pears-sit.md               |   5 +
 packages/pds/src/account-manager/index.ts     |  41 ++++-
 .../pds/src/actor-store/actor-store-reader.ts |  45 ++++++
 .../src/actor-store/actor-store-resources.ts  |   8 +
 .../src/actor-store/actor-store-transactor.ts |  31 ++++
 .../pds/src/actor-store/actor-store-writer.ts |  17 ++
 .../actor-store/{index.ts => actor-store.ts}  | 143 ++++-------------
 packages/pds/src/actor-store/blob/reader.ts   |  21 ++-
 .../pds/src/actor-store/blob/transactor.ts    |  15 ++
 packages/pds/src/actor-store/record/reader.ts | 127 ++++++++++++++-
 packages/pds/src/actor-store/repo/reader.ts   |   4 +-
 .../src/actor-store/repo/sql-repo-reader.ts   |   5 +-
 .../pds/src/actor-store/repo/transactor.ts    |  17 +-
 .../src/api/app/bsky/actor/getPreferences.ts  |   3 +-
 .../pds/src/api/app/bsky/actor/getProfile.ts  |   4 +-
 .../pds/src/api/app/bsky/actor/getProfiles.ts |   4 +-
 .../src/api/app/bsky/actor/putPreferences.ts  |   3 +-
 .../src/api/app/bsky/feed/getActorLikes.ts    |   4 +-
 .../src/api/app/bsky/feed/getAuthorFeed.ts    |   4 +-
 packages/pds/src/api/app/bsky/feed/getFeed.ts |   8 +-
 .../src/api/app/bsky/feed/getPostThread.ts    |  15 +-
 .../pds/src/api/app/bsky/feed/getTimeline.ts  |   4 +-
 .../api/app/bsky/notification/registerPush.ts |   9 +-
 .../api/com/atproto/identity/resolveHandle.ts |  24 ++-
 .../src/api/com/atproto/repo/importRepo.ts    |  27 +---
 .../pds/src/api/com/atproto/repo/putRecord.ts |  17 +-
 packages/pds/src/bsky-app-view.ts             |  26 ++++
 packages/pds/src/context.ts                   |  50 +++---
 packages/pds/src/db/db.ts                     |   4 +-
 packages/pds/src/image/image-url-builder.ts   |  16 ++
 .../pds/src/oauth/detailed-account-store.ts   |  96 ------------
 packages/pds/src/oauth/provider.ts            |  17 +-
 packages/pds/src/read-after-write/util.ts     |   3 +-
 packages/pds/src/read-after-write/viewer.ts   | 146 +++++-------------
 packages/pds/src/scripts/rebuild-repo.ts      |  65 +-------
 packages/pds/tests/blob-deletes.test.ts       |   6 +-
 packages/pds/tests/crud.test.ts               |  18 +--
 37 files changed, 522 insertions(+), 530 deletions(-)
 create mode 100644 .changeset/serious-pears-sit.md
 create mode 100644 packages/pds/src/actor-store/actor-store-reader.ts
 create mode 100644 packages/pds/src/actor-store/actor-store-resources.ts
 create mode 100644 packages/pds/src/actor-store/actor-store-transactor.ts
 create mode 100644 packages/pds/src/actor-store/actor-store-writer.ts
 rename packages/pds/src/actor-store/{index.ts => actor-store.ts} (59%)
 create mode 100644 packages/pds/src/bsky-app-view.ts
 create mode 100644 packages/pds/src/image/image-url-builder.ts
 delete mode 100644 packages/pds/src/oauth/detailed-account-store.ts

diff --git a/.changeset/serious-pears-sit.md b/.changeset/serious-pears-sit.md
new file mode 100644
index 00000000000..fc3a4fb8579
--- /dev/null
+++ b/.changeset/serious-pears-sit.md
@@ -0,0 +1,5 @@
+---
+"@atproto/pds": patch
+---
+
+Code refactor
diff --git a/packages/pds/src/account-manager/index.ts b/packages/pds/src/account-manager/index.ts
index b646e69bf7c..848aaab04b8 100644
--- a/packages/pds/src/account-manager/index.ts
+++ b/packages/pds/src/account-manager/index.ts
@@ -1,5 +1,6 @@
 import { HOUR, wait } from '@atproto/common'
 import {
+  Account,
   AccountInfo,
   AccountStore,
   Code,
@@ -20,12 +21,15 @@ import {
   UpdateRequestData,
 } from '@atproto/oauth-provider'
 import { AuthRequiredError } from '@atproto/xrpc-server'
+import { Selectable } from 'kysely'
 import { CID } from 'multiformats/cid'
 import { KeyObject } from 'node:crypto'
 
+import { ActorStore } from '../actor-store/actor-store'
 import { AuthScope } from '../auth-verifier'
 import { BackgroundQueue } from '../background'
 import { softDeleted } from '../db'
+import { ImageUrlBuilder } from '../image/image-url-builder'
 import { StatusAttr } from '../lexicon/types/com/atproto/admin/defs'
 import { AccountDb, EmailTokenPurpose, getDb, getMigrator } from './db'
 import * as account from './helpers/account'
@@ -50,6 +54,8 @@ export class AccountManager
   db: AccountDb
 
   constructor(
+    private actorStore: ActorStore,
+    private imageUrlBuilder: ImageUrlBuilder,
     private backgroundQueue: BackgroundQueue,
     dbLocation: string,
     private jwtKey: KeyObject,
@@ -500,6 +506,29 @@ export class AccountManager
 
   // AccountStore
 
+  private async buildAccount(row: Selectable<ActorAccount>): Promise<Account> {
+    const account = deviceAccount.toAccount(row, this.serviceDid)
+
+    if (!account.name || !account.picture) {
+      const did = account.sub
+
+      const profile = await this.actorStore.read(did, async (store) => {
+        return store.record.getProfileRecord()
+      })
+
+      if (profile) {
+        const { avatar, displayName } = profile
+
+        account.name ||= displayName
+        account.picture ||= avatar
+          ? this.imageUrlBuilder.build('avatar', did, avatar.ref.toString())
+          : undefined
+      }
+    }
+
+    return account
+  }
+
   async authenticateAccount(
     { username: identifier, password, remember = false }: SignInCredentials,
     deviceId: DeviceId,
@@ -554,7 +583,7 @@ export class AccountManager
     if (!row) return null
 
     return {
-      account: deviceAccount.toAccount(row, this.serviceDid),
+      account: await this.buildAccount(row),
       info: deviceAccount.toDeviceAccountInfo(row),
     }
   }
@@ -564,10 +593,12 @@ export class AccountManager
       .listRememberedQB(this.db, deviceId)
       .execute()
 
-    return rows.map((row) => ({
-      account: deviceAccount.toAccount(row, this.serviceDid),
-      info: deviceAccount.toDeviceAccountInfo(row),
-    }))
+    return Promise.all(
+      rows.map(async (row) => ({
+        account: await this.buildAccount(row),
+        info: deviceAccount.toDeviceAccountInfo(row),
+      })),
+    )
   }
 
   async removeDeviceAccount(deviceId: DeviceId, sub: string): Promise<void> {
diff --git a/packages/pds/src/actor-store/actor-store-reader.ts b/packages/pds/src/actor-store/actor-store-reader.ts
new file mode 100644
index 00000000000..ad5abab7ef1
--- /dev/null
+++ b/packages/pds/src/actor-store/actor-store-reader.ts
@@ -0,0 +1,45 @@
+import { Keypair } from '@atproto/crypto'
+import { ActorStoreResources } from './actor-store-resources'
+import { ActorDb } from './db'
+import { PreferenceReader } from './preference/reader'
+import { RecordReader } from './record/reader'
+import { RepoReader } from './repo/reader'
+import { ActorStoreTransactor } from './actor-store-transactor'
+
+export class ActorStoreReader {
+  public readonly repo: RepoReader
+  public readonly record: RecordReader
+  public readonly pref: PreferenceReader
+
+  constructor(
+    public readonly did: string,
+    protected readonly db: ActorDb,
+    protected readonly resources: ActorStoreResources,
+    public readonly keypair: () => Promise<Keypair>,
+  ) {
+    const blobstore = resources.blobstore(did)
+
+    this.repo = new RepoReader(db, blobstore)
+    this.record = new RecordReader(db)
+    this.pref = new PreferenceReader(db)
+
+    // Invoke "keypair" once. Also avoids leaking "this" as keypair context.
+    let keypairPromise: Promise<Keypair>
+    this.keypair = () => (keypairPromise ??= Promise.resolve().then(keypair))
+  }
+
+  async transact<T>(
+    fn: (fn: ActorStoreTransactor) => T | PromiseLike<T>,
+  ): Promise<T> {
+    const keypair = await this.keypair()
+    return this.db.transaction((dbTxn) => {
+      const store = new ActorStoreTransactor(
+        this.did,
+        dbTxn,
+        keypair,
+        this.resources,
+      )
+      return fn(store)
+    })
+  }
+}
diff --git a/packages/pds/src/actor-store/actor-store-resources.ts b/packages/pds/src/actor-store/actor-store-resources.ts
new file mode 100644
index 00000000000..c78eb95d27a
--- /dev/null
+++ b/packages/pds/src/actor-store/actor-store-resources.ts
@@ -0,0 +1,8 @@
+import { BlobStore } from '@atproto/repo'
+import { BackgroundQueue } from '../background'
+
+export type ActorStoreResources = {
+  blobstore: (did: string) => BlobStore
+  backgroundQueue: BackgroundQueue
+  reservedKeyDir?: string
+}
diff --git a/packages/pds/src/actor-store/actor-store-transactor.ts b/packages/pds/src/actor-store/actor-store-transactor.ts
new file mode 100644
index 00000000000..497d9f4a0c6
--- /dev/null
+++ b/packages/pds/src/actor-store/actor-store-transactor.ts
@@ -0,0 +1,31 @@
+import { Keypair } from '@atproto/crypto'
+import { ActorStoreResources } from './actor-store-resources'
+import { ActorDb } from './db'
+import { PreferenceTransactor } from './preference/transactor'
+import { RecordTransactor } from './record/transactor'
+import { RepoTransactor } from './repo/transactor'
+
+export class ActorStoreTransactor {
+  public readonly record: RecordTransactor
+  public readonly repo: RepoTransactor
+  public readonly pref: PreferenceTransactor
+
+  constructor(
+    public readonly did: string,
+    protected readonly db: ActorDb,
+    protected readonly keypair: Keypair,
+    protected readonly resources: ActorStoreResources,
+  ) {
+    const blobstore = resources.blobstore(did)
+
+    this.record = new RecordTransactor(db, blobstore)
+    this.pref = new PreferenceTransactor(db)
+    this.repo = new RepoTransactor(
+      db,
+      blobstore,
+      did,
+      keypair,
+      resources.backgroundQueue,
+    )
+  }
+}
diff --git a/packages/pds/src/actor-store/actor-store-writer.ts b/packages/pds/src/actor-store/actor-store-writer.ts
new file mode 100644
index 00000000000..2571479515e
--- /dev/null
+++ b/packages/pds/src/actor-store/actor-store-writer.ts
@@ -0,0 +1,17 @@
+import { ActorStoreTransactor } from './actor-store-transactor'
+
+export class ActorStoreWriter extends ActorStoreTransactor {
+  async transact<T>(
+    fn: (fn: ActorStoreTransactor) => T | PromiseLike<T>,
+  ): Promise<T> {
+    return this.db.transaction((dbTxn) => {
+      const transactor = new ActorStoreTransactor(
+        this.did,
+        dbTxn,
+        this.keypair,
+        this.resources,
+      )
+      return fn(transactor)
+    })
+  }
+}
diff --git a/packages/pds/src/actor-store/index.ts b/packages/pds/src/actor-store/actor-store.ts
similarity index 59%
rename from packages/pds/src/actor-store/index.ts
rename to packages/pds/src/actor-store/actor-store.ts
index 281ae10b7b4..414c52455da 100644
--- a/packages/pds/src/actor-store/index.ts
+++ b/packages/pds/src/actor-store/actor-store.ts
@@ -1,35 +1,23 @@
-import path from 'path'
-import assert from 'assert'
-import fs from 'fs/promises'
-import * as crypto from '@atproto/crypto'
-import { Keypair, ExportableKeypair } from '@atproto/crypto'
-import { BlobStore } from '@atproto/repo'
 import {
   chunkArray,
   fileExists,
   readIfExists,
   rmIfExists,
 } from '@atproto/common'
-import { ActorDb, getDb, getMigrator } from './db'
-import { BackgroundQueue } from '../background'
-import { RecordReader } from './record/reader'
-import { PreferenceReader } from './preference/reader'
-import { RepoReader } from './repo/reader'
-import { RepoTransactor } from './repo/transactor'
-import { PreferenceTransactor } from './preference/transactor'
+import * as crypto from '@atproto/crypto'
+import { ExportableKeypair, Keypair } from '@atproto/crypto'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { RecordTransactor } from './record/transactor'
-import { CID } from 'multiformats/cid'
-import DiskBlobStore from '../disk-blobstore'
-import { mkdir } from 'fs/promises'
+import assert from 'node:assert'
+import fs, { mkdir } from 'node:fs/promises'
+import path from 'node:path'
 import { ActorStoreConfig } from '../config'
 import { retrySqlite } from '../db'
-
-type ActorStoreResources = {
-  blobstore: (did: string) => BlobStore
-  backgroundQueue: BackgroundQueue
-  reservedKeyDir?: string
-}
+import DiskBlobStore from '../disk-blobstore'
+import { ActorStoreReader } from './actor-store-reader'
+import { ActorStoreResources } from './actor-store-resources'
+import { ActorStoreTransactor } from './actor-store-transactor'
+import { ActorStoreWriter } from './actor-store-writer'
+import { ActorDb, getDb, getMigrator } from './db'
 
 export class ActorStore {
   reservedKeyDir: string
@@ -82,50 +70,39 @@ export class ActorStore {
     return db
   }
 
-  async read<T>(did: string, fn: ActorStoreReadFn<T>) {
+  async read<T>(did: string, fn: (fn: ActorStoreReader) => T | PromiseLike<T>) {
     const db = await this.openDb(did)
     try {
-      const reader = createActorReader(did, db, this.resources, () =>
-        this.keypair(did),
-      )
-      return await fn(reader)
+      const getKeypair = () => this.keypair(did)
+      return await fn(new ActorStoreReader(did, db, this.resources, getKeypair))
     } finally {
       db.close()
     }
   }
 
-  async transact<T>(did: string, fn: ActorStoreTransactFn<T>) {
+  async transact<T>(
+    did: string,
+    fn: (fn: ActorStoreTransactor) => T | PromiseLike<T>,
+  ) {
     const keypair = await this.keypair(did)
     const db = await this.openDb(did)
     try {
       return await db.transaction((dbTxn) => {
-        const store = createActorTransactor(did, dbTxn, keypair, this.resources)
-        return fn(store)
+        return fn(new ActorStoreTransactor(did, dbTxn, keypair, this.resources))
       })
     } finally {
       db.close()
     }
   }
 
-  async writeNoTransaction<T>(did: string, fn: ActorStoreWriterFn<T>) {
+  async writeNoTransaction<T>(
+    did: string,
+    fn: (fn: ActorStoreWriter) => T | PromiseLike<T>,
+  ) {
     const keypair = await this.keypair(did)
     const db = await this.openDb(did)
     try {
-      const writer = createActorTransactor(did, db, keypair, this.resources)
-      return await fn({
-        ...writer,
-        transact: async <T>(fn: ActorStoreTransactFn<T>): Promise<T> => {
-          return db.transaction((dbTxn) => {
-            const transactor = createActorTransactor(
-              did,
-              dbTxn,
-              keypair,
-              this.resources,
-            )
-            return fn(transactor)
-          })
-        },
-      })
+      return await fn(new ActorStoreWriter(did, db, keypair, this.resources))
     } finally {
       db.close()
     }
@@ -157,10 +134,9 @@ export class ActorStore {
     if (blobstore instanceof DiskBlobStore) {
       await blobstore.deleteAll()
     } else {
-      const blobRows = await this.read(did, (store) =>
-        store.db.db.selectFrom('blob').select('cid').execute(),
+      const cids = await this.read(did, async (store) =>
+        store.repo.blob.getBlobCids(),
       )
-      const cids = blobRows.map((row) => CID.parse(row.cid))
       await Promise.allSettled(
         chunkArray(cids, 500).map((chunk) => blobstore.deleteMany(chunk)),
       )
@@ -226,73 +202,6 @@ const loadKey = async (loc: string): Promise<ExportableKeypair | undefined> => {
   return crypto.Secp256k1Keypair.import(privKey, { exportable: true })
 }
 
-const createActorTransactor = (
-  did: string,
-  db: ActorDb,
-  keypair: Keypair,
-  resources: ActorStoreResources,
-): ActorStoreTransactor => {
-  const { blobstore, backgroundQueue } = resources
-  const userBlobstore = blobstore(did)
-  return {
-    did,
-    db,
-    repo: new RepoTransactor(db, did, keypair, userBlobstore, backgroundQueue),
-    record: new RecordTransactor(db, userBlobstore),
-    pref: new PreferenceTransactor(db),
-  }
-}
-
-const createActorReader = (
-  did: string,
-  db: ActorDb,
-  resources: ActorStoreResources,
-  getKeypair: () => Promise<Keypair>,
-): ActorStoreReader => {
-  const { blobstore } = resources
-  return {
-    did,
-    db,
-    repo: new RepoReader(db, blobstore(did)),
-    record: new RecordReader(db),
-    pref: new PreferenceReader(db),
-    keypair: getKeypair,
-    transact: async <T>(fn: ActorStoreTransactFn<T>): Promise<T> => {
-      const keypair = await getKeypair()
-      return db.transaction((dbTxn) => {
-        const store = createActorTransactor(did, dbTxn, keypair, resources)
-        return fn(store)
-      })
-    },
-  }
-}
-
-export type ActorStoreReadFn<T> = (fn: ActorStoreReader) => Promise<T>
-export type ActorStoreTransactFn<T> = (fn: ActorStoreTransactor) => Promise<T>
-export type ActorStoreWriterFn<T> = (fn: ActorStoreWriter) => Promise<T>
-
-export type ActorStoreReader = {
-  did: string
-  db: ActorDb
-  repo: RepoReader
-  record: RecordReader
-  pref: PreferenceReader
-  keypair: () => Promise<Keypair>
-  transact: <T>(fn: ActorStoreTransactFn<T>) => Promise<T>
-}
-
-export type ActorStoreTransactor = {
-  did: string
-  db: ActorDb
-  repo: RepoTransactor
-  record: RecordTransactor
-  pref: PreferenceTransactor
-}
-
-export type ActorStoreWriter = ActorStoreTransactor & {
-  transact: <T>(fn: ActorStoreTransactFn<T>) => Promise<T>
-}
-
 function assertSafePathPart(part: string) {
   const normalized = path.normalize(part)
   assert(
diff --git a/packages/pds/src/actor-store/blob/reader.ts b/packages/pds/src/actor-store/blob/reader.ts
index 20192f8641c..6ab87d1ad84 100644
--- a/packages/pds/src/actor-store/blob/reader.ts
+++ b/packages/pds/src/actor-store/blob/reader.ts
@@ -1,10 +1,10 @@
-import stream from 'stream'
-import { CID } from 'multiformats/cid'
 import { BlobNotFoundError, BlobStore } from '@atproto/repo'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { ActorDb } from '../db'
+import { CID } from 'multiformats/cid'
+import stream from 'stream'
 import { countAll, countDistinct, notSoftDeletedClause } from '../../db/util'
 import { StatusAttr } from '../../lexicon/types/com/atproto/admin/defs'
+import { ActorDb } from '../db'
 
 export class BlobReader {
   constructor(
@@ -95,6 +95,16 @@ export class BlobReader {
     return res.map((row) => row.recordUri)
   }
 
+  async getBlobsForRecord(recordUri: string): Promise<string[]> {
+    const res = await this.db.db
+      .selectFrom('blob')
+      .innerJoin('record_blob', 'record_blob.blobCid', 'blob.cid')
+      .where('recordUri', '=', recordUri)
+      .select('blob.cid')
+      .execute()
+    return res.map((row) => row.cid)
+  }
+
   async blobCount(): Promise<number> {
     const res = await this.db.db
       .selectFrom('blob')
@@ -138,4 +148,9 @@ export class BlobReader {
       recordUri: row.recordUri,
     }))
   }
+
+  async getBlobCids() {
+    const blobRows = await this.db.db.selectFrom('blob').select('cid').execute()
+    return blobRows.map((row) => CID.parse(row.cid))
+  }
 }
diff --git a/packages/pds/src/actor-store/blob/transactor.ts b/packages/pds/src/actor-store/blob/transactor.ts
index fa937e6bec6..08674e17b95 100644
--- a/packages/pds/src/actor-store/blob/transactor.ts
+++ b/packages/pds/src/actor-store/blob/transactor.ts
@@ -38,6 +38,21 @@ export class BlobTransactor extends BlobReader {
     super(db, blobstore)
   }
 
+  async insertBlobs(recordUri: string, blobs: Iterable<BlobRef>) {
+    const values = Array.from(blobs, (cid) => ({
+      recordUri,
+      blobCid: cid.ref.toString(),
+    }))
+
+    if (values.length) {
+      await this.db.db
+        .insertInto('record_blob')
+        .values(values)
+        .onConflict((oc) => oc.doNothing())
+        .execute()
+    }
+  }
+
   async uploadBlobAndGetMetadata(
     userSuggestedMime: string,
     blobStream: stream.Readable,
diff --git a/packages/pds/src/actor-store/record/reader.ts b/packages/pds/src/actor-store/record/reader.ts
index 7c7b3383439..10cd139a589 100644
--- a/packages/pds/src/actor-store/record/reader.ts
+++ b/packages/pds/src/actor-store/record/reader.ts
@@ -1,12 +1,21 @@
+import { RepoRecord } from '@atproto/lexicon'
+import { cborToLexRecord, CidSet, formatDataKey } from '@atproto/repo'
 import * as syntax from '@atproto/syntax'
 import { AtUri, ensureValidAtUri } from '@atproto/syntax'
-import { cborToLexRecord } from '@atproto/repo'
 import { CID } from 'multiformats/cid'
 import { countAll, notSoftDeletedClause } from '../../db/util'
 import { ids } from '../../lexicon/lexicons'
-import { ActorDb, Backlink } from '../db'
+import { Record as ProfileRecord } from '../../lexicon/types/app/bsky/actor/profile'
+import { Record as PostRecord } from '../../lexicon/types/app/bsky/feed/post'
 import { StatusAttr } from '../../lexicon/types/com/atproto/admin/defs'
-import { RepoRecord } from '@atproto/lexicon'
+import { LocalRecords } from '../../read-after-write/types'
+import { ActorDb, Backlink } from '../db'
+
+export type RecordDescript = {
+  uri: string
+  path: string
+  cid: CID
+}
 
 export class RecordReader {
   constructor(public db: ActorDb) {}
@@ -19,6 +28,30 @@ export class RecordReader {
     return res?.count ?? 0
   }
 
+  async listAll(): Promise<RecordDescript[]> {
+    const records: RecordDescript[] = []
+    let cursor: string | undefined = ''
+    while (cursor !== undefined) {
+      const res = await this.db.db
+        .selectFrom('record')
+        .select(['uri', 'cid'])
+        .where('uri', '>', cursor)
+        .orderBy('uri', 'asc')
+        .limit(1000)
+        .execute()
+      for (const row of res) {
+        const parsed = new AtUri(row.uri)
+        records.push({
+          uri: row.uri,
+          path: formatDataKey(parsed.collection, parsed.rkey),
+          cid: CID.parse(row.cid),
+        })
+      }
+      cursor = res.at(-1)?.uri
+    }
+    return records
+  }
+
   async listCollections(): Promise<string[]> {
     const collections = await this.db.db
       .selectFrom('record')
@@ -194,6 +227,94 @@ export class RecordReader {
       .flat()
       .map(({ rkey }) => AtUri.make(uri.hostname, uri.collection, rkey))
   }
+
+  async listExistingBlocks(): Promise<CidSet> {
+    const cids = new CidSet()
+    let cursor: string | undefined = ''
+    while (cursor !== undefined) {
+      const res = await this.db.db
+        .selectFrom('repo_block')
+        .select('cid')
+        .where('cid', '>', cursor)
+        .orderBy('cid', 'asc')
+        .limit(1000)
+        .execute()
+      for (const row of res) {
+        cids.add(CID.parse(row.cid))
+      }
+      cursor = res.at(-1)?.cid
+    }
+    return cids
+  }
+
+  async getProfileRecord() {
+    const row = await this.db.db
+      .selectFrom('record')
+      .leftJoin('repo_block', 'repo_block.cid', 'record.cid')
+      .where('record.collection', '=', ids.AppBskyActorProfile)
+      .where('record.rkey', '=', 'self')
+      .selectAll()
+      .executeTakeFirst()
+
+    if (!row?.content) return null
+
+    return cborToLexRecord(row.content) as ProfileRecord
+  }
+
+  async getRecordsSinceRev(rev: string): Promise<LocalRecords> {
+    const result: LocalRecords = { count: 0, profile: null, posts: [] }
+
+    const res = await this.db.db
+      .selectFrom('record')
+      .innerJoin('repo_block', 'repo_block.cid', 'record.cid')
+      .select([
+        'repo_block.content',
+        'uri',
+        'repo_block.cid',
+        'record.indexedAt',
+      ])
+      .where('record.repoRev', '>', rev)
+      .limit(10)
+      .orderBy('record.repoRev', 'asc')
+      .execute()
+
+    // sanity check to ensure that the clock received is not before _all_ local records (for instance in case of account migration)
+    if (res.length > 0) {
+      const sanityCheckRes = await this.db.db
+        .selectFrom('record')
+        .selectAll()
+        .where('record.repoRev', '<=', rev)
+        .limit(1)
+        .executeTakeFirst()
+
+      if (!sanityCheckRes) {
+        return result
+      }
+    }
+
+    for (const cur of res) {
+      result.count++
+
+      const uri = new AtUri(cur.uri)
+      if (uri.collection === ids.AppBskyActorProfile && uri.rkey === 'self') {
+        result.profile = {
+          uri,
+          cid: CID.parse(cur.cid),
+          indexedAt: cur.indexedAt,
+          record: cborToLexRecord(cur.content) as ProfileRecord,
+        }
+      } else if (uri.collection === ids.AppBskyFeedPost) {
+        result.posts.push({
+          uri,
+          cid: CID.parse(cur.cid),
+          indexedAt: cur.indexedAt,
+          record: cborToLexRecord(cur.content) as PostRecord,
+        })
+      }
+    }
+
+    return result
+  }
 }
 
 // @NOTE in the future this can be replaced with a more generic routine that pulls backlinks based on lex docs.
diff --git a/packages/pds/src/actor-store/repo/reader.ts b/packages/pds/src/actor-store/repo/reader.ts
index 63abe1400d6..5429615efe3 100644
--- a/packages/pds/src/actor-store/repo/reader.ts
+++ b/packages/pds/src/actor-store/repo/reader.ts
@@ -1,8 +1,10 @@
 import { BlobStore } from '@atproto/repo'
-import { SqlRepoReader } from './sql-repo-reader'
+import { CID } from 'multiformats/cid'
+
 import { BlobReader } from '../blob/reader'
 import { ActorDb } from '../db'
 import { RecordReader } from '../record/reader'
+import { SqlRepoReader } from './sql-repo-reader'
 
 export class RepoReader {
   blob: BlobReader
diff --git a/packages/pds/src/actor-store/repo/sql-repo-reader.ts b/packages/pds/src/actor-store/repo/sql-repo-reader.ts
index 15e0b7c6a73..241a8512907 100644
--- a/packages/pds/src/actor-store/repo/sql-repo-reader.ts
+++ b/packages/pds/src/actor-store/repo/sql-repo-reader.ts
@@ -19,13 +19,14 @@ export class SqlRepoReader extends ReadableBlockstore {
 
   async getRoot(): Promise<CID> {
     const root = await this.getRootDetailed()
-    return root?.cid ?? null
+    return root.cid
   }
 
   async getRootDetailed(): Promise<{ cid: CID; rev: string }> {
     const res = await this.db.db
       .selectFrom('repo_root')
-      .selectAll()
+      .select(['cid', 'rev'])
+      .limit(1)
       .executeTakeFirstOrThrow()
     return {
       cid: CID.parse(res.cid),
diff --git a/packages/pds/src/actor-store/repo/transactor.ts b/packages/pds/src/actor-store/repo/transactor.ts
index 4f2ef192de9..a9477543779 100644
--- a/packages/pds/src/actor-store/repo/transactor.ts
+++ b/packages/pds/src/actor-store/repo/transactor.ts
@@ -21,21 +21,28 @@ export class RepoTransactor extends RepoReader {
   blob: BlobTransactor
   record: RecordTransactor
   storage: SqlRepoTransactor
-  now: string
 
   constructor(
     public db: ActorDb,
+    public blobstore: BlobStore,
     public did: string,
     public signingKey: crypto.Keypair,
-    public blobstore: BlobStore,
     public backgroundQueue: BackgroundQueue,
-    now?: string,
+    public now: string = new Date().toISOString(),
   ) {
     super(db, blobstore)
     this.blob = new BlobTransactor(db, blobstore, backgroundQueue)
     this.record = new RecordTransactor(db, blobstore)
-    this.now = now ?? new Date().toISOString()
-    this.storage = new SqlRepoTransactor(db, this.did, this.now)
+    this.storage = new SqlRepoTransactor(db, did, now)
+  }
+
+  async maybeLoadRepo(): Promise<Repo | null> {
+    const res = await this.db.db
+      .selectFrom('repo_root')
+      .select('cid')
+      .limit(1)
+      .executeTakeFirst()
+    return res ? Repo.load(this.storage, CID.parse(res.cid)) : null
   }
 
   async createRepo(writes: PreparedCreate[]): Promise<CommitData> {
diff --git a/packages/pds/src/api/app/bsky/actor/getPreferences.ts b/packages/pds/src/api/app/bsky/actor/getPreferences.ts
index 761873df473..4a4e7a6943b 100644
--- a/packages/pds/src/api/app/bsky/actor/getPreferences.ts
+++ b/packages/pds/src/api/app/bsky/actor/getPreferences.ts
@@ -3,7 +3,8 @@ import AppContext from '../../../../context'
 import { AuthScope } from '../../../../auth-verifier'
 
 export default function (server: Server, ctx: AppContext) {
-  if (!ctx.cfg.bskyAppView) return
+  if (!ctx.bskyAppView) return
+
   server.app.bsky.actor.getPreferences({
     auth: ctx.authVerifier.accessStandard({
       additional: [AuthScope.Takendown],
diff --git a/packages/pds/src/api/app/bsky/actor/getProfile.ts b/packages/pds/src/api/app/bsky/actor/getProfile.ts
index bf31ec8fe00..fda6ad6fde5 100644
--- a/packages/pds/src/api/app/bsky/actor/getProfile.ts
+++ b/packages/pds/src/api/app/bsky/actor/getProfile.ts
@@ -8,8 +8,8 @@ import {
 } from '../../../../read-after-write'
 
 export default function (server: Server, ctx: AppContext) {
-  const { bskyAppView } = ctx.cfg
-  if (!bskyAppView) return
+  if (!ctx.bskyAppView) return
+
   server.app.bsky.actor.getProfile({
     auth: ctx.authVerifier.accessStandard(),
     handler: async (reqCtx) => {
diff --git a/packages/pds/src/api/app/bsky/actor/getProfiles.ts b/packages/pds/src/api/app/bsky/actor/getProfiles.ts
index 77e6fc52121..104635bf8e6 100644
--- a/packages/pds/src/api/app/bsky/actor/getProfiles.ts
+++ b/packages/pds/src/api/app/bsky/actor/getProfiles.ts
@@ -8,8 +8,8 @@ import {
 } from '../../../../read-after-write'
 
 export default function (server: Server, ctx: AppContext) {
-  const { bskyAppView } = ctx.cfg
-  if (!bskyAppView) return
+  if (!ctx.bskyAppView) return
+
   server.app.bsky.actor.getProfiles({
     auth: ctx.authVerifier.accessStandard(),
     handler: async (reqCtx) => {
diff --git a/packages/pds/src/api/app/bsky/actor/putPreferences.ts b/packages/pds/src/api/app/bsky/actor/putPreferences.ts
index 5006c2150a5..ea559282835 100644
--- a/packages/pds/src/api/app/bsky/actor/putPreferences.ts
+++ b/packages/pds/src/api/app/bsky/actor/putPreferences.ts
@@ -4,7 +4,8 @@ import AppContext from '../../../../context'
 import { AccountPreference } from '../../../../actor-store/preference/reader'
 
 export default function (server: Server, ctx: AppContext) {
-  if (!ctx.cfg.bskyAppView) return
+  if (!ctx.bskyAppView) return
+
   server.app.bsky.actor.putPreferences({
     auth: ctx.authVerifier.accessStandard({ checkTakedown: true }),
     handler: async ({ auth, input }) => {
diff --git a/packages/pds/src/api/app/bsky/feed/getActorLikes.ts b/packages/pds/src/api/app/bsky/feed/getActorLikes.ts
index ef7ff9a5550..02547bc240c 100644
--- a/packages/pds/src/api/app/bsky/feed/getActorLikes.ts
+++ b/packages/pds/src/api/app/bsky/feed/getActorLikes.ts
@@ -8,8 +8,8 @@ import {
 } from '../../../../read-after-write'
 
 export default function (server: Server, ctx: AppContext) {
-  const { bskyAppView } = ctx.cfg
-  if (!bskyAppView) return
+  if (!ctx.bskyAppView) return
+
   server.app.bsky.feed.getActorLikes({
     auth: ctx.authVerifier.accessStandard(),
     handler: async (reqCtx) => {
diff --git a/packages/pds/src/api/app/bsky/feed/getAuthorFeed.ts b/packages/pds/src/api/app/bsky/feed/getAuthorFeed.ts
index 6685267fe1a..942ff8dce50 100644
--- a/packages/pds/src/api/app/bsky/feed/getAuthorFeed.ts
+++ b/packages/pds/src/api/app/bsky/feed/getAuthorFeed.ts
@@ -9,8 +9,8 @@ import {
 } from '../../../../read-after-write'
 
 export default function (server: Server, ctx: AppContext) {
-  const { bskyAppView } = ctx.cfg
-  if (!bskyAppView) return
+  if (!ctx.bskyAppView) return
+
   server.app.bsky.feed.getAuthorFeed({
     auth: ctx.authVerifier.accessStandard(),
     handler: async (reqCtx) => {
diff --git a/packages/pds/src/api/app/bsky/feed/getFeed.ts b/packages/pds/src/api/app/bsky/feed/getFeed.ts
index 156fac7257d..e4634a7e1ed 100644
--- a/packages/pds/src/api/app/bsky/feed/getFeed.ts
+++ b/packages/pds/src/api/app/bsky/feed/getFeed.ts
@@ -6,16 +6,16 @@ import { AtUri } from '@atproto/syntax'
 import { InvalidRequestError } from '@atproto/oauth-provider'
 
 export default function (server: Server, ctx: AppContext) {
-  const { appViewAgent } = ctx
-  const { bskyAppView } = ctx.cfg
-  if (!appViewAgent || !bskyAppView) return
+  const { bskyAppView } = ctx
+  if (!bskyAppView) return
+
   server.app.bsky.feed.getFeed({
     auth: ctx.authVerifier.accessStandard(),
     handler: async ({ params, auth, req }) => {
       const requester = auth.credentials.did
 
       const feedUrl = new AtUri(params.feed)
-      const { data } = await appViewAgent.com.atproto.repo.getRecord({
+      const { data } = await bskyAppView.agent.com.atproto.repo.getRecord({
         repo: feedUrl.hostname,
         collection: feedUrl.collection,
         rkey: feedUrl.rkey,
diff --git a/packages/pds/src/api/app/bsky/feed/getPostThread.ts b/packages/pds/src/api/app/bsky/feed/getPostThread.ts
index 8a748c33063..9518a4c4db4 100644
--- a/packages/pds/src/api/app/bsky/feed/getPostThread.ts
+++ b/packages/pds/src/api/app/bsky/feed/getPostThread.ts
@@ -25,8 +25,8 @@ import {
 import { ids } from '../../../../lexicon/lexicons'
 
 export default function (server: Server, ctx: AppContext) {
-  const { bskyAppView } = ctx.cfg
-  if (!bskyAppView) return
+  if (!ctx.bskyAppView) return
+
   server.app.bsky.feed.getPostThread({
     auth: ctx.authVerifier.accessStandard(),
     handler: async (reqCtx) => {
@@ -191,11 +191,12 @@ const readAfterWriteNotFound = async (
   const highestParent = getHighestParent(thread)
   if (highestParent) {
     try {
-      assert(ctx.appViewAgent)
-      const parentsRes = await ctx.appViewAgent.api.app.bsky.feed.getPostThread(
-        { uri: highestParent, parentHeight: params.parentHeight, depth: 0 },
-        await ctx.appviewAuthHeaders(requester, ids.AppBskyFeedGetPostThread),
-      )
+      assert(ctx.bskyAppView)
+      const parentsRes =
+        await ctx.bskyAppView.agent.app.bsky.feed.getPostThread(
+          { uri: highestParent, parentHeight: params.parentHeight, depth: 0 },
+          await ctx.appviewAuthHeaders(requester, ids.AppBskyFeedGetPostThread),
+        )
       thread.parent = parentsRes.data.thread
     } catch (err) {
       // do nothing
diff --git a/packages/pds/src/api/app/bsky/feed/getTimeline.ts b/packages/pds/src/api/app/bsky/feed/getTimeline.ts
index 1d95c6ce5f8..ce32d10245d 100644
--- a/packages/pds/src/api/app/bsky/feed/getTimeline.ts
+++ b/packages/pds/src/api/app/bsky/feed/getTimeline.ts
@@ -8,8 +8,8 @@ import {
 } from '../../../../read-after-write'
 
 export default function (server: Server, ctx: AppContext) {
-  const { bskyAppView } = ctx.cfg
-  if (!bskyAppView) return
+  if (!ctx.bskyAppView) return
+
   server.app.bsky.feed.getTimeline({
     auth: ctx.authVerifier.accessStandard(),
     handler: async (reqCtx) => {
diff --git a/packages/pds/src/api/app/bsky/notification/registerPush.ts b/packages/pds/src/api/app/bsky/notification/registerPush.ts
index 0e481e639a9..22880297f10 100644
--- a/packages/pds/src/api/app/bsky/notification/registerPush.ts
+++ b/packages/pds/src/api/app/bsky/notification/registerPush.ts
@@ -8,8 +8,9 @@ import { AuthScope } from '../../../../auth-verifier'
 import { ids } from '../../../../lexicon/lexicons'
 
 export default function (server: Server, ctx: AppContext) {
-  const { appViewAgent } = ctx
-  if (!appViewAgent) return
+  const { bskyAppView } = ctx
+  if (!bskyAppView) return
+
   server.app.bsky.notification.registerPush({
     auth: ctx.authVerifier.accessStandard({
       additional: [AuthScope.SignupQueued],
@@ -26,8 +27,8 @@ export default function (server: Server, ctx: AppContext) {
         ids.AppBskyNotificationRegisterPush,
       )
 
-      if (ctx.cfg.bskyAppView?.did === serviceDid) {
-        await appViewAgent.api.app.bsky.notification.registerPush(input.body, {
+      if (bskyAppView.did === serviceDid) {
+        await bskyAppView.agent.app.bsky.notification.registerPush(input.body, {
           ...authHeaders,
           encoding: 'application/json',
         })
diff --git a/packages/pds/src/api/com/atproto/identity/resolveHandle.ts b/packages/pds/src/api/com/atproto/identity/resolveHandle.ts
index 40122e2f3b6..f18529d0598 100644
--- a/packages/pds/src/api/com/atproto/identity/resolveHandle.ts
+++ b/packages/pds/src/api/com/atproto/identity/resolveHandle.ts
@@ -1,4 +1,3 @@
-import { AtpAgent } from '@atproto/api'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import * as ident from '@atproto/syntax'
 import { Server } from '../../../../lexicon'
@@ -33,8 +32,16 @@ export default function (server: Server, ctx: AppContext) {
     }
 
     // this is not someone on our server, but we help with resolving anyway
-    if (!did && ctx.appViewAgent) {
-      did = await tryResolveFromAppView(ctx.appViewAgent, handle)
+    if (!did && ctx.bskyAppView) {
+      try {
+        const result =
+          await ctx.bskyAppView.agent.com.atproto.identity.resolveHandle({
+            handle,
+          })
+        did = result.data.did
+      } catch {
+        // Ignore
+      }
     }
 
     if (!did) {
@@ -51,14 +58,3 @@ export default function (server: Server, ctx: AppContext) {
     }
   })
 }
-
-async function tryResolveFromAppView(agent: AtpAgent, handle: string) {
-  try {
-    const result = await agent.api.com.atproto.identity.resolveHandle({
-      handle,
-    })
-    return result.data.did
-  } catch (_err) {
-    return
-  }
-}
diff --git a/packages/pds/src/api/com/atproto/repo/importRepo.ts b/packages/pds/src/api/com/atproto/repo/importRepo.ts
index f043b8f4041..e0a5608d065 100644
--- a/packages/pds/src/api/com/atproto/repo/importRepo.ts
+++ b/packages/pds/src/api/com/atproto/repo/importRepo.ts
@@ -1,9 +1,8 @@
 import { Server } from '../../../../lexicon'
 import AppContext from '../../../../context'
-import { ActorStoreTransactor } from '../../../../actor-store'
+import { ActorStoreTransactor } from '../../../../actor-store/actor-store-transactor'
 import { TID } from '@atproto/common'
 import {
-  Repo,
   WriteOpAction,
   getAndParseRecord,
   readCarStream,
@@ -44,13 +43,7 @@ const importRepo = async (
   if (roots.length !== 1) {
     throw new InvalidRequestError('expected one root')
   }
-  const currRoot = await actorStore.db.db
-    .selectFrom('repo_root')
-    .selectAll()
-    .executeTakeFirst()
-  const currRepo = currRoot
-    ? await Repo.load(actorStore.repo.storage, CID.parse(currRoot.cid))
-    : null
+  const currRepo = await actorStore.repo.maybeLoadRepo()
   const diff = await verifyDiff(
     currRepo,
     blocks,
@@ -89,18 +82,10 @@ const importRepo = async (
               now,
             )
             const recordBlobs = findBlobRefs(parsedRecord)
-            const blobValues = recordBlobs.map((cid) => ({
-              recordUri: uri.toString(),
-              blobCid: cid.ref.toString(),
-            }))
-            const indexRecordBlobs =
-              blobValues.length > 0
-                ? actorStore.db.db
-                    .insertInto('record_blob')
-                    .values(blobValues)
-                    .onConflict((oc) => oc.doNothing())
-                    .execute()
-                : Promise.resolve()
+            const indexRecordBlobs = actorStore.repo.blob.insertBlobs(
+              uri.toString(),
+              recordBlobs,
+            )
             await Promise.all([indexRecord, indexRecordBlobs])
           }
         },
diff --git a/packages/pds/src/api/com/atproto/repo/putRecord.ts b/packages/pds/src/api/com/atproto/repo/putRecord.ts
index 927d27f6992..5cc00dd12ee 100644
--- a/packages/pds/src/api/com/atproto/repo/putRecord.ts
+++ b/packages/pds/src/api/com/atproto/repo/putRecord.ts
@@ -1,21 +1,22 @@
-import { CID } from 'multiformats/cid'
+import { BlobRef } from '@atproto/lexicon'
+import { CommitData } from '@atproto/repo'
 import { AtUri } from '@atproto/syntax'
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
-import { CommitData } from '@atproto/repo'
-import { BlobRef } from '@atproto/lexicon'
-import { Server } from '../../../../lexicon'
-import { prepareUpdate, prepareCreate } from '../../../../repo'
+import { CID } from 'multiformats/cid'
+import { ActorStoreTransactor } from '../../../../actor-store/actor-store-transactor'
 import AppContext from '../../../../context'
+import { Server } from '../../../../lexicon'
+import { ids } from '../../../../lexicon/lexicons'
+import { Record as ProfileRecord } from '../../../../lexicon/types/app/bsky/actor/profile'
 import {
   BadCommitSwapError,
   BadRecordSwapError,
   InvalidRecordError,
+  prepareCreate,
   PreparedCreate,
   PreparedUpdate,
+  prepareUpdate,
 } from '../../../../repo'
-import { ids } from '../../../../lexicon/lexicons'
-import { Record as ProfileRecord } from '../../../../lexicon/types/app/bsky/actor/profile'
-import { ActorStoreTransactor } from '../../../../actor-store'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.repo.putRecord({
diff --git a/packages/pds/src/bsky-app-view.ts b/packages/pds/src/bsky-app-view.ts
new file mode 100644
index 00000000000..ee3f7ae714c
--- /dev/null
+++ b/packages/pds/src/bsky-app-view.ts
@@ -0,0 +1,26 @@
+import { format } from 'node:util'
+import { AtpAgent } from '@atproto/api'
+
+export type AppViewOptions = {
+  url: string
+  did: string
+  cdnUrlPattern?: string
+}
+
+export class BskyAppView {
+  public did: string
+  public url: string
+  public agent: AtpAgent
+  private cdnUrlPattern?: string
+
+  constructor(options: AppViewOptions) {
+    this.did = options.did
+    this.url = options.url
+    this.agent = new AtpAgent({ service: options.url })
+    this.cdnUrlPattern = options.cdnUrlPattern
+  }
+
+  getImageUrl(pattern: string, did: string, cid: string): string | undefined {
+    if (this.cdnUrlPattern) return format(this.cdnUrlPattern, pattern, did, cid)
+  }
+}
diff --git a/packages/pds/src/context.ts b/packages/pds/src/context.ts
index 633a48b46dc..7b43401776a 100644
--- a/packages/pds/src/context.ts
+++ b/packages/pds/src/context.ts
@@ -41,8 +41,10 @@ import { DidSqliteCache } from './did-cache'
 import { Crawlers } from './crawlers'
 import { DiskBlobStore } from './disk-blobstore'
 import { getRedisClient } from './redis'
-import { ActorStore } from './actor-store'
+import { ActorStore } from './actor-store/actor-store'
 import { LocalViewer, LocalViewerCreator } from './read-after-write/viewer'
+import { BskyAppView } from './bsky-app-view'
+import { ImageUrlBuilder } from './image/image-url-builder'
 
 export type AppContextOptions = {
   actorStore: ActorStore
@@ -59,7 +61,7 @@ export type AppContextOptions = {
   redisScratch?: Redis
   ratelimitCreator?: RateLimiterCreator
   crawlers: Crawlers
-  appViewAgent?: AtpAgent
+  bskyAppView?: BskyAppView
   moderationAgent?: AtpAgent
   reportingAgent?: AtpAgent
   entrywayAgent?: AtpAgent
@@ -86,7 +88,7 @@ export class AppContext {
   public redisScratch?: Redis
   public ratelimitCreator?: RateLimiterCreator
   public crawlers: Crawlers
-  public appViewAgent: AtpAgent | undefined
+  public bskyAppView?: BskyAppView
   public moderationAgent: AtpAgent | undefined
   public reportingAgent: AtpAgent | undefined
   public entrywayAgent: AtpAgent | undefined
@@ -112,7 +114,7 @@ export class AppContext {
     this.redisScratch = opts.redisScratch
     this.ratelimitCreator = opts.ratelimitCreator
     this.crawlers = opts.crawlers
-    this.appViewAgent = opts.appViewAgent
+    this.bskyAppView = opts.bskyAppView
     this.moderationAgent = opts.moderationAgent
     this.reportingAgent = opts.reportingAgent
     this.entrywayAgent = opts.entrywayAgent
@@ -214,9 +216,10 @@ export class AppContext {
       }
     }
 
-    const appViewAgent = cfg.bskyAppView
-      ? new AtpAgent({ service: cfg.bskyAppView.url })
+    const bskyAppView = cfg.bskyAppView
+      ? new BskyAppView(cfg.bskyAppView)
       : undefined
+
     const moderationAgent = cfg.modService
       ? new AtpAgent({ service: cfg.modService.url })
       : undefined
@@ -232,7 +235,19 @@ export class AppContext {
       ? createPublicKeyObject(cfg.entryway.jwtPublicKeyHex)
       : null
 
+    const imageUrlBuilder = new ImageUrlBuilder(
+      cfg.service.hostname,
+      bskyAppView,
+    )
+
+    const actorStore = new ActorStore(cfg.actorStore, {
+      blobstore,
+      backgroundQueue,
+    })
+
     const accountManager = new AccountManager(
+      actorStore,
+      imageUrlBuilder,
       backgroundQueue,
       cfg.db.accountDbLoc,
       jwtSecretKey,
@@ -250,18 +265,11 @@ export class AppContext {
             secrets.plcRotationKey.privateKeyHex,
           )
 
-    const actorStore = new ActorStore(cfg.actorStore, {
-      blobstore,
-      backgroundQueue,
-    })
-
-    const localViewer = LocalViewer.creator({
+    const localViewer = LocalViewer.creator(
       accountManager,
-      appViewAgent,
-      pdsHostname: cfg.service.hostname,
-      appviewDid: cfg.bskyAppView?.did,
-      appviewCdnUrlPattern: cfg.bskyAppView?.cdnUrlPattern,
-    })
+      imageUrlBuilder,
+      bskyAppView,
+    )
 
     // An agent for performing HTTP requests based on user provided URLs.
     const proxyAgentBase = new undici.Agent({
@@ -322,8 +330,6 @@ export class AppContext {
             await JoseKey.fromKeyLike(jwtSecretKey, undefined, 'HS256'),
           ],
           accountManager,
-          actorStore,
-          localViewer,
           redis: redisScratch,
           dpopSecret: secrets.dpopSecret,
           customization: cfg.oauth.provider.customization,
@@ -371,7 +377,7 @@ export class AppContext {
       redisScratch,
       ratelimitCreator,
       crawlers,
-      appViewAgent,
+      bskyAppView,
       moderationAgent,
       reportingAgent,
       entrywayAgent,
@@ -386,8 +392,8 @@ export class AppContext {
   }
 
   async appviewAuthHeaders(did: string, lxm: string) {
-    assert(this.cfg.bskyAppView)
-    return this.serviceAuthHeaders(did, this.cfg.bskyAppView.did, lxm)
+    assert(this.bskyAppView)
+    return this.serviceAuthHeaders(did, this.bskyAppView.did, lxm)
   }
 
   async serviceAuthHeaders(did: string, aud: string, lxm: string) {
diff --git a/packages/pds/src/db/db.ts b/packages/pds/src/db/db.ts
index 62a3de9ad81..f0a2c670547 100644
--- a/packages/pds/src/db/db.ts
+++ b/packages/pds/src/db/db.ts
@@ -51,7 +51,7 @@ export class Database<Schema> {
   }
 
   async transactionNoRetry<T>(
-    fn: (db: Database<Schema>) => T | Promise<T>,
+    fn: (db: Database<Schema>) => T | PromiseLike<T>,
   ): Promise<T> {
     this.assertNotTransaction()
     const leakyTxPlugin = new LeakyTxPlugin()
@@ -77,7 +77,7 @@ export class Database<Schema> {
   }
 
   async transaction<T>(
-    fn: (db: Database<Schema>) => T | Promise<T>,
+    fn: (db: Database<Schema>) => T | PromiseLike<T>,
   ): Promise<T> {
     return retrySqlite(() => this.transactionNoRetry(fn))
   }
diff --git a/packages/pds/src/image/image-url-builder.ts b/packages/pds/src/image/image-url-builder.ts
new file mode 100644
index 00000000000..8665c7f3f25
--- /dev/null
+++ b/packages/pds/src/image/image-url-builder.ts
@@ -0,0 +1,16 @@
+import { BskyAppView } from '../bsky-app-view'
+import { ids } from '../lexicon/lexicons'
+
+export class ImageUrlBuilder {
+  constructor(
+    readonly pdsHostname: string,
+    readonly bskyAppView?: BskyAppView,
+  ) {}
+
+  build(pattern: string, did: string, cid: string): string {
+    return (
+      this.bskyAppView?.getImageUrl(pattern, did, cid) ??
+      `https://${this.pdsHostname}/xrpc/${ids.ComAtprotoSyncGetBlob}?did=${did}&cid=${cid}`
+    )
+  }
+}
diff --git a/packages/pds/src/oauth/detailed-account-store.ts b/packages/pds/src/oauth/detailed-account-store.ts
deleted file mode 100644
index 203b735fce0..00000000000
--- a/packages/pds/src/oauth/detailed-account-store.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import {
-  AccountInfo,
-  AccountStore,
-  DeviceId,
-  SignInCredentials,
-} from '@atproto/oauth-provider'
-
-import { AccountManager } from '../account-manager/index'
-import { ActorStore } from '../actor-store/index'
-import { ProfileViewBasic } from '../lexicon/types/app/bsky/actor/defs'
-import { LocalViewerCreator } from '../read-after-write/index'
-
-/**
- * Although the {@link AccountManager} class implements the {@link AccountStore}
- * interface, the accounts it returns do not contain any profile information
- * (display name, avatar, etc). This is due to the fact that the account manager
- * does not have access to the account's repos. The {@link DetailedAccountStore}
- * is a wrapper around the {@link AccountManager} that enriches the accounts
- * with profile information using the account's repos through the
- * {@link ActorStore}.
- */
-export class DetailedAccountStore implements AccountStore {
-  constructor(
-    private accountManager: AccountManager,
-    private actorStore: ActorStore,
-    private localViewer: LocalViewerCreator,
-  ) {}
-
-  private async getProfile(did: string): Promise<ProfileViewBasic | null> {
-    // TODO: Should we cache this?
-    return this.actorStore.read(did, async (actorStoreReader) => {
-      const localViewer = this.localViewer(actorStoreReader)
-      return localViewer.getProfileBasic()
-    })
-  }
-
-  private async enrichAccountInfo(
-    accountInfo: AccountInfo,
-  ): Promise<AccountInfo> {
-    const { account } = accountInfo
-    if (!account.picture || !account.name) {
-      const profile = await this.getProfile(account.sub)
-      if (profile) {
-        account.picture ||= profile.avatar
-        account.name ||= profile.displayName
-      }
-    }
-
-    return accountInfo
-  }
-
-  async authenticateAccount(
-    credentials: SignInCredentials,
-    deviceId: DeviceId,
-  ): Promise<AccountInfo | null> {
-    const accountInfo = await this.accountManager.authenticateAccount(
-      credentials,
-      deviceId,
-    )
-    if (!accountInfo) return null
-    return this.enrichAccountInfo(accountInfo)
-  }
-
-  async addAuthorizedClient(
-    deviceId: DeviceId,
-    sub: string,
-    clientId: string,
-  ): Promise<void> {
-    return this.accountManager.addAuthorizedClient(deviceId, sub, clientId)
-  }
-
-  async getDeviceAccount(
-    deviceId: DeviceId,
-    sub: string,
-  ): Promise<AccountInfo | null> {
-    const accountInfo = await this.accountManager.getDeviceAccount(
-      deviceId,
-      sub,
-    )
-    if (!accountInfo) return null
-    return this.enrichAccountInfo(accountInfo)
-  }
-
-  async listDeviceAccounts(deviceId: DeviceId): Promise<AccountInfo[]> {
-    const accountInfos = await this.accountManager.listDeviceAccounts(deviceId)
-    return Promise.all(
-      accountInfos.map(async (accountInfo) =>
-        this.enrichAccountInfo(accountInfo),
-      ),
-    )
-  }
-
-  async removeDeviceAccount(deviceId: DeviceId, sub: string): Promise<void> {
-    return this.accountManager.removeDeviceAccount(deviceId, sub)
-  }
-}
diff --git a/packages/pds/src/oauth/provider.ts b/packages/pds/src/oauth/provider.ts
index 2fb039dd2dc..534e5c34a24 100644
--- a/packages/pds/src/oauth/provider.ts
+++ b/packages/pds/src/oauth/provider.ts
@@ -5,15 +5,10 @@ import {
 } from '@atproto/oauth-provider'
 
 import { AccountManager } from '../account-manager/index'
-import { ActorStore } from '../actor-store/index'
 import { oauthLogger } from '../logger'
-import { LocalViewerCreator } from '../read-after-write/index'
-import { DetailedAccountStore } from './detailed-account-store'
 
 export type AuthProviderOptions = {
   accountManager: AccountManager
-  actorStore: ActorStore
-  localViewer: LocalViewerCreator
 } & Pick<
   OAuthProviderOptions,
   'issuer' | 'redis' | 'keyset' | 'dpopSecret' | 'customization'
@@ -23,8 +18,6 @@ export type AuthProviderOptions = {
 export class PdsOAuthProvider extends OAuthProvider {
   constructor({
     accountManager,
-    actorStore,
-    localViewer,
     keyset,
     redis,
     dpopSecret,
@@ -39,6 +32,7 @@ export class PdsOAuthProvider extends OAuthProvider {
       redis,
       safeFetch,
       customization,
+      store: accountManager,
       metadata: {
         // PdsOAuthProvider is used when the PDS is both an authorization server
         // & resource server, in which case the issuer origin is also the
@@ -48,15 +42,6 @@ export class PdsOAuthProvider extends OAuthProvider {
         scopes_supported: ['transition:generic', 'transition:chat.bsky'],
       },
 
-      accountStore: new DetailedAccountStore(
-        accountManager,
-        actorStore,
-        localViewer,
-      ),
-      requestStore: accountManager,
-      deviceStore: accountManager,
-      tokenStore: accountManager,
-
       // If the PDS is both an authorization server & resource server (no
       // entryway), there is no need to use JWTs as access tokens. Instead,
       // the PDS can use tokenId as access tokens. This allows the PDS to
diff --git a/packages/pds/src/read-after-write/util.ts b/packages/pds/src/read-after-write/util.ts
index fd169ef8b03..16ae22d0811 100644
--- a/packages/pds/src/read-after-write/util.ts
+++ b/packages/pds/src/read-after-write/util.ts
@@ -16,7 +16,6 @@ import {
   pipethrough,
 } from '../pipethrough'
 import { HandlerResponse, LocalRecords, MungeFn } from './types'
-import { getRecordsSinceRev } from './viewer'
 
 const REPO_REV_HEADER = 'atproto-repo-rev'
 
@@ -62,7 +61,7 @@ export const pipethroughReadAfterWrite = async <T>(
     const lxm = parseReqNsid(req)
 
     return await ctx.actorStore.read(requester, async (store) => {
-      const local = await getRecordsSinceRev(store, rev)
+      const local = await store.record.getRecordsSinceRev(rev)
       if (local.count === 0) return streamRes
 
       const { buffer } = (bufferRes = await asPipeThroughBuffer(streamRes))
diff --git a/packages/pds/src/read-after-write/viewer.ts b/packages/pds/src/read-after-write/viewer.ts
index 9767f751b72..abfd56bacd5 100644
--- a/packages/pds/src/read-after-write/viewer.ts
+++ b/packages/pds/src/read-after-write/viewer.ts
@@ -1,8 +1,4 @@
-import util from 'util'
-import { CID } from 'multiformats/cid'
 import { AtUri, INVALID_HANDLE } from '@atproto/syntax'
-import { cborToLexRecord } from '@atproto/repo'
-import { AtpAgent } from '@atproto/api'
 import { createServiceAuthHeaders } from '@atproto/xrpc-server'
 import { Record as PostRecord } from '../lexicon/types/app/bsky/feed/post'
 import { Record as ProfileRecord } from '../lexicon/types/app/bsky/actor/profile'
@@ -36,98 +32,75 @@ import {
   Main as EmbedRecordWithMedia,
   isMain as isEmbedRecordWithMedia,
 } from '../lexicon/types/app/bsky/embed/recordWithMedia'
-import { ActorStoreReader } from '../actor-store'
+import { ActorStoreReader } from '../actor-store/actor-store-reader'
 import { LocalRecords, RecordDescript } from './types'
 import { AccountManager } from '../account-manager'
+import { BskyAppView } from '../bsky-app-view'
+import { ImageUrlBuilder } from '../image/image-url-builder'
 
 type CommonSignedUris = 'avatar' | 'banner' | 'feed_thumbnail' | 'feed_fullsize'
 
-export type LocalViewerCreator = (actorStore: ActorStoreReader) => LocalViewer
+export type LocalViewerCreator = (
+  actorStoreReader: ActorStoreReader,
+) => LocalViewer
 
 export class LocalViewer {
-  did: string
-  actorStore: ActorStoreReader
-  accountManager: AccountManager
-  pdsHostname: string
-  appViewAgent?: AtpAgent
-  appviewDid?: string
-  appviewCdnUrlPattern?: string
+  constructor(
+    public readonly actorStoreReader: ActorStoreReader,
+    public readonly accountManager: AccountManager,
+    public readonly imageUrlBuilder: ImageUrlBuilder,
+    public readonly bskyAppView?: BskyAppView,
+  ) {}
 
-  constructor(params: {
-    actorStore: ActorStoreReader
-    accountManager: AccountManager
-    pdsHostname: string
-    appViewAgent?: AtpAgent
-    appviewDid?: string
-    appviewCdnUrlPattern?: string
-  }) {
-    this.did = params.actorStore.did
-    this.actorStore = params.actorStore
-    this.accountManager = params.accountManager
-    this.pdsHostname = params.pdsHostname
-    this.appViewAgent = params.appViewAgent
-    this.appviewDid = params.appviewDid
-    this.appviewCdnUrlPattern = params.appviewCdnUrlPattern
+  get did() {
+    return this.actorStoreReader.did
   }
 
-  static creator(params: {
-    accountManager: AccountManager
-    pdsHostname: string
-    appViewAgent?: AtpAgent
-    appviewDid?: string
-    appviewCdnUrlPattern?: string
-  }): LocalViewerCreator {
-    return (actorStore) => {
-      return new LocalViewer({ ...params, actorStore })
-    }
+  static creator(
+    accountManager: AccountManager,
+    imageUrlBuilder: ImageUrlBuilder,
+    bskyAppView?: BskyAppView,
+  ): LocalViewerCreator {
+    return (actorStore) =>
+      new LocalViewer(actorStore, accountManager, imageUrlBuilder, bskyAppView)
   }
 
   getImageUrl(pattern: CommonSignedUris, cid: string) {
-    if (!this.appviewCdnUrlPattern) {
-      return `https://${this.pdsHostname}/xrpc/${ids.ComAtprotoSyncGetBlob}?did=${this.did}&cid=${cid}`
-    }
-    return util.format(this.appviewCdnUrlPattern, pattern, this.did, cid)
+    return this.imageUrlBuilder.build(pattern, this.did, cid)
   }
 
   async serviceAuthHeaders(did: string, lxm: string) {
-    if (!this.appviewDid) {
+    if (!this.bskyAppView) {
       throw new Error('Could not find bsky appview did')
     }
-    const keypair = await this.actorStore.keypair()
+    const keypair = await this.actorStoreReader.keypair()
 
     return createServiceAuthHeaders({
       iss: did,
-      aud: this.appviewDid,
+      aud: this.bskyAppView.did,
       lxm,
       keypair,
     })
   }
 
   async getRecordsSinceRev(rev: string): Promise<LocalRecords> {
-    return getRecordsSinceRev(this.actorStore, rev)
+    return this.actorStoreReader.record.getRecordsSinceRev(rev)
   }
 
   async getProfileBasic(): Promise<ProfileViewBasic | null> {
-    const profileQuery = this.actorStore.db.db
-      .selectFrom('record')
-      .leftJoin('repo_block', 'repo_block.cid', 'record.cid')
-      .where('record.collection', '=', ids.AppBskyActorProfile)
-      .where('record.rkey', '=', 'self')
-      .selectAll()
     const [profileRes, accountRes] = await Promise.all([
-      profileQuery.executeTakeFirst(),
+      this.actorStoreReader.record.getProfileRecord(),
       this.accountManager.getAccount(this.did),
     ])
+
     if (!accountRes) return null
-    const record = profileRes?.content
-      ? (cborToLexRecord(profileRes.content) as ProfileRecord)
-      : null
+
     return {
       did: this.did,
       handle: accountRes.handle ?? INVALID_HANDLE,
-      displayName: record?.displayName,
-      avatar: record?.avatar
-        ? this.getImageUrl('avatar', record.avatar.ref.toString())
+      displayName: profileRes?.displayName,
+      avatar: profileRes?.avatar
+        ? this.getImageUrl('avatar', profileRes.avatar.ref.toString())
         : undefined,
     }
   }
@@ -239,12 +212,12 @@ export class LocalViewer {
   private async formatRecordEmbedInternal(
     embed: EmbedRecord,
   ): Promise<null | ViewRecord | GeneratorView | ListView> {
-    if (!this.appViewAgent || !this.appviewDid) {
+    if (!this.bskyAppView) {
       return null
     }
     const collection = new AtUri(embed.record.uri).collection
     if (collection === ids.AppBskyFeedPost) {
-      const res = await this.appViewAgent.api.app.bsky.feed.getPosts(
+      const res = await this.bskyAppView.agent.app.bsky.feed.getPosts(
         { uris: [embed.record.uri] },
         await this.serviceAuthHeaders(this.did, ids.AppBskyFeedGetPosts),
       )
@@ -261,7 +234,7 @@ export class LocalViewer {
         indexedAt: post.indexedAt,
       }
     } else if (collection === ids.AppBskyFeedGenerator) {
-      const res = await this.appViewAgent.api.app.bsky.feed.getFeedGenerator(
+      const res = await this.bskyAppView.agent.app.bsky.feed.getFeedGenerator(
         { feed: embed.record.uri },
         await this.serviceAuthHeaders(
           this.did,
@@ -273,7 +246,7 @@ export class LocalViewer {
         ...res.data.view,
       }
     } else if (collection === ids.AppBskyGraphList) {
-      const res = await this.appViewAgent.api.app.bsky.graph.getList(
+      const res = await this.bskyAppView.agent.app.bsky.graph.getList(
         { list: embed.record.uri },
         await this.serviceAuthHeaders(this.did, ids.AppBskyGraphGetList),
       )
@@ -330,50 +303,3 @@ export class LocalViewer {
     }
   }
 }
-
-export const getRecordsSinceRev = async (
-  actorStore: ActorStoreReader,
-  rev: string,
-): Promise<LocalRecords> => {
-  const res = await actorStore.db.db
-    .selectFrom('record')
-    .innerJoin('repo_block', 'repo_block.cid', 'record.cid')
-    .select(['repo_block.content', 'uri', 'repo_block.cid', 'record.indexedAt'])
-    .where('record.repoRev', '>', rev)
-    .limit(10)
-    .orderBy('record.repoRev', 'asc')
-    .execute()
-  // sanity check to ensure that the clock received is not before _all_ local records (for instance in case of account migration)
-  if (res.length > 0) {
-    const sanityCheckRes = await actorStore.db.db
-      .selectFrom('record')
-      .selectAll()
-      .where('record.repoRev', '<=', rev)
-      .limit(1)
-      .executeTakeFirst()
-    if (!sanityCheckRes) {
-      return { count: 0, profile: null, posts: [] }
-    }
-  }
-  return res.reduce(
-    (acc, cur) => {
-      const descript = {
-        uri: new AtUri(cur.uri),
-        cid: CID.parse(cur.cid),
-        indexedAt: cur.indexedAt,
-        record: cborToLexRecord(cur.content),
-      }
-      if (
-        descript.uri.collection === ids.AppBskyActorProfile &&
-        descript.uri.rkey === 'self'
-      ) {
-        acc.profile = descript as RecordDescript<ProfileRecord>
-      } else if (descript.uri.collection === ids.AppBskyFeedPost) {
-        acc.posts.push(descript as RecordDescript<PostRecord>)
-      }
-      acc.count++
-      return acc
-    },
-    { count: 0, profile: null, posts: [] } as LocalRecords,
-  )
-}
diff --git a/packages/pds/src/scripts/rebuild-repo.ts b/packages/pds/src/scripts/rebuild-repo.ts
index b02c627ab37..0a71b524aac 100644
--- a/packages/pds/src/scripts/rebuild-repo.ts
+++ b/packages/pds/src/scripts/rebuild-repo.ts
@@ -1,16 +1,12 @@
-import readline from 'node:readline/promises'
-import { CID } from 'multiformats/cid'
+import { TID } from '@atproto/common'
 import {
   BlockMap,
   CidSet,
   MST,
   MemoryBlockstore,
-  formatDataKey,
   signCommit,
 } from '@atproto/repo'
-import { AtUri } from '@atproto/syntax'
-import { TID } from '@atproto/common'
-import { ActorStoreTransactor } from '../actor-store'
+import readline from 'node:readline/promises'
 import AppContext from '../context'
 
 export const rebuildRepo = async (ctx: AppContext, args: string[]) => {
@@ -23,8 +19,8 @@ export const rebuildRepo = async (ctx: AppContext, args: string[]) => {
   const rev = TID.nextStr()
   const commit = await ctx.actorStore.transact(did, async (store) => {
     const [records, existingCids] = await Promise.all([
-      listAllRecords(store),
-      listExistingBlocks(store),
+      store.record.listAll(),
+      store.record.listExistingBlocks(),
     ])
     let mst = await MST.create(memoryStore)
     for (const record of records) {
@@ -81,53 +77,6 @@ export const rebuildRepo = async (ctx: AppContext, args: string[]) => {
   await ctx.sequencer.sequenceCommit(did, commit, [])
 }
 
-const listExistingBlocks = async (
-  store: ActorStoreTransactor,
-): Promise<CidSet> => {
-  const cids = new CidSet()
-  let cursor: string | undefined = ''
-  while (cursor !== undefined) {
-    const res = await store.db.db
-      .selectFrom('repo_block')
-      .select('cid')
-      .where('cid', '>', cursor)
-      .orderBy('cid', 'asc')
-      .limit(1000)
-      .execute()
-    for (const row of res) {
-      cids.add(CID.parse(row.cid))
-    }
-    cursor = res.at(-1)?.cid
-  }
-  return cids
-}
-
-const listAllRecords = async (
-  store: ActorStoreTransactor,
-): Promise<RecordDescript[]> => {
-  const records: RecordDescript[] = []
-  let cursor: string | undefined = ''
-  while (cursor !== undefined) {
-    const res = await store.db.db
-      .selectFrom('record')
-      .select(['uri', 'cid'])
-      .where('uri', '>', cursor)
-      .orderBy('uri', 'asc')
-      .limit(1000)
-      .execute()
-    for (const row of res) {
-      const parsed = new AtUri(row.uri)
-      records.push({
-        uri: row.uri,
-        path: formatDataKey(parsed.collection, parsed.rkey),
-        cid: CID.parse(row.cid),
-      })
-    }
-    cursor = res.at(-1)?.uri
-  }
-  return records
-}
-
 const promptContinue = async (): Promise<boolean> => {
   const rl = readline.createInterface({
     input: process.stdin,
@@ -136,9 +85,3 @@ const promptContinue = async (): Promise<boolean> => {
   const answer = await rl.question('Continue? y/n ')
   return answer === ''
 }
-
-type RecordDescript = {
-  uri: string
-  path: string
-  cid: CID
-}
diff --git a/packages/pds/tests/blob-deletes.test.ts b/packages/pds/tests/blob-deletes.test.ts
index 10c6a308a19..6b0412b0051 100644
--- a/packages/pds/tests/blob-deletes.test.ts
+++ b/packages/pds/tests/blob-deletes.test.ts
@@ -40,9 +40,7 @@ describe('blob deletes', () => {
   })
 
   const getDbBlobsForDid = (did: string) => {
-    return ctx.actorStore.read(did, (store) =>
-      store.db.db.selectFrom('blob').selectAll().execute(),
-    )
+    return ctx.actorStore.read(did, (store) => store.repo.blob.getBlobCids())
   }
 
   it('deletes blob when record is deleted', async () => {
@@ -79,7 +77,7 @@ describe('blob deletes', () => {
 
     const dbBlobs = await getDbBlobsForDid(alice)
     expect(dbBlobs.length).toBe(1)
-    expect(dbBlobs[0].cid).toEqual(img2.image.ref.toString())
+    expect(dbBlobs[0].toString()).toEqual(img2.image.ref.toString())
 
     const hasImg = await ctx.blobstore(alice).hasStored(img.image.ref)
     expect(hasImg).toBeFalsy()
diff --git a/packages/pds/tests/crud.test.ts b/packages/pds/tests/crud.test.ts
index 88cebe20d61..61273410054 100644
--- a/packages/pds/tests/crud.test.ts
+++ b/packages/pds/tests/crud.test.ts
@@ -1,4 +1,5 @@
-import fs from 'fs/promises'
+import assert from 'node:assert'
+import fs from 'node:fs/promises'
 import { AtUri } from '@atproto/syntax'
 import { AtpAgent } from '@atproto/api'
 import { BlobRef } from '@atproto/lexicon'
@@ -828,22 +829,17 @@ describe('crud operations', () => {
       const record = await ctx.actorStore.read(aliceAgent.accountDid, (store) =>
         store.record.getRecord(new AtUri(res.data.uri), res.data.cid),
       )
-      expect(record?.value).toMatchObject({
+      assert(record)
+      expect(record.value).toMatchObject({
         $type: 'com.example.record',
         blah: 'thing',
       })
       const recordBlobs = await ctx.actorStore.read(
-        aliceAgent.accountDid,
-        (store) =>
-          store.db.db
-            .selectFrom('blob')
-            .innerJoin('record_blob', 'record_blob.blobCid', 'blob.cid')
-            .where('recordUri', '=', res.data.uri)
-            .selectAll()
-            .execute(),
+        aliceAgent.assertDid,
+        (store) => store.repo.blob.getBlobsForRecord(record.uri),
       )
       expect(recordBlobs.length).toBe(1)
-      expect(recordBlobs.at(0)?.cid).toBe(uploadedRes.data.blob.ref.toString())
+      expect(recordBlobs.at(0)).toBe(uploadedRes.data.blob.ref.toString())
     })
 
     it('enforces record type constraint even when unvalidated', async () => {

From 61dc0d60e19b88c6427a54c6d95a391b5f4da7bd Mon Sep 17 00:00:00 2001
From: Matthieu Sieben <matthieusieben@users.noreply.github.com>
Date: Wed, 5 Feb 2025 15:06:58 +0100
Subject: [PATCH 047/101] Add linting rule to sort imports (#3220)

* Add linting rule to sort imports

* remove spacing between import groups

* changeset

* changeset

* prettier config fine tuning

* forbid use of deprecated imports

* tidy
---
 .changeset/fair-tigers-thank.md               |  41 +
 .changeset/mighty-actors-complain.md          |  22 +
 .changeset/olive-teachers-yawn.md             |   5 +
 .eslintrc                                     |  67 +-
 .gitignore                                    |   2 +-
 .prettierignore                               |   6 +-
 .prettierrc                                   |   7 +
 .vscode/settings.json                         |   6 +
 package.json                                  |   5 +-
 packages/api/bench/agent.bench.ts             |   9 -
 packages/api/src/agent.ts                     |  13 +-
 packages/api/src/index.ts                     |   6 +-
 packages/api/src/mocker.ts                    |   6 +-
 packages/api/src/moderation/decision.ts       |  14 +-
 packages/api/src/moderation/index.ts          |  22 +-
 .../api/src/moderation/subjects/account.ts    |   2 +-
 .../src/moderation/subjects/feed-generator.ts |   2 +-
 .../src/moderation/subjects/notification.ts   |   2 +-
 packages/api/src/moderation/subjects/post.ts  |  10 +-
 .../api/src/moderation/subjects/profile.ts    |   2 +-
 .../api/src/moderation/subjects/user-list.ts  |   2 +-
 packages/api/src/moderation/types.ts          |   2 +-
 packages/api/src/moderation/util.ts           |   2 +-
 packages/api/src/rich-text/detection.ts       |   2 +-
 packages/api/src/rich-text/rich-text.ts       |   4 +-
 packages/api/src/util.ts                      |  17 +-
 packages/api/tests/atp-agent.test.ts          |   2 +-
 packages/api/tests/dispatcher.test.ts         |   8 +-
 packages/api/tests/errors.test.ts             |   2 +-
 .../api/tests/moderation-behaviors.test.ts    |   6 +-
 .../tests/moderation-custom-labels.test.ts    |   8 +-
 .../api/tests/moderation-mutewords.test.ts    |   1 -
 .../api/tests/moderation-quoteposts.test.ts   |   6 +-
 packages/api/tests/moderation.test.ts         |   8 +-
 .../api/tests/rich-text-sanitization.test.ts  |   2 +-
 .../api/tests/util/moderation-behavior.ts     |   4 +-
 packages/aws/package.json                     |   3 +
 packages/aws/src/kms.ts                       |   2 +-
 packages/aws/src/s3.ts                        |   6 +-
 packages/bsky/bin/migration-create.ts         |   4 +-
 packages/bsky/package.json                    |   3 +
 .../bsky/src/api/app/bsky/actor/getProfile.ts |  10 +-
 .../src/api/app/bsky/actor/getProfiles.ts     |  12 +-
 .../src/api/app/bsky/actor/getSuggestions.ts  |  14 +-
 .../src/api/app/bsky/actor/searchActors.ts    |  12 +-
 .../app/bsky/actor/searchActorsTypeahead.ts   |  10 +-
 .../src/api/app/bsky/feed/getActorFeeds.ts    |  14 +-
 .../src/api/app/bsky/feed/getActorLikes.ts    |  18 +-
 .../src/api/app/bsky/feed/getAuthorFeed.ts    |  20 +-
 .../bsky/src/api/app/bsky/feed/getFeed.ts     |  31 +-
 .../src/api/app/bsky/feed/getFeedGenerator.ts |   6 +-
 .../api/app/bsky/feed/getFeedGenerators.ts    |   8 +-
 .../bsky/src/api/app/bsky/feed/getLikes.ts    |  13 +-
 .../bsky/src/api/app/bsky/feed/getListFeed.ts |  18 +-
 .../src/api/app/bsky/feed/getPostThread.ts    |  14 +-
 .../bsky/src/api/app/bsky/feed/getPosts.ts    |  12 +-
 .../bsky/src/api/app/bsky/feed/getQuotes.ts   |  14 +-
 .../src/api/app/bsky/feed/getRepostedBy.ts    |  10 +-
 .../api/app/bsky/feed/getSuggestedFeeds.ts    |   4 +-
 .../bsky/src/api/app/bsky/feed/getTimeline.ts |  18 +-
 .../bsky/src/api/app/bsky/feed/searchPosts.ts |  12 +-
 .../app/bsky/graph/getActorStarterPacks.ts    |  14 +-
 .../bsky/src/api/app/bsky/graph/getBlocks.ts  |   8 +-
 .../src/api/app/bsky/graph/getFollowers.ts    |  12 +-
 .../bsky/src/api/app/bsky/graph/getFollows.ts |  12 +-
 .../api/app/bsky/graph/getKnownFollowers.ts   |   4 +-
 .../bsky/src/api/app/bsky/graph/getList.ts    |  20 +-
 .../src/api/app/bsky/graph/getListBlocks.ts   |   8 +-
 .../src/api/app/bsky/graph/getListMutes.ts    |   8 +-
 .../bsky/src/api/app/bsky/graph/getLists.ts   |   8 +-
 .../bsky/src/api/app/bsky/graph/getMutes.ts   |   6 +-
 .../api/app/bsky/graph/getRelationships.ts    |   2 +-
 .../src/api/app/bsky/graph/getStarterPack.ts  |   8 +-
 .../src/api/app/bsky/graph/getStarterPacks.ts |  10 +-
 .../bsky/graph/getSuggestedFollowsByActor.ts  |   8 +-
 .../bsky/src/api/app/bsky/graph/muteActor.ts  |   2 +-
 .../src/api/app/bsky/graph/muteActorList.ts   |   2 +-
 .../bsky/src/api/app/bsky/graph/muteThread.ts |   2 +-
 .../api/app/bsky/graph/searchStarterPacks.ts  |  14 +-
 .../src/api/app/bsky/graph/unmuteActor.ts     |   2 +-
 .../src/api/app/bsky/graph/unmuteActorList.ts |   2 +-
 .../src/api/app/bsky/graph/unmuteThread.ts    |   2 +-
 .../src/api/app/bsky/labeler/getServices.ts   |   4 +-
 .../app/bsky/notification/getUnreadCount.ts   |   4 +-
 .../bsky/notification/listNotifications.ts    |  12 +-
 .../app/bsky/notification/putPreferences.ts   |   2 +-
 .../api/app/bsky/notification/registerPush.ts |   2 +-
 .../api/app/bsky/notification/updateSeen.ts   |   6 +-
 .../src/api/app/bsky/unspecced/getConfig.ts   |   2 +-
 .../unspecced/getPopularFeedGenerators.ts     |   4 +-
 .../bsky/unspecced/getTaggedSuggestions.ts    |   2 +-
 .../app/bsky/unspecced/getTrendingTopics.ts   |  14 +-
 packages/bsky/src/api/blob-dispatcher.ts      |   3 +-
 packages/bsky/src/api/blob-resolver.ts        |  25 +-
 .../api/com/atproto/admin/getAccountInfos.ts  |   4 +-
 .../api/com/atproto/admin/getSubjectStatus.ts |   2 +-
 .../com/atproto/admin/updateSubjectStatus.ts  |   4 +-
 .../api/com/atproto/identity/resolveHandle.ts |   4 +-
 .../src/api/com/atproto/label/queryLabels.ts  |   4 +-
 .../src/api/com/atproto/repo/getRecord.ts     |   4 +-
 .../src/api/com/atproto/temp/fetchLabels.ts   |   4 +-
 packages/bsky/src/api/health.ts               |   8 +-
 packages/bsky/src/api/index.ts                |  42 +-
 packages/bsky/src/api/well-known.ts           |   8 +-
 packages/bsky/src/auth-verifier.ts            |  12 +-
 packages/bsky/src/bsync.ts                    |   6 +-
 packages/bsky/src/context.ts                  |  18 +-
 packages/bsky/src/courier.ts                  |   6 +-
 packages/bsky/src/data-plane/bsync/index.ts   |  12 +-
 packages/bsky/src/data-plane/client.ts        |   2 +-
 .../bsky/src/data-plane/server/background.ts  |   2 +-
 .../data-plane/server/db/database-schema.ts   |  54 +-
 packages/bsky/src/data-plane/server/db/db.ts  |  12 +-
 .../bsky/src/data-plane/server/db/util.ts     |   4 +-
 packages/bsky/src/data-plane/server/index.ts  |  10 +-
 .../src/data-plane/server/indexing/index.ts   |  42 +-
 .../server/indexing/plugins/block.ts          |   8 +-
 .../indexing/plugins/chat-declaration.ts      |   8 +-
 .../server/indexing/plugins/feed-generator.ts |   8 +-
 .../server/indexing/plugins/follow.ts         |  10 +-
 .../server/indexing/plugins/labeler.ts        |   8 +-
 .../server/indexing/plugins/like.ts           |  10 +-
 .../server/indexing/plugins/list-block.ts     |   8 +-
 .../server/indexing/plugins/list-item.ts      |  10 +-
 .../server/indexing/plugins/list.ts           |  10 +-
 .../server/indexing/plugins/post-gate.ts      |  10 +-
 .../server/indexing/plugins/post.ts           |  36 +-
 .../server/indexing/plugins/profile.ts        |  10 +-
 .../server/indexing/plugins/repost.ts         |   8 +-
 .../server/indexing/plugins/starter-pack.ts   |   8 +-
 .../server/indexing/plugins/thread-gate.ts    |  10 +-
 .../data-plane/server/indexing/processor.ts   |   6 +-
 .../src/data-plane/server/routes/feeds.ts     |   2 +-
 .../src/data-plane/server/routes/follows.ts   |   2 +-
 .../src/data-plane/server/routes/identity.ts  |   4 +-
 .../src/data-plane/server/routes/index.ts     |   4 +-
 .../data-plane/server/routes/interactions.ts  |   2 +-
 .../src/data-plane/server/routes/labels.ts    |   4 +-
 .../src/data-plane/server/routes/likes.ts     |   2 +-
 .../src/data-plane/server/routes/lists.ts     |   4 +-
 .../src/data-plane/server/routes/mutes.ts     |   4 +-
 .../src/data-plane/server/routes/notifs.ts    |   6 +-
 .../src/data-plane/server/routes/posts.ts     |   2 +-
 .../src/data-plane/server/routes/profile.ts   |   8 +-
 .../src/data-plane/server/routes/quotes.ts    |   2 +-
 .../src/data-plane/server/routes/records.ts   |   4 +-
 .../data-plane/server/routes/relationships.ts |   2 +-
 .../src/data-plane/server/routes/reposts.ts   |   2 +-
 .../data-plane/server/routes/suggestions.ts   |   2 +-
 .../src/data-plane/server/subscription.ts     |   6 +-
 packages/bsky/src/data-plane/server/util.ts   |   4 +-
 packages/bsky/src/error.ts                    |   2 +-
 packages/bsky/src/feature-gates.ts            |   2 -
 packages/bsky/src/hydration/feed.ts           |  18 +-
 packages/bsky/src/hydration/graph.ts          |   8 +-
 packages/bsky/src/hydration/hydrator.ts       |  54 +-
 packages/bsky/src/hydration/label.ts          |   8 +-
 packages/bsky/src/hydration/util.ts           |   4 +-
 packages/bsky/src/image/index.ts              |   2 +-
 packages/bsky/src/image/server.ts             |  25 +-
 packages/bsky/src/image/sharp.ts              |   4 +-
 packages/bsky/src/index.ts                    |  46 +-
 packages/bsky/src/logger.ts                   |   2 +-
 packages/bsky/src/redis.ts                    |   2 +-
 packages/bsky/src/util/http.ts                |   2 +-
 packages/bsky/src/util/uris.ts                |   2 +-
 packages/bsky/src/views/index.ts              |  45 +-
 packages/bsky/src/views/types.ts              |  18 +-
 packages/bsky/src/views/util.ts               |   8 +-
 packages/bsky/tests/_util.ts                  |   9 +-
 packages/bsky/tests/admin/admin-auth.test.ts  |   4 +-
 packages/bsky/tests/admin/moderation.test.ts  |   2 +-
 packages/bsky/tests/auth.test.ts              |   2 +-
 packages/bsky/tests/blob-resolver.test.ts     |   4 +-
 .../data-plane/duplicate-records.test.ts      |   6 +-
 .../data-plane/handle-invalidation.test.ts    |   4 +-
 .../bsky/tests/data-plane/indexing.test.ts    |  16 +-
 .../tests/data-plane/subscription.test.ts     |   2 +-
 .../tests/data-plane/thread-mutes.test.ts     |   2 +-
 packages/bsky/tests/entryway-auth.test.ts     |  10 +-
 packages/bsky/tests/feed-generation.test.ts   |  16 +-
 packages/bsky/tests/hydration/util.test.ts    |   2 +-
 packages/bsky/tests/image/server.test.ts      |   4 +-
 packages/bsky/tests/image/uri.test.ts         |   4 +-
 packages/bsky/tests/label-hydration.test.ts   |   2 +-
 packages/bsky/tests/postgates.test.ts         |   5 +-
 packages/bsky/tests/query-labels.test.ts      |   2 +-
 .../bsky/tests/seed/feed-hidden-replies.ts    |   2 +-
 packages/bsky/tests/seed/known-followers.ts   |   2 +-
 packages/bsky/tests/seed/postgates.ts         |   2 +-
 packages/bsky/tests/server.test.ts            |   4 +-
 .../tests/views/account-deactivation.test.ts  |   2 +-
 packages/bsky/tests/views/actor-likes.test.ts |   2 +-
 .../bsky/tests/views/actor-search.test.ts     |   4 +-
 packages/bsky/tests/views/author-feed.test.ts |  20 +-
 packages/bsky/tests/views/block-lists.test.ts |   6 +-
 packages/bsky/tests/views/blocks.test.ts      |   8 +-
 .../tests/views/feed-hidden-replies.test.ts   |   5 +-
 .../bsky/tests/views/feed-view-post.test.ts   |   4 +-
 packages/bsky/tests/views/follows.test.ts     |   4 +-
 .../bsky/tests/views/known-followers.test.ts  |   5 +-
 .../bsky/tests/views/labeler-service.test.ts  |   4 +-
 .../tests/views/labels-needs-review.test.ts   |   4 +-
 .../bsky/tests/views/labels-takedown.test.ts  |   2 +-
 packages/bsky/tests/views/likes.test.ts       |   4 +-
 packages/bsky/tests/views/list-feed.test.ts   |   4 +-
 packages/bsky/tests/views/lists.test.ts       |   4 +-
 packages/bsky/tests/views/mute-lists.test.ts  |   6 +-
 packages/bsky/tests/views/mutes.test.ts       |   4 +-
 .../bsky/tests/views/notifications.test.ts    |   6 +-
 packages/bsky/tests/views/posts.test.ts       |   6 +-
 packages/bsky/tests/views/profile.test.ts     |   6 +-
 packages/bsky/tests/views/quotes.test.ts      |   4 +-
 packages/bsky/tests/views/reposts.test.ts     |   4 +-
 .../bsky/tests/views/starter-packs.test.ts    |   6 +-
 .../tests/views/suggested-follows.test.ts     |   4 +-
 packages/bsky/tests/views/suggestions.test.ts |   4 +-
 packages/bsky/tests/views/thread.test.ts      |   4 +-
 .../bsky/tests/views/threadgating.test.ts     |   6 +-
 packages/bsky/tests/views/timeline.test.ts    |  10 +-
 packages/bsync/bin/migration-create.ts        |   4 +-
 packages/bsync/package.json                   |   3 +
 packages/bsync/src/config.ts                  |   2 +-
 packages/bsync/src/context.ts                 |   6 +-
 packages/bsync/src/db/index.ts                |  16 +-
 packages/bsync/src/db/schema/index.ts         |   4 +-
 packages/bsync/src/db/types.ts                |   2 +-
 packages/bsync/src/index.ts                   |  10 +-
 packages/bsync/src/logger.ts                  |   2 +-
 .../bsync/src/routes/add-mute-operation.ts    |   8 +-
 .../bsync/src/routes/add-notif-operation.ts   |   8 +-
 packages/bsync/src/routes/auth.ts             |   2 +-
 packages/bsync/src/routes/index.ts            |   6 +-
 .../bsync/src/routes/scan-mute-operations.ts  |   4 +-
 .../bsync/src/routes/scan-notif-operations.ts |   4 +-
 packages/bsync/tests/mutes.test.ts            |   4 +-
 packages/bsync/tests/notifications.test.ts    |   4 +-
 packages/common-web/src/tid.ts                |   4 +-
 packages/common-web/tests/check.test.ts       |   2 +-
 packages/common-web/tests/tid.test.ts         |   2 +-
 packages/common/package.json                  |   3 +
 packages/common/src/fs.ts                     |   4 +-
 packages/common/src/ipld.ts                   |   8 +-
 packages/common/src/logger.ts                 |   4 +-
 packages/common/src/streams.ts                |   2 +-
 packages/common/tests/ipld-multi.test.ts      |   2 +-
 packages/common/tests/ipld-vectors.ts         |   2 -
 packages/common/tests/ipld.test.ts            |   2 +-
 packages/common/tests/streams.test.ts         |   2 +-
 packages/crypto/package.json                  |   3 +
 packages/crypto/src/did.ts                    |   3 +-
 packages/crypto/src/p256/keypair.ts           |   7 +-
 packages/crypto/src/p256/operations.ts        |   1 -
 packages/crypto/src/p256/plugin.ts            |   9 +-
 packages/crypto/src/plugins.ts                |   6 +-
 packages/crypto/src/secp256k1/keypair.ts      |   3 -
 packages/crypto/src/secp256k1/operations.ts   |   1 -
 packages/crypto/src/secp256k1/plugin.ts       |   9 +-
 packages/crypto/src/verify.ts                 |   2 +-
 packages/crypto/tests/did.test.ts             |   2 +-
 packages/crypto/tests/key-compression.test.ts |   8 +-
 packages/crypto/tests/keypairs.test.ts        |   6 +-
 packages/crypto/tests/signatures.test.ts      |  18 +-
 packages/dev-env/package.json                 |   3 +
 packages/dev-env/src/bsky.ts                  |   6 +-
 packages/dev-env/src/feed-gen.ts              |  10 +-
 packages/dev-env/src/introspect.ts            |   6 +-
 packages/dev-env/src/mock/index.ts            |   6 +-
 packages/dev-env/src/moderator-client.ts      |   4 +-
 packages/dev-env/src/network-no-appview.ts    |   8 +-
 packages/dev-env/src/network.ts               |  16 +-
 packages/dev-env/src/ozone-service-profile.ts |   2 +-
 packages/dev-env/src/ozone.ts                 |  10 +-
 packages/dev-env/src/pds.ts                   |  10 +-
 packages/dev-env/src/plc.ts                   |   2 +-
 packages/dev-env/src/seed/author-feed.ts      |   2 +-
 packages/dev-env/src/seed/basic.ts            |   4 +-
 packages/dev-env/src/seed/client.ts           |  11 +-
 packages/dev-env/src/seed/likes.ts            |   2 +-
 packages/dev-env/src/seed/quotes.ts           |   2 +-
 packages/dev-env/src/seed/reposts.ts          |   2 +-
 packages/dev-env/src/types.ts                 |   4 +-
 packages/dev-env/src/util.ts                  |   6 +-
 packages/did/src/atproto.ts                   |   5 +-
 packages/did/src/did-document.ts              |   1 -
 packages/identity/package.json                |   3 +
 packages/identity/src/did/atproto-data.ts     |  12 +-
 packages/identity/src/did/base-resolver.ts    |  10 +-
 packages/identity/src/did/did-resolver.ts     |  10 +-
 packages/identity/src/did/memory-cache.ts     |   2 +-
 packages/identity/src/did/plc-resolver.ts     |   2 +-
 packages/identity/src/did/web-resolver.ts     |   2 +-
 packages/identity/src/handle/index.ts         |   2 +-
 packages/identity/src/id-resolver.ts          |   2 +-
 packages/identity/tests/did-cache.test.ts     |   8 +-
 packages/identity/tests/did-resolver.test.ts  |   8 +-
 .../identity/tests/handle-resolver.test.ts    |   2 +-
 packages/identity/tests/web/db.ts             |   2 -
 packages/identity/tests/web/server.ts         |   6 +-
 .../did-resolver/src/did-cache-memory.ts      |   1 -
 .../internal/did-resolver/src/did-cache.ts    |   5 +-
 .../did-resolver/src/did-resolver-base.ts     |   7 +-
 .../internal/did-resolver/src/did-resolver.ts |   1 -
 .../internal/did-resolver/src/methods/plc.ts  |   3 +-
 .../internal/did-resolver/src/methods/web.ts  |   5 +-
 packages/internal/fetch-node/package.json     |   3 +
 packages/internal/fetch-node/src/safe.ts      |   3 +-
 packages/internal/fetch-node/src/unicast.ts   |  12 +-
 packages/internal/fetch/src/fetch-response.ts |   5 +-
 .../handle-resolver-node/package.json         |   3 +
 .../src/atproto-handle-resolver-node.ts       |   1 -
 .../src/node-resolve-txt-factory.ts           |   1 -
 .../src/app-view-handle-resolver.ts           |   3 +-
 .../src/atproto-doh-handle-resolver.ts        |   2 +-
 .../src/cached-handle-resolver.ts             |   2 +-
 .../src/identity-resolver.ts                  |   6 +-
 .../package.json                              |   6 +
 .../src/index.ts                              |   1 -
 .../internal/simple-store-memory/src/index.ts |   3 +-
 .../simple-store/src/cached-getter.ts         |   2 +-
 packages/lex-cli/package.json                 |   3 +
 packages/lex-cli/src/codegen/client.ts        |  14 +-
 packages/lex-cli/src/codegen/common.ts        |   4 +-
 packages/lex-cli/src/codegen/lex-gen.ts       |  16 +-
 packages/lex-cli/src/codegen/server.ts        |  14 +-
 packages/lex-cli/src/codegen/util.ts          |   2 +-
 packages/lex-cli/src/index.ts                 |  14 +-
 packages/lex-cli/src/mdgen/index.ts           |   2 +-
 packages/lex-cli/src/util.ts                  |  10 +-
 packages/lexicon/src/blob-refs.ts             |   2 +-
 packages/lexicon/src/lexicons.ts              |  14 +-
 packages/lexicon/src/serialize.ts             |   6 +-
 packages/lexicon/src/validation.ts            |   1 -
 packages/lexicon/src/validators/blob.ts       |   2 +-
 packages/lexicon/src/validators/complex.ts    |   3 +-
 packages/lexicon/src/validators/formats.ts    |   8 +-
 packages/lexicon/src/validators/primitives.ts |  10 +-
 packages/lexicon/src/validators/xrpc.ts       |   5 +-
 packages/oauth/jwk-jose/src/jose-key.ts       |  29 +-
 .../oauth/jwk-webcrypto/src/webcrypto-key.ts  |   3 +-
 packages/oauth/jwk/src/jwks.ts                |   1 -
 packages/oauth/jwk/src/jwt.ts                 |   1 -
 .../rollup.config.js                          |   9 +-
 .../auth/credential/use-credential-auth.ts    |   2 +-
 .../src/auth/oauth/use-oauth.ts               |   1 -
 .../src/browser-oauth-client.ts               |   7 +-
 .../src/browser-oauth-database.ts             |   5 +-
 .../src/indexed-db-store.ts                   |   2 +-
 .../oauth-client-browser/src/indexed-db/db.ts |   2 +-
 packages/oauth/oauth-client-node/package.json |   3 +
 .../oauth-client-node/src/node-dpop-store.ts  |   2 +-
 .../src/node-oauth-client.ts                  |  10 +-
 .../src/atproto-token-response.ts             |   5 +-
 packages/oauth/oauth-client/src/fetch-dpop.ts |   4 +-
 ...-authorization-server-metadata-resolver.ts |  14 +-
 .../oauth/oauth-client/src/oauth-client.ts    |  21 +-
 ...th-protected-resource-metadata-resolver.ts |   8 +-
 .../oauth/oauth-client/src/oauth-resolver.ts  |  11 +-
 .../oauth-client/src/oauth-response-error.ts  |   2 +-
 .../oauth-client/src/oauth-server-agent.ts    |   5 +-
 .../oauth-client/src/oauth-server-factory.ts  |   3 +-
 .../oauth/oauth-client/src/oauth-session.ts   |   3 +-
 packages/oauth/oauth-client/src/runtime.ts    |   3 +-
 .../oauth/oauth-client/src/session-getter.ts  |   7 +-
 .../oauth/oauth-client/src/state-store.ts     |   2 +-
 packages/oauth/oauth-client/src/types.ts      |   5 +-
 .../src/validate-client-metadata.ts           |   1 -
 packages/oauth/oauth-provider/package.json    |   3 +
 .../oauth/oauth-provider/rollup.config.js     |   9 +-
 .../src/account/account-store.ts              |   3 +-
 .../oauth-provider/src/account/account.ts     |   2 +-
 .../src/assets/app/hooks/use-api.ts           |   3 +-
 .../oauth-provider/src/assets/app/lib/api.ts  |   1 -
 .../src/assets/assets-middleware.ts           |   1 -
 .../oauth/oauth-provider/src/assets/index.ts  |   5 +-
 .../oauth-provider/src/client/client-auth.ts  |   3 +-
 .../src/client/client-manager.ts              |  27 +-
 .../oauth-provider/src/client/client-store.ts |   1 -
 .../oauth-provider/src/client/client-utils.ts |   1 -
 .../oauth/oauth-provider/src/client/client.ts |  27 +-
 .../oauth-provider/src/device/device-data.ts  |   1 -
 .../src/device/device-details.ts              |   1 -
 .../oauth-provider/src/device/device-id.ts    |   1 -
 .../src/device/device-manager.ts              |   5 +-
 .../oauth-provider/src/device/session-id.ts   |   1 -
 .../oauth-provider/src/dpop/dpop-manager.ts   |   2 -
 .../oauth-provider/src/dpop/dpop-nonce.ts     |   1 -
 .../errors/invalid-client-metadata-error.ts   |   2 +-
 .../src/errors/invalid-token-error.ts         |   3 +-
 .../src/errors/www-authenticate-error.ts      |   1 -
 .../oauth-provider/src/lib/http/accept.ts     |   1 -
 .../oauth-provider/src/lib/http/middleware.ts |   2 +-
 .../oauth-provider/src/lib/http/request.ts    |   5 +-
 .../oauth-provider/src/lib/http/response.ts   |   1 -
 .../oauth-provider/src/lib/http/stream.ts     |   7 +-
 .../src/lib/util/authorization-header.ts      |   3 +-
 .../oauth-provider/src/lib/util/hostname.ts   |   2 +-
 .../src/metadata/build-metadata.ts            |   1 -
 .../oauth/oauth-provider/src/oauth-hooks.ts   |   1 -
 .../oauth-provider/src/oauth-provider.ts      |  17 +-
 .../oauth-provider/src/oauth-verifier.ts      |   3 +-
 .../src/output/build-authorize-data.ts        |   1 -
 .../src/output/build-error-payload.ts         |   3 +-
 .../src/output/output-manager.ts              |   5 +-
 .../src/output/send-authorize-redirect.ts     |   3 +-
 .../src/output/send-web-page.ts               |   5 +-
 .../src/replay/replay-manager.ts              |   2 +-
 .../src/replay/replay-store-redis.ts          |   1 -
 .../oauth/oauth-provider/src/request/code.ts  |   1 -
 .../src/request/request-data.ts               |   1 -
 .../oauth-provider/src/request/request-id.ts  |   1 -
 .../src/request/request-info.ts               |   2 +-
 .../src/request/request-manager.ts            |   7 +-
 .../src/request/request-store-memory.ts       |   2 +-
 .../src/request/request-store-redis.ts        |   3 +-
 .../oauth-provider/src/request/request-uri.ts |   1 -
 .../src/signer/signed-token-payload.ts        |   3 +-
 .../oauth/oauth-provider/src/signer/signer.ts |   3 +-
 .../oauth-provider/src/token/refresh-token.ts |   1 -
 .../oauth-provider/src/token/token-claims.ts  |   3 +-
 .../oauth-provider/src/token/token-data.ts    |   1 -
 .../oauth-provider/src/token/token-id.ts      |   1 -
 .../oauth-provider/src/token/token-manager.ts |   3 +-
 .../src/token/verify-token-claims.ts          |   1 -
 .../src/oauth-authorization-request-jar.ts    |   2 +-
 .../src/oauth-authorization-request-par.ts    |   1 -
 .../oauth-authorization-request-parameters.ts |   3 +-
 .../src/oauth-authorization-request-query.ts  |   1 -
 .../src/oauth-authorization-request-uri.ts    |   1 -
 .../oauth-authorization-server-metadata.ts    |   1 -
 .../src/oauth-client-credentials.ts           |   3 +-
 .../src/oauth-client-id-loopback.ts           |   2 +-
 .../oauth-types/src/oauth-client-metadata.ts  |   3 +-
 .../src/oauth-protected-resource-metadata.ts  |   1 -
 .../oauth-types/src/oauth-redirect-uri.ts     |   4 +-
 .../oauth-types/src/oauth-token-response.ts   |   3 +-
 packages/oauth/oauth-types/src/uri.ts         |  17 +-
 packages/ozone/bin/migration-create.ts        |   4 +-
 packages/ozone/package.json                   |   3 +
 .../ozone/src/api/chat/getActorMetadata.ts    |   4 +-
 .../ozone/src/api/chat/getMessageContext.ts   |   4 +-
 packages/ozone/src/api/chat/index.ts          |   2 +-
 .../src/api/communication/createTemplate.ts   |   4 +-
 .../src/api/communication/deleteTemplate.ts   |   2 +-
 .../src/api/communication/listTemplates.ts    |   2 +-
 .../src/api/communication/updateTemplate.ts   |   4 +-
 packages/ozone/src/api/health.ts              |   8 +-
 packages/ozone/src/api/index.ts               |  42 +-
 packages/ozone/src/api/label/fetchLabels.ts   |   2 +-
 packages/ozone/src/api/label/queryLabels.ts   |   6 +-
 .../ozone/src/api/label/subscribeLabels.ts    |   6 +-
 .../ozone/src/api/moderation/emitEvent.ts     |  12 +-
 packages/ozone/src/api/moderation/getEvent.ts |   2 +-
 .../ozone/src/api/moderation/getRecord.ts     |   4 +-
 .../ozone/src/api/moderation/getRecords.ts    |   4 +-
 packages/ozone/src/api/moderation/getRepo.ts  |   2 +-
 packages/ozone/src/api/moderation/getRepos.ts |   2 +-
 .../ozone/src/api/moderation/queryEvents.ts   |   2 +-
 .../ozone/src/api/moderation/queryStatuses.ts |   2 +-
 .../ozone/src/api/moderation/searchRepos.ts   |   4 +-
 packages/ozone/src/api/proxied.ts             |   2 +-
 packages/ozone/src/api/report/createReport.ts |  10 +-
 packages/ozone/src/api/server/getConfig.ts    |   2 +-
 packages/ozone/src/api/set/addValues.ts       |   2 +-
 packages/ozone/src/api/set/deleteSet.ts       |   2 +-
 packages/ozone/src/api/set/deleteValues.ts    |   2 +-
 packages/ozone/src/api/set/getValues.ts       |   2 +-
 packages/ozone/src/api/set/querySets.ts       |   2 +-
 packages/ozone/src/api/set/upsertSet.ts       |   2 +-
 packages/ozone/src/api/setting/listOptions.ts |   2 +-
 .../ozone/src/api/setting/removeOptions.ts    |   4 +-
 .../ozone/src/api/setting/upsertOption.ts     |  10 +-
 packages/ozone/src/api/team/addMember.ts      |   2 +-
 packages/ozone/src/api/team/deleteMember.ts   |   2 +-
 packages/ozone/src/api/team/listMembers.ts    |   2 +-
 packages/ozone/src/api/team/updateMember.ts   |   2 +-
 packages/ozone/src/api/util.ts                |  22 +-
 packages/ozone/src/api/well-known.ts          |   8 +-
 .../src/communication-service/template.ts     |   2 +-
 packages/ozone/src/config/config.ts           |   2 +-
 packages/ozone/src/config/secrets.ts          |   2 +-
 packages/ozone/src/context.ts                 |  27 +-
 packages/ozone/src/daemon/blob-diverter.ts    |  15 +-
 packages/ozone/src/daemon/context.ts          |  14 +-
 packages/ozone/src/daemon/event-pusher.ts     |  12 +-
 packages/ozone/src/daemon/event-reverser.ts   |   2 +-
 packages/ozone/src/daemon/index.ts            |   2 +-
 .../src/daemon/materialized-view-refresher.ts |   2 +-
 packages/ozone/src/db/index.ts                |  16 +-
 ...220T144630860Z-stats-materialized-views.ts |   4 +-
 packages/ozone/src/db/pagination.ts           |   2 +-
 packages/ozone/src/db/schema/index.ts         |  23 +-
 .../db/schema/moderation_subject_status.ts    |   2 +-
 packages/ozone/src/db/types.ts                |   2 +-
 packages/ozone/src/error.ts                   |   2 +-
 packages/ozone/src/index.ts                   |  22 +-
 packages/ozone/src/logger.ts                  |   2 +-
 packages/ozone/src/mod-service/index.ts       |  66 +-
 packages/ozone/src/mod-service/status.ts      |   2 +-
 packages/ozone/src/mod-service/subject.ts     |   8 +-
 packages/ozone/src/mod-service/types.ts       |   4 +-
 packages/ozone/src/mod-service/views.ts       |  33 +-
 packages/ozone/src/sequencer/outbox.ts        |   4 +-
 packages/ozone/src/sequencer/sequencer.ts     |  12 +-
 packages/ozone/src/set/service.ts             |   4 +-
 packages/ozone/src/setting/service.ts         |  10 +-
 packages/ozone/src/setting/validators.ts      |   2 +-
 .../ozone/src/tag-service/embed-tagger.ts     |   6 +-
 packages/ozone/src/tag-service/index.ts       |   6 +-
 .../ozone/src/tag-service/language-tagger.ts  |   3 +-
 packages/ozone/src/team/index.ts              |  12 +-
 packages/ozone/src/util.ts                    |   4 +-
 packages/ozone/tests/3p-labeler.test.ts       |  10 +-
 packages/ozone/tests/_util.ts                 |   8 +-
 .../tests/ack-all-subjects-of-account.test.ts |   8 +-
 packages/ozone/tests/blob-divert.test.ts      |   2 +-
 .../tests/communication-templates.test.ts     |   2 +-
 packages/ozone/tests/content-tagger.test.ts   |   2 +-
 packages/ozone/tests/get-config.test.ts       |   2 +-
 packages/ozone/tests/get-lists.test.ts        |   8 +-
 packages/ozone/tests/get-profiles.test.ts     |   5 +-
 packages/ozone/tests/get-record.test.ts       |   8 +-
 packages/ozone/tests/get-records.test.ts      |   8 +-
 packages/ozone/tests/get-repo.test.ts         |   6 +-
 packages/ozone/tests/get-repos.test.ts        |   6 +-
 packages/ozone/tests/get-starter-pack.test.ts |  10 +-
 .../ozone/tests/moderation-appeals.test.ts    |  12 +-
 .../ozone/tests/moderation-events.test.ts     |   8 +-
 .../tests/moderation-status-tags.test.ts      |   4 +-
 .../ozone/tests/moderation-statuses.test.ts   |  16 +-
 packages/ozone/tests/moderation.test.ts       |  18 +-
 packages/ozone/tests/protected-tags.test.ts   |   6 +-
 packages/ozone/tests/query-labels.test.ts     |   6 +-
 .../tests/record-and-account-events.test.ts   |  15 +-
 packages/ozone/tests/repo-search.test.ts      |   4 +-
 packages/ozone/tests/report-muting.test.ts    |  12 +-
 packages/ozone/tests/sequencer.test.ts        |   6 +-
 packages/ozone/tests/server.test.ts           |   2 +-
 packages/ozone/tests/sets.test.ts             |   4 +-
 packages/ozone/tests/settings.test.ts         |   4 +-
 packages/ozone/tests/takedown.test.ts         |  15 +-
 packages/ozone/tests/team.test.ts             |   2 +-
 packages/pds/bin/migration-create.ts          |   4 +-
 packages/pds/package.json                     |   3 +
 packages/pds/src/account-manager/db/index.ts  |   2 +-
 .../db/schema/authorization-request.ts        |   2 +-
 .../src/account-manager/db/schema/device.ts   |   2 +-
 .../src/account-manager/db/schema/index.ts    |  14 +-
 .../src/account-manager/db/schema/token.ts    |   3 +-
 .../db/schema/used-refresh-token.ts           |   2 +-
 .../src/account-manager/helpers/account.ts    |   4 +-
 .../helpers/authorization-request.ts          |   4 +-
 .../account-manager/helpers/device-account.ts |   3 +-
 .../pds/src/account-manager/helpers/device.ts |   6 +-
 .../account-manager/helpers/email-token.ts    |   2 +-
 .../pds/src/account-manager/helpers/invite.ts |   2 +-
 .../src/account-manager/helpers/password.ts   |   4 +-
 .../pds/src/account-manager/helpers/scrypt.ts |   4 +-
 .../pds/src/account-manager/helpers/token.ts  |   2 +-
 packages/pds/src/account-manager/index.ts     |   7 +-
 .../pds/src/actor-store/actor-store-reader.ts |   2 +-
 packages/pds/src/actor-store/actor-store.ts   |   8 +-
 packages/pds/src/actor-store/blob/reader.ts   |   4 +-
 .../pds/src/actor-store/blob/transactor.ts    |  20 +-
 packages/pds/src/actor-store/db/index.ts      |   2 +-
 .../pds/src/actor-store/db/schema/index.ts    |   6 +-
 packages/pds/src/actor-store/migrate.ts       |   2 +-
 .../src/actor-store/preference/transactor.ts  |   4 +-
 packages/pds/src/actor-store/record/reader.ts |   4 +-
 .../pds/src/actor-store/record/transactor.ts  |   6 +-
 packages/pds/src/actor-store/repo/reader.ts   |   2 -
 .../src/actor-store/repo/sql-repo-reader.ts   |   8 +-
 .../actor-store/repo/sql-repo-transactor.ts   |   4 +-
 .../pds/src/actor-store/repo/transactor.ts    |   8 +-
 .../src/api/app/bsky/actor/getPreferences.ts  |   4 +-
 .../pds/src/api/app/bsky/actor/getProfile.ts  |   4 +-
 .../pds/src/api/app/bsky/actor/getProfiles.ts |   4 +-
 packages/pds/src/api/app/bsky/actor/index.ts  |   3 +-
 .../src/api/app/bsky/actor/putPreferences.ts  |   4 +-
 .../src/api/app/bsky/feed/getActorLikes.ts    |   4 +-
 .../src/api/app/bsky/feed/getAuthorFeed.ts    |   6 +-
 packages/pds/src/api/app/bsky/feed/getFeed.ts |   8 +-
 .../src/api/app/bsky/feed/getPostThread.ts    |  13 +-
 .../pds/src/api/app/bsky/feed/getTimeline.ts  |   4 +-
 packages/pds/src/api/app/bsky/feed/index.ts   |   2 +-
 packages/pds/src/api/app/bsky/index.ts        |   2 +-
 .../src/api/app/bsky/notification/index.ts    |   2 +-
 .../api/app/bsky/notification/registerPush.ts |   8 +-
 .../pds/src/api/app/bsky/util/resolver.ts     |   2 +-
 .../api/com/atproto/admin/deleteAccount.ts    |   4 +-
 .../atproto/admin/disableAccountInvites.ts    |   2 +-
 .../com/atproto/admin/disableInviteCodes.ts   |   2 +-
 .../com/atproto/admin/enableAccountInvites.ts |   2 +-
 .../api/com/atproto/admin/getAccountInfo.ts   |   5 +-
 .../api/com/atproto/admin/getAccountInfos.ts  |   2 +-
 .../api/com/atproto/admin/getInviteCodes.ts   |   8 +-
 .../api/com/atproto/admin/getSubjectStatus.ts |   2 +-
 .../pds/src/api/com/atproto/admin/index.ts    |  18 +-
 .../src/api/com/atproto/admin/sendEmail.ts    |   4 +-
 .../com/atproto/admin/updateAccountEmail.ts   |   2 +-
 .../com/atproto/admin/updateAccountHandle.ts  |   2 +-
 .../atproto/admin/updateAccountPassword.ts    |   2 +-
 .../com/atproto/admin/updateSubjectStatus.ts  |   6 +-
 .../pds/src/api/com/atproto/admin/util.ts     |   2 +-
 .../identity/getRecommendedDidCredentials.ts  |   2 +-
 .../pds/src/api/com/atproto/identity/index.ts |   6 +-
 .../identity/requestPlcOperationSignature.ts  |   6 +-
 .../api/com/atproto/identity/resolveHandle.ts |   4 +-
 .../com/atproto/identity/signPlcOperation.ts  |   6 +-
 .../atproto/identity/submitPlcOperation.ts    |   4 +-
 .../api/com/atproto/identity/updateHandle.ts  |   6 +-
 packages/pds/src/api/com/atproto/index.ts     |   2 +-
 .../com/atproto/moderation/createReport.ts    |   8 +-
 .../src/api/com/atproto/moderation/index.ts   |   2 +-
 .../src/api/com/atproto/repo/applyWrites.ts   |  16 +-
 .../src/api/com/atproto/repo/createRecord.ts  |   7 +-
 .../src/api/com/atproto/repo/deleteRecord.ts  |  11 +-
 .../src/api/com/atproto/repo/describeRepo.ts  |   6 +-
 .../pds/src/api/com/atproto/repo/getRecord.ts |   4 +-
 .../src/api/com/atproto/repo/importRepo.ts    |  14 +-
 .../pds/src/api/com/atproto/repo/index.ts     |   6 +-
 .../api/com/atproto/repo/listMissingBlobs.ts  |   2 +-
 .../src/api/com/atproto/repo/listRecords.ts   |   4 +-
 .../pds/src/api/com/atproto/repo/putRecord.ts |   6 +-
 .../src/api/com/atproto/repo/uploadBlob.ts    |   4 +-
 .../api/com/atproto/server/activateAccount.ts |   5 +-
 .../com/atproto/server/checkAccountStatus.ts  |   2 +-
 .../api/com/atproto/server/confirmEmail.ts    |   4 +-
 .../api/com/atproto/server/createAccount.ts   |  13 +-
 .../com/atproto/server/createAppPassword.ts   |   3 +-
 .../com/atproto/server/createInviteCode.ts    |   2 +-
 .../com/atproto/server/createInviteCodes.ts   |   4 +-
 .../api/com/atproto/server/createSession.ts   |   3 +-
 .../com/atproto/server/deactivateAccount.ts   |   2 +-
 .../api/com/atproto/server/deleteAccount.ts   |   4 +-
 .../api/com/atproto/server/deleteSession.ts   |   2 +-
 .../api/com/atproto/server/describeServer.ts  |   2 +-
 .../atproto/server/getAccountInviteCodes.ts   |   6 +-
 .../api/com/atproto/server/getServiceAuth.ts  |   8 +-
 .../src/api/com/atproto/server/getSession.ts  |   7 +-
 .../pds/src/api/com/atproto/server/index.ts   |  45 +-
 .../com/atproto/server/listAppPasswords.ts    |   3 +-
 .../api/com/atproto/server/refreshSession.ts  |   5 +-
 .../atproto/server/requestAccountDelete.ts    |   4 +-
 .../server/requestEmailConfirmation.ts        |   4 +-
 .../com/atproto/server/requestEmailUpdate.ts  |   6 +-
 .../atproto/server/requestPasswordReset.ts    |   2 +-
 .../com/atproto/server/reserveSigningKey.ts   |   2 +-
 .../api/com/atproto/server/resetPassword.ts   |   4 +-
 .../com/atproto/server/revokeAppPassword.ts   |   3 +-
 .../src/api/com/atproto/server/updateEmail.ts |   6 +-
 .../pds/src/api/com/atproto/server/util.ts    |   6 +-
 .../atproto/sync/deprecated/getCheckout.ts    |   2 +-
 .../com/atproto/sync/deprecated/getHead.ts    |   2 +-
 .../pds/src/api/com/atproto/sync/getBlob.ts   |   8 +-
 .../pds/src/api/com/atproto/sync/getBlocks.ts |   4 +-
 .../api/com/atproto/sync/getLatestCommit.ts   |   2 +-
 .../pds/src/api/com/atproto/sync/getRecord.ts |   8 +-
 .../pds/src/api/com/atproto/sync/getRepo.ts   |   8 +-
 .../src/api/com/atproto/sync/getRepoStatus.ts |   4 +-
 .../pds/src/api/com/atproto/sync/index.ts     |  10 +-
 .../pds/src/api/com/atproto/sync/listBlobs.ts |   4 +-
 .../pds/src/api/com/atproto/sync/listRepos.ts |   6 +-
 .../api/com/atproto/sync/subscribeRepos.ts    |   4 +-
 packages/pds/src/api/com/atproto/sync/util.ts |   2 +-
 .../api/com/atproto/temp/checkSignupQueue.ts  |   4 +-
 .../pds/src/api/com/atproto/temp/index.ts     |   2 +-
 packages/pds/src/api/index.ts                 |   4 +-
 packages/pds/src/api/proxy.ts                 |   2 +-
 packages/pds/src/auth-routes.ts               |   5 +-
 packages/pds/src/auth-verifier.ts             |   5 +-
 packages/pds/src/basic-routes.ts              |   8 +-
 packages/pds/src/config/config.ts             |   2 +-
 packages/pds/src/config/env.ts                |   2 +-
 packages/pds/src/context.ts                   |  51 +-
 packages/pds/src/crawlers.ts                  |   2 +-
 packages/pds/src/db/db.ts                     |  10 +-
 packages/pds/src/db/migrator.ts               |   2 +-
 packages/pds/src/db/tables/moderation.ts      |   4 +-
 packages/pds/src/db/util.ts                   |   4 +-
 packages/pds/src/did-cache/db/index.ts        |   2 +-
 packages/pds/src/did-cache/index.ts           |   2 +-
 packages/pds/src/disk-blobstore.ts            |  14 +-
 packages/pds/src/error.ts                     |   4 +-
 packages/pds/src/handle/index.ts              |   4 +-
 packages/pds/src/image/index.ts               |   4 +-
 packages/pds/src/index.ts                     |  28 +-
 packages/pds/src/logger.ts                    |   2 +-
 packages/pds/src/mailer/index.ts              |   3 +-
 packages/pds/src/mailer/moderation.ts         |   2 +-
 .../src/mailer/templates/confirm-email.d.ts   |   2 +-
 .../src/mailer/templates/delete-account.d.ts  |   2 +-
 .../src/mailer/templates/plc-operation.d.ts   |   2 +-
 .../src/mailer/templates/reset-password.d.ts  |   2 +-
 .../src/mailer/templates/update-email.d.ts    |   2 +-
 packages/pds/src/oauth/provider.ts            |   1 -
 packages/pds/src/pipethrough.ts               |  10 +-
 packages/pds/src/read-after-write/types.ts    |   6 +-
 packages/pds/src/read-after-write/util.ts     |   5 +-
 packages/pds/src/read-after-write/viewer.ts   |  34 +-
 packages/pds/src/redis.ts                     |   2 +-
 packages/pds/src/repo/prepare.ts              |  36 +-
 packages/pds/src/repo/types.ts                |   4 +-
 packages/pds/src/scripts/rebuild-repo.ts      |   4 +-
 packages/pds/src/sequencer/db/index.ts        |   2 +-
 packages/pds/src/sequencer/events.ts          |   6 +-
 packages/pds/src/sequencer/outbox.ts          |   4 +-
 packages/pds/src/sequencer/sequencer.ts       |  24 +-
 packages/pds/src/util/compression.ts          |   2 +-
 packages/pds/src/util/params.ts               |   2 +-
 packages/pds/src/well-known.ts                |   8 +-
 packages/pds/tests/_util.ts                   |  10 +-
 packages/pds/tests/account-deletion.test.ts   |  14 +-
 packages/pds/tests/account-migration.test.ts  |   6 +-
 packages/pds/tests/account.test.ts            |   4 +-
 packages/pds/tests/app-passwords.test.ts      |   2 +-
 packages/pds/tests/blob-deletes.test.ts       |   4 +-
 packages/pds/tests/create-post.test.ts        |   6 +-
 packages/pds/tests/crud.test.ts               |  10 +-
 packages/pds/tests/email-confirmation.test.ts |  10 +-
 packages/pds/tests/entryway.test.ts           |  10 +-
 packages/pds/tests/file-uploads.test.ts       |  14 +-
 packages/pds/tests/handles.test.ts            |   6 +-
 packages/pds/tests/invites-admin.test.ts      |   2 +-
 packages/pds/tests/moderation.test.ts         |   4 +-
 packages/pds/tests/moderator-auth.test.ts     |   8 +-
 packages/pds/tests/oauth.test.ts              |   8 +-
 packages/pds/tests/plc-operations.test.ts     |  12 +-
 packages/pds/tests/preferences.test.ts        |   4 +-
 packages/pds/tests/proxied/admin.test.ts      |   4 +-
 packages/pds/tests/proxied/feedgen.test.ts    |   8 +-
 packages/pds/tests/proxied/notif.test.ts      |  10 +-
 packages/pds/tests/proxied/procedures.test.ts |   2 +-
 .../pds/tests/proxied/proxy-catchall.test.ts  |  12 +-
 .../pds/tests/proxied/proxy-header.test.ts    |  10 +-
 .../tests/proxied/read-after-write.test.ts    |  12 +-
 packages/pds/tests/proxied/views.test.ts      |   6 +-
 packages/pds/tests/races.test.ts              |   4 +-
 packages/pds/tests/rate-limits.test.ts        |   2 +-
 packages/pds/tests/sequencer.test.ts          |  14 +-
 packages/pds/tests/server.test.ts             |   8 +-
 packages/pds/tests/sync/list.test.ts          |   2 +-
 .../pds/tests/sync/subscribe-repos.test.ts    |  18 +-
 packages/pds/tests/sync/sync.test.ts          |   6 +-
 packages/pds/tests/takedown-appeal.test.ts    |   2 +-
 packages/repo/bench/mst.bench.ts              |   4 +-
 packages/repo/package.json                    |   3 +
 packages/repo/src/block-map.ts                |   4 +-
 packages/repo/src/data-diff.ts                |   6 +-
 packages/repo/src/mst/diff.ts                 |   4 +-
 packages/repo/src/mst/mst.ts                  |  17 +-
 packages/repo/src/mst/util.ts                 |   6 +-
 packages/repo/src/mst/walker.ts               |   2 -
 packages/repo/src/parse.ts                    |   6 +-
 packages/repo/src/readable-repo.ts            |  14 +-
 packages/repo/src/repo.ts                     |  18 +-
 .../repo/src/storage/memory-blockstore.ts     |   4 +-
 .../repo/src/storage/readable-blockstore.ts   |   4 +-
 packages/repo/src/storage/sync-storage.ts     |   4 +-
 packages/repo/src/storage/types.ts            |   6 +-
 packages/repo/src/sync/consumer.ts            |  14 +-
 packages/repo/src/sync/provider.ts            |   6 +-
 packages/repo/src/types.ts                    |   8 +-
 packages/repo/src/util.ts                     |  25 +-
 packages/repo/tests/_util.ts                  |  18 +-
 packages/repo/tests/commit-data.test.ts       |   2 +-
 packages/repo/tests/mst.test.ts               |   8 +-
 packages/repo/tests/proofs.test.ts            |   1 -
 packages/repo/tests/repo.test.ts              |   6 +-
 packages/repo/tests/sync.test.ts              |   5 +-
 packages/sync/package.json                    |   3 +
 packages/sync/src/events.ts                   |   2 +-
 packages/sync/src/firehose/index.ts           |  30 +-
 packages/sync/src/firehose/lexicons.ts        |   3 +-
 packages/sync/src/runner/memory-runner.ts     |   2 -
 packages/sync/src/util.ts                     |   2 +-
 packages/sync/tests/firehose.test.ts          |   6 +-
 packages/syntax/src/aturi_validation.ts       |   2 +-
 packages/syntax/tests/aturi.test.ts           |   4 +-
 packages/syntax/tests/datetime.test.ts        |   8 +-
 packages/syntax/tests/did.test.ts             |   6 +-
 packages/syntax/tests/handle.test.ts          |   8 +-
 packages/syntax/tests/nsid.test.ts            |   8 +-
 packages/syntax/tests/recordkey.test.ts       |   6 +-
 packages/syntax/tests/tid.test.ts             |   6 +-
 packages/xrpc-server/package.json             |   3 +
 packages/xrpc-server/src/auth.ts              |   2 +-
 packages/xrpc-server/src/rate-limiter.ts      |   2 +-
 packages/xrpc-server/src/server.ts            |  41 +-
 packages/xrpc-server/src/stream/frames.ts     |   8 +-
 packages/xrpc-server/src/stream/server.ts     |   6 +-
 packages/xrpc-server/src/stream/stream.ts     |   6 +-
 .../xrpc-server/src/stream/subscription.ts    |   2 +-
 .../src/stream/websocket-keepalive.ts         |   2 +-
 packages/xrpc-server/src/types.ts             |  70 +-
 packages/xrpc-server/src/util.ts              |  19 +-
 packages/xrpc-server/tests/_util.ts           |   2 +-
 packages/xrpc-server/tests/auth.test.ts       |   8 +-
 packages/xrpc-server/tests/bodies.test.ts     |   8 +-
 packages/xrpc-server/tests/errors.test.ts     |   2 +-
 packages/xrpc-server/tests/frames.test.ts     |   2 +-
 packages/xrpc-server/tests/ipld.test.ts       |   4 +-
 packages/xrpc-server/tests/parameters.test.ts |   2 +-
 packages/xrpc-server/tests/procedures.test.ts |   4 +-
 packages/xrpc-server/tests/queries.test.ts    |   2 +-
 packages/xrpc-server/tests/responses.test.ts  |   4 +-
 packages/xrpc-server/tests/stream.test.ts     |   6 +-
 .../xrpc-server/tests/subscriptions.test.ts   |  10 +-
 packages/xrpc/src/client.ts                   |   2 +-
 packages/xrpc/src/index.ts                    |   2 +
 packages/xrpc/src/util.ts                     |   4 +-
 pnpm-lock.yaml                                | 895 ++++++++++++++++++
 services/bsky/api.js                          |   8 +-
 services/bsync/index.js                       |   4 +-
 services/ozone/api.js                         |   6 +-
 services/pds/index.js                         |   2 +-
 services/pds/run-script.js                    |   2 +-
 services/pds/tracer.js                        |   5 +-
 818 files changed, 3563 insertions(+), 2717 deletions(-)
 create mode 100644 .changeset/fair-tigers-thank.md
 create mode 100644 .changeset/mighty-actors-complain.md
 create mode 100644 .changeset/olive-teachers-yawn.md
 create mode 100644 .vscode/settings.json
 delete mode 100644 packages/api/bench/agent.bench.ts

diff --git a/.changeset/fair-tigers-thank.md b/.changeset/fair-tigers-thank.md
new file mode 100644
index 00000000000..9491e3c47c2
--- /dev/null
+++ b/.changeset/fair-tigers-thank.md
@@ -0,0 +1,41 @@
+---
+"@atproto-labs/rollup-plugin-bundle-manifest": patch
+"@atproto/oauth-client-browser-example": patch
+"@atproto-labs/handle-resolver-node": patch
+"@atproto-labs/simple-store-memory": patch
+"@atproto-labs/identity-resolver": patch
+"@atproto/oauth-client-browser": patch
+"@atproto-labs/handle-resolver": patch
+"@atproto/oauth-client-node": patch
+"@atproto-labs/did-resolver": patch
+"@atproto-labs/simple-store": patch
+"@atproto/oauth-provider": patch
+"@atproto-labs/fetch-node": patch
+"@atproto/jwk-webcrypto": patch
+"@atproto/oauth-client": patch
+"@atproto/oauth-types": patch
+"@atproto-labs/fetch": patch
+"@atproto/jwk-jose": patch
+"@atproto/xrpc-server": patch
+"@atproto/common-web": patch
+"@atproto/jwk": patch
+"@atproto/identity": patch
+"@atproto/dev-env": patch
+"@atproto/lex-cli": patch
+"@atproto/lexicon": patch
+"@atproto/common": patch
+"@atproto/crypto": patch
+"@atproto/syntax": patch
+"@atproto/bsync": patch
+"@atproto/ozone": patch
+"@atproto/bsky": patch
+"@atproto/repo": patch
+"@atproto/sync": patch
+"@atproto/xrpc": patch
+"@atproto/api": patch
+"@atproto/aws": patch
+"@atproto/did": patch
+"@atproto/pds": patch
+---
+
+Apply new linting rules regarding import order
diff --git a/.changeset/mighty-actors-complain.md b/.changeset/mighty-actors-complain.md
new file mode 100644
index 00000000000..02236e7d574
--- /dev/null
+++ b/.changeset/mighty-actors-complain.md
@@ -0,0 +1,22 @@
+---
+"@atproto-labs/rollup-plugin-bundle-manifest": patch
+"@atproto-labs/handle-resolver-node": patch
+"@atproto/oauth-client-node": patch
+"@atproto/oauth-provider": patch
+"@atproto-labs/fetch-node": patch
+"@atproto/xrpc-server": patch
+"@atproto/identity": patch
+"@atproto/dev-env": patch
+"@atproto/lex-cli": patch
+"@atproto/common": patch
+"@atproto/crypto": patch
+"@atproto/bsync": patch
+"@atproto/ozone": patch
+"@atproto/bsky": patch
+"@atproto/repo": patch
+"@atproto/sync": patch
+"@atproto/aws": patch
+"@atproto/pds": patch
+---
+
+Update NodeJS engine requirement to >=18.7.0
diff --git a/.changeset/olive-teachers-yawn.md b/.changeset/olive-teachers-yawn.md
new file mode 100644
index 00000000000..2211f115909
--- /dev/null
+++ b/.changeset/olive-teachers-yawn.md
@@ -0,0 +1,5 @@
+---
+"@atproto/oauth-types": patch
+---
+
+Support environments not providing URL.canParse
diff --git a/.eslintrc b/.eslintrc
index 8529167b1fd..8afe9bb56dc 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,24 +1,48 @@
 {
   "root": true,
-  // parse TypeScript files
-  // https://github.com/typescript-eslint/typescript-eslint/tree/master/packages/parser
-  "parser": "@typescript-eslint/parser",
-  // configure eslint using options described at
-  // https://github.com/typescript-eslint/typescript-eslint/tree/master/packages/eslint-plugin
-  "plugins": ["@typescript-eslint"],
   "extends": [
     "eslint:recommended",
+    "plugin:@typescript-eslint/base",
     "plugin:@typescript-eslint/eslint-recommended",
     "plugin:@typescript-eslint/recommended",
     "plugin:prettier/recommended",
-    "prettier"
+    "plugin:import/recommended",
+    "plugin:import/typescript"
   ],
+  "plugins": ["n"],
   "ignorePatterns": ["dist", "node_modules"],
   "rules": {
     "no-var": "error",
     "prefer-const": "warn",
     "no-misleading-character-class": "warn",
     "eqeqeq": ["error", "always", { "null": "ignore" }],
+    "n/global-require": "error",
+    "n/no-extraneous-import": "error",
+    "n/prefer-node-protocol": "error",
+    "import/extensions": ["off", "ignorePackages"],
+    "import/export": "off",
+    "import/namespace": "off",
+    "import/no-deprecated": "error",
+    "import/no-absolute-path": "error",
+    "import/no-dynamic-require": "error",
+    "import/no-self-import": "error",
+    "import/order": [
+      "error",
+      {
+        "named": true,
+        "distinctGroup": true,
+        "alphabetize": { "order": "asc" },
+        "newlines-between": "never",
+        "groups": [
+          "builtin",
+          "external",
+          "internal",
+          "parent",
+          ["index", "sibling"],
+          "object"
+        ]
+      }
+    ],
     "@typescript-eslint/no-unused-vars": [
       "warn",
       { "argsIgnorePattern": "^_", "varsIgnorePattern": "^_" }
@@ -43,6 +67,33 @@
       "rules": {
         "@typescript-eslint/no-var-requires": "off"
       }
+    },
+    {
+      "files": ["**/*.test.ts", "**/tests/**/*.ts"],
+      "rules": {
+        "n/no-extraneous-import": [
+          "error",
+          { "allowModules": ["@atproto/dev-env"] }
+        ]
+      }
+    }
+  ],
+  "settings": {
+    "node": { "version": ">=18.7.0" },
+    "import/internal-regex": "^@atproto(?:-labs)?/",
+    "import/parsers": { "@typescript-eslint/parser": [".ts", ".tsx"] },
+    "import/resolver": {
+      "typescript": {
+        "project": [
+          "tsconfig.json",
+          "packages/oauth/*/tsconfig.json",
+          "packages/internal/*/tsconfig.json",
+          "packages/*/tsconfig.json"
+        ]
+      },
+      "node": {
+        "extensions": [".js", ".jsx", ".json"]
+      }
     }
-  ]
+  }
 }
diff --git a/.gitignore b/.gitignore
index dccb907cf77..cda9f5843e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,12 +5,12 @@ yarn-error.log
 packages/**/dist
 .idea
 packages/*/coverage
-.vscode/
 test.sqlite
 .DS_Store
 *.log
 *.tsbuildinfo
 .*.env
+.env.*
 .env
 \#*\#
 *~
diff --git a/.prettierignore b/.prettierignore
index 16e700de3db..681b5d03670 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,12 +1,8 @@
 node_modules
 interop-test-files
+__snapshots__
 dist
-build
-.nyc_output
-coverage
 pnpm-lock.yaml
 .pnpm*
 .changeset
-*.d.ts
-packages/bsky/src/data-plane/gen
 CHANGELOG.md
diff --git a/.prettierrc b/.prettierrc
index 078e423519b..d7161f6af07 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -9,6 +9,13 @@
       "options": {
         "singleQuote": false
       }
+    },
+    {
+      "files": [".eslintrc"],
+      "options": {
+        "parser": "json",
+        "trailingComma": "none"
+      }
     }
   ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000000..b5230afc1a4
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,6 @@
+{
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "files.associations": {
+    "**/tsconfig/*.json": "jsonc"
+  }
+}
diff --git a/package.json b/package.json
index e9de3327688..2601cf8493d 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "private": true,
   "engines": {
-    "node": "18"
+    "node": ">=18.7.0"
   },
   "packageManager": "pnpm@8.15.9",
   "scripts": {
@@ -43,6 +43,9 @@
     "dotenv": "^16.0.3",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
+    "eslint-import-resolver-typescript": "^3.7.0",
+    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-n": "^17.15.0",
     "eslint-plugin-prettier": "^5.1.3",
     "jest": "^28.1.2",
     "node-gyp": "^9.3.1",
diff --git a/packages/api/bench/agent.bench.ts b/packages/api/bench/agent.bench.ts
deleted file mode 100644
index 333fbd49a20..00000000000
--- a/packages/api/bench/agent.bench.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { BskyAgent } from '@atproto/api'
-
-describe('Agent Benchmarks', () => {
-  it('Creates new Agent instance 10 times', () => {
-    for (let i = 0; i < 10; i++) {
-      new BskyAgent({ service: 'https://bsky.social' })
-    }
-  })
-})
diff --git a/packages/api/src/agent.ts b/packages/api/src/agent.ts
index 7613e58d1fa..b0be3ba7946 100644
--- a/packages/api/src/agent.ts
+++ b/packages/api/src/agent.ts
@@ -1,12 +1,7 @@
+import AwaitLock from 'await-lock'
 import { TID } from '@atproto/common-web'
 import { AtUri, ensureValidDid } from '@atproto/syntax'
-import {
-  buildFetchHandler,
-  BuildFetchHandlerOptions,
-  FetchHandler,
-  XrpcClient,
-} from '@atproto/xrpc'
-import AwaitLock from 'await-lock'
+import { FetchHandler, XrpcClient, buildFetchHandler } from '@atproto/xrpc'
 import {
   AppBskyActorDefs,
   AppBskyActorProfile,
@@ -38,14 +33,14 @@ import {
   BskyThreadViewPreference,
 } from './types'
 import {
-  asDid,
   Did,
+  asDid,
   getSavedFeedType,
   isDid,
   sanitizeMutedWordValue,
   savedFeedsToUriArrays,
-  validateSavedFeed,
   validateNux,
+  validateSavedFeed,
 } from './util'
 
 const FEED_VIEW_PREF_DEFAULTS = {
diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts
index 43d46020e18..8ced8afe4ea 100644
--- a/packages/api/src/index.ts
+++ b/packages/api/src/index.ts
@@ -4,10 +4,10 @@ import { lexicons as internalLexicons } from './client/lexicons'
 export { AtUri } from '@atproto/syntax'
 export {
   BlobRef,
+  jsonStringToLex,
+  jsonToLex,
   lexToJson,
   stringifyLex,
-  jsonToLex,
-  jsonStringToLex,
 } from '@atproto/lexicon'
 export { parseLanguage } from '@atproto/common-web'
 export * from './types'
@@ -22,7 +22,7 @@ export * from './rich-text/util'
 export * from './moderation'
 export * from './moderation/types'
 export * from './mocker'
-export { LABELS, DEFAULT_LABEL_SETTINGS } from './moderation/const/labels'
+export { DEFAULT_LABEL_SETTINGS, LABELS } from './moderation/const/labels'
 export { Agent } from './agent'
 
 export { AtpAgent, type AtpAgentOptions } from './atp-agent'
diff --git a/packages/api/src/mocker.ts b/packages/api/src/mocker.ts
index 556dba965c8..905268de8d4 100644
--- a/packages/api/src/mocker.ts
+++ b/packages/api/src/mocker.ts
@@ -1,11 +1,11 @@
 import {
-  ComAtprotoLabelDefs,
-  AppBskyFeedDefs,
   AppBskyActorDefs,
-  AppBskyFeedPost,
   AppBskyEmbedRecord,
+  AppBskyFeedDefs,
+  AppBskyFeedPost,
   AppBskyGraphDefs,
   AppBskyNotificationListNotifications,
+  ComAtprotoLabelDefs,
 } from './client'
 
 const FAKE_CID = 'bafyreiclp443lavogvhj3d2ob2cxbfuscni2k5jk7bebjzg7khl3esabwq'
diff --git a/packages/api/src/moderation/decision.ts b/packages/api/src/moderation/decision.ts
index 042a90bbe45..bc33e100ca6 100644
--- a/packages/api/src/moderation/decision.ts
+++ b/packages/api/src/moderation/decision.ts
@@ -1,20 +1,20 @@
 import { AppBskyGraphDefs } from '../client/index'
+import { LABELS } from './const/labels'
 import {
   BLOCK_BEHAVIOR,
-  MUTE_BEHAVIOR,
-  MUTEWORD_BEHAVIOR,
+  CUSTOM_LABEL_VALUE_RE,
   HIDE_BEHAVIOR,
-  NOOP_BEHAVIOR,
   Label,
   LabelPreference,
-  ModerationCause,
-  ModerationOpts,
   LabelTarget,
+  MUTEWORD_BEHAVIOR,
+  MUTE_BEHAVIOR,
   ModerationBehavior,
-  CUSTOM_LABEL_VALUE_RE,
+  ModerationCause,
+  ModerationOpts,
+  NOOP_BEHAVIOR,
 } from './types'
 import { ModerationUI } from './ui'
-import { LABELS } from './const/labels'
 
 enum ModerationBehaviorSeverity {
   High,
diff --git a/packages/api/src/moderation/index.ts b/packages/api/src/moderation/index.ts
index 503e635c816..b2375899fab 100644
--- a/packages/api/src/moderation/index.ts
+++ b/packages/api/src/moderation/index.ts
@@ -1,18 +1,18 @@
-import {
-  ModerationSubjectProfile,
-  ModerationSubjectPost,
-  ModerationSubjectNotification,
-  ModerationSubjectFeedGenerator,
-  ModerationSubjectUserList,
-  ModerationOpts,
-} from './types'
+import { ModerationDecision } from './decision'
 import { decideAccount } from './subjects/account'
-import { decideProfile } from './subjects/profile'
+import { decideFeedGenerator } from './subjects/feed-generator'
 import { decideNotification } from './subjects/notification'
 import { decidePost } from './subjects/post'
-import { decideFeedGenerator } from './subjects/feed-generator'
+import { decideProfile } from './subjects/profile'
 import { decideUserList } from './subjects/user-list'
-import { ModerationDecision } from './decision'
+import {
+  ModerationOpts,
+  ModerationSubjectFeedGenerator,
+  ModerationSubjectNotification,
+  ModerationSubjectPost,
+  ModerationSubjectProfile,
+  ModerationSubjectUserList,
+} from './types'
 
 export { ModerationUI } from './ui'
 export { ModerationDecision } from './decision'
diff --git a/packages/api/src/moderation/subjects/account.ts b/packages/api/src/moderation/subjects/account.ts
index a1c873b7dd5..6014d46ffad 100644
--- a/packages/api/src/moderation/subjects/account.ts
+++ b/packages/api/src/moderation/subjects/account.ts
@@ -1,5 +1,5 @@
 import { ModerationDecision } from '../decision'
-import { Label, ModerationSubjectProfile, ModerationOpts } from '../types'
+import { Label, ModerationOpts, ModerationSubjectProfile } from '../types'
 
 export function decideAccount(
   subject: ModerationSubjectProfile,
diff --git a/packages/api/src/moderation/subjects/feed-generator.ts b/packages/api/src/moderation/subjects/feed-generator.ts
index 3afada34b2d..8568f90f0ed 100644
--- a/packages/api/src/moderation/subjects/feed-generator.ts
+++ b/packages/api/src/moderation/subjects/feed-generator.ts
@@ -1,5 +1,5 @@
 import { ModerationDecision } from '../decision'
-import { ModerationSubjectFeedGenerator, ModerationOpts } from '../types'
+import { ModerationOpts, ModerationSubjectFeedGenerator } from '../types'
 import { decideAccount } from './account'
 import { decideProfile } from './profile'
 
diff --git a/packages/api/src/moderation/subjects/notification.ts b/packages/api/src/moderation/subjects/notification.ts
index 610766866a8..2e3a8a09f9d 100644
--- a/packages/api/src/moderation/subjects/notification.ts
+++ b/packages/api/src/moderation/subjects/notification.ts
@@ -1,5 +1,5 @@
 import { ModerationDecision } from '../decision'
-import { ModerationSubjectNotification, ModerationOpts } from '../types'
+import { ModerationOpts, ModerationSubjectNotification } from '../types'
 import { decideAccount } from './account'
 import { decideProfile } from './profile'
 
diff --git a/packages/api/src/moderation/subjects/post.ts b/packages/api/src/moderation/subjects/post.ts
index f17ec40293f..8d0b7c6db5b 100644
--- a/packages/api/src/moderation/subjects/post.ts
+++ b/packages/api/src/moderation/subjects/post.ts
@@ -1,14 +1,14 @@
-import { ModerationDecision } from '../decision'
 import {
-  AppBskyFeedPost,
+  AppBskyActorDefs,
+  AppBskyEmbedExternal,
   AppBskyEmbedImages,
   AppBskyEmbedRecord,
   AppBskyEmbedRecordWithMedia,
-  AppBskyEmbedExternal,
-  AppBskyActorDefs,
+  AppBskyFeedPost,
 } from '../../client'
-import { ModerationSubjectPost, ModerationOpts } from '../types'
+import { ModerationDecision } from '../decision'
 import { hasMutedWord } from '../mutewords'
+import { ModerationOpts, ModerationSubjectPost } from '../types'
 import { decideAccount } from './account'
 import { decideProfile } from './profile'
 
diff --git a/packages/api/src/moderation/subjects/profile.ts b/packages/api/src/moderation/subjects/profile.ts
index f76e2bfa730..0dfcf67b658 100644
--- a/packages/api/src/moderation/subjects/profile.ts
+++ b/packages/api/src/moderation/subjects/profile.ts
@@ -1,5 +1,5 @@
 import { ModerationDecision } from '../decision'
-import { Label, ModerationSubjectProfile, ModerationOpts } from '../types'
+import { Label, ModerationOpts, ModerationSubjectProfile } from '../types'
 
 export function decideProfile(
   subject: ModerationSubjectProfile,
diff --git a/packages/api/src/moderation/subjects/user-list.ts b/packages/api/src/moderation/subjects/user-list.ts
index f5ed15177d9..f2d5f408702 100644
--- a/packages/api/src/moderation/subjects/user-list.ts
+++ b/packages/api/src/moderation/subjects/user-list.ts
@@ -1,7 +1,7 @@
 import { AtUri } from '@atproto/syntax'
 import { AppBskyActorDefs } from '../../client/index'
 import { ModerationDecision } from '../decision'
-import { ModerationSubjectUserList, ModerationOpts } from '../types'
+import { ModerationOpts, ModerationSubjectUserList } from '../types'
 import { decideAccount } from './account'
 import { decideProfile } from './profile'
 
diff --git a/packages/api/src/moderation/types.ts b/packages/api/src/moderation/types.ts
index bbf8d842f23..6d2371b113c 100644
--- a/packages/api/src/moderation/types.ts
+++ b/packages/api/src/moderation/types.ts
@@ -1,8 +1,8 @@
 import {
   AppBskyActorDefs,
   AppBskyFeedDefs,
-  AppBskyNotificationListNotifications,
   AppBskyGraphDefs,
+  AppBskyNotificationListNotifications,
   ComAtprotoLabelDefs,
 } from '../client/index'
 import { KnownLabelValue } from './const/labels'
diff --git a/packages/api/src/moderation/util.ts b/packages/api/src/moderation/util.ts
index c7ac5bdf975..4c4c4eb210e 100644
--- a/packages/api/src/moderation/util.ts
+++ b/packages/api/src/moderation/util.ts
@@ -6,9 +6,9 @@ import {
 } from '../client'
 import {
   InterpretedLabelValueDefinition,
-  ModerationBehavior,
   LabelPreference,
   LabelValueDefinitionFlag,
+  ModerationBehavior,
 } from './types'
 
 export function isQuotedPost(embed: unknown): embed is AppBskyEmbedRecord.View {
diff --git a/packages/api/src/rich-text/detection.ts b/packages/api/src/rich-text/detection.ts
index 8d1e05521f9..f4b190e10fc 100644
--- a/packages/api/src/rich-text/detection.ts
+++ b/packages/api/src/rich-text/detection.ts
@@ -2,10 +2,10 @@ import TLDs from 'tlds'
 import { AppBskyRichtextFacet } from '../client'
 import { UnicodeString } from './unicode'
 import {
-  URL_REGEX,
   MENTION_REGEX,
   TAG_REGEX,
   TRAILING_PUNCTUATION_REGEX,
+  URL_REGEX,
 } from './util'
 
 export type Facet = AppBskyRichtextFacet.Main
diff --git a/packages/api/src/rich-text/rich-text.ts b/packages/api/src/rich-text/rich-text.ts
index 2b7d0227bc0..44f48b5f4b8 100644
--- a/packages/api/src/rich-text/rich-text.ts
+++ b/packages/api/src/rich-text/rich-text.ts
@@ -92,9 +92,9 @@ F: 0 1 2 3 4 5 6 7 8 910   // string indices
  */
 
 import { AppBskyFeedPost, AppBskyRichtextFacet, AtpBaseClient } from '../client'
-import { UnicodeString } from './unicode'
-import { sanitizeRichText } from './sanitization'
 import { detectFacets } from './detection'
+import { sanitizeRichText } from './sanitization'
+import { UnicodeString } from './unicode'
 
 export type Facet = AppBskyRichtextFacet.Main
 export type FacetLink = AppBskyRichtextFacet.Link
diff --git a/packages/api/src/util.ts b/packages/api/src/util.ts
index 145ffba7fbe..5e9e28bf044 100644
--- a/packages/api/src/util.ts
+++ b/packages/api/src/util.ts
@@ -1,9 +1,8 @@
-import { AtUri } from '@atproto/syntax'
+import { z } from 'zod'
 import { TID } from '@atproto/common-web'
-import zod from 'zod'
-
-import { Nux } from './client/types/app/bsky/actor/defs'
+import { AtUri } from '@atproto/syntax'
 import { AppBskyActorDefs } from './client'
+import { Nux } from './client/types/app/bsky/actor/defs'
 
 export function sanitizeMutedWordValue(value: string) {
   return (
@@ -97,12 +96,12 @@ export const asDid = (value: string): Did => {
   throw new TypeError(`Invalid DID: ${value}`)
 }
 
-export const nuxSchema = zod
+export const nuxSchema = z
   .object({
-    id: zod.string().max(64),
-    completed: zod.boolean(),
-    data: zod.string().max(300).optional(),
-    expiresAt: zod.string().datetime().optional(),
+    id: z.string().max(64),
+    completed: z.boolean(),
+    data: z.string().max(300).optional(),
+    expiresAt: z.string().datetime().optional(),
   })
   .strict()
 
diff --git a/packages/api/tests/atp-agent.test.ts b/packages/api/tests/atp-agent.test.ts
index b2387dba3c8..823faf63682 100644
--- a/packages/api/tests/atp-agent.test.ts
+++ b/packages/api/tests/atp-agent.test.ts
@@ -1,5 +1,5 @@
-import { TestNetworkNoAppView } from '@atproto/dev-env'
 import { TID } from '@atproto/common-web'
+import { TestNetworkNoAppView } from '@atproto/dev-env'
 import {
   AppBskyActorDefs,
   AppBskyActorProfile,
diff --git a/packages/api/tests/dispatcher.test.ts b/packages/api/tests/dispatcher.test.ts
index 0c686aa966a..11c4802ca25 100644
--- a/packages/api/tests/dispatcher.test.ts
+++ b/packages/api/tests/dispatcher.test.ts
@@ -1,13 +1,13 @@
+import assert from 'node:assert'
 import { AddressInfo } from 'node:net'
-import assert from 'assert'
+import { getPdsEndpoint, isValidDidDoc } from '@atproto/common-web'
+import { TestNetworkNoAppView } from '@atproto/dev-env'
 import {
   AtpAgent,
-  AtpSessionEvent,
   AtpSessionData,
+  AtpSessionEvent,
   BSKY_LABELER_DID,
 } from '../src'
-import { TestNetworkNoAppView } from '@atproto/dev-env'
-import { getPdsEndpoint, isValidDidDoc } from '@atproto/common-web'
 import { createHeaderEchoServer } from './util/echo-server'
 
 const getPdsEndpointUrl = (...args: Parameters<typeof getPdsEndpoint>) => {
diff --git a/packages/api/tests/errors.test.ts b/packages/api/tests/errors.test.ts
index 2d903f2f17e..e2cfff26875 100644
--- a/packages/api/tests/errors.test.ts
+++ b/packages/api/tests/errors.test.ts
@@ -1,5 +1,5 @@
-import { AtpAgent, ComAtprotoServerCreateAccount } from '..'
 import { TestNetworkNoAppView } from '@atproto/dev-env'
+import { AtpAgent, ComAtprotoServerCreateAccount } from '..'
 
 describe('errors', () => {
   let network: TestNetworkNoAppView
diff --git a/packages/api/tests/moderation-behaviors.test.ts b/packages/api/tests/moderation-behaviors.test.ts
index 7e8b54a69a0..a180828b59b 100644
--- a/packages/api/tests/moderation-behaviors.test.ts
+++ b/packages/api/tests/moderation-behaviors.test.ts
@@ -1,10 +1,10 @@
-import { moderateProfile, moderatePost } from '../src'
+import { moderatePost, moderateProfile } from '../src'
 import {
   ModerationBehaviorSuiteRunner,
-  SuiteUsers,
+  ModerationTestSuiteScenario,
   SuiteConfigurations,
   SuiteScenarios,
-  ModerationTestSuiteScenario,
+  SuiteUsers,
 } from './util/moderation-behavior'
 
 const USERS: SuiteUsers = {
diff --git a/packages/api/tests/moderation-custom-labels.test.ts b/packages/api/tests/moderation-custom-labels.test.ts
index 3e051fb0498..0af184aeb06 100644
--- a/packages/api/tests/moderation-custom-labels.test.ts
+++ b/packages/api/tests/moderation-custom-labels.test.ts
@@ -1,10 +1,10 @@
 import {
-  moderateProfile,
-  moderatePost,
-  mock,
-  ModerationOpts,
   InterpretedLabelValueDefinition,
+  ModerationOpts,
   interpretLabelValueDefinition,
+  mock,
+  moderatePost,
+  moderateProfile,
 } from '../src'
 import './util/moderation-behavior'
 
diff --git a/packages/api/tests/moderation-mutewords.test.ts b/packages/api/tests/moderation-mutewords.test.ts
index 681dddc73d8..b8eb014ee56 100644
--- a/packages/api/tests/moderation-mutewords.test.ts
+++ b/packages/api/tests/moderation-mutewords.test.ts
@@ -1,5 +1,4 @@
 import { RichText, mock, moderatePost } from '../src/'
-
 import { hasMutedWord } from '../src/moderation/mutewords'
 
 describe(`hasMutedWord`, () => {
diff --git a/packages/api/tests/moderation-quoteposts.test.ts b/packages/api/tests/moderation-quoteposts.test.ts
index 1ed415d3231..2041f190396 100644
--- a/packages/api/tests/moderation-quoteposts.test.ts
+++ b/packages/api/tests/moderation-quoteposts.test.ts
@@ -1,9 +1,9 @@
 import {
-  moderatePost,
-  mock,
-  ModerationOpts,
   InterpretedLabelValueDefinition,
+  ModerationOpts,
   interpretLabelValueDefinition,
+  mock,
+  moderatePost,
 } from '../src'
 import './util/moderation-behavior'
 
diff --git a/packages/api/tests/moderation.test.ts b/packages/api/tests/moderation.test.ts
index d7d3f9d47bc..f85e4a5325a 100644
--- a/packages/api/tests/moderation.test.ts
+++ b/packages/api/tests/moderation.test.ts
@@ -1,11 +1,11 @@
+import { ModerationOpts } from '../dist'
 import {
-  moderateProfile,
-  moderatePost,
-  mock,
   interpretLabelValueDefinition,
+  mock,
+  moderatePost,
+  moderateProfile,
 } from '../src'
 import './util/moderation-behavior'
-import { ModerationOpts } from '../dist'
 
 describe('Moderation', () => {
   it('Applies self-labels on profiles according to the global preferences', () => {
diff --git a/packages/api/tests/rich-text-sanitization.test.ts b/packages/api/tests/rich-text-sanitization.test.ts
index 6e2a889473d..45365df1fff 100644
--- a/packages/api/tests/rich-text-sanitization.test.ts
+++ b/packages/api/tests/rich-text-sanitization.test.ts
@@ -1,4 +1,4 @@
-import { RichText, sanitizeRichText, Facet, UnicodeString } from '../src'
+import { Facet, RichText, UnicodeString, sanitizeRichText } from '../src'
 
 describe('sanitizeRichText: cleanNewlines', () => {
   it('removes more than two consecutive new lines', () => {
diff --git a/packages/api/tests/util/moderation-behavior.ts b/packages/api/tests/util/moderation-behavior.ts
index 9cc8a9a0761..f30986852f9 100644
--- a/packages/api/tests/util/moderation-behavior.ts
+++ b/packages/api/tests/util/moderation-behavior.ts
@@ -1,8 +1,8 @@
 import {
-  ModerationUI,
-  ModerationOpts,
   ComAtprotoLabelDefs,
   LabelPreference,
+  ModerationOpts,
+  ModerationUI,
 } from '../../src'
 import { mock as m } from '../../src/mocker'
 
diff --git a/packages/aws/package.json b/packages/aws/package.json
index b277284b583..752d6850761 100644
--- a/packages/aws/package.json
+++ b/packages/aws/package.json
@@ -18,6 +18,9 @@
   "scripts": {
     "build": "tsc --build tsconfig.build.json"
   },
+  "engines": {
+    "node": ">=18.7.0"
+  },
   "dependencies": {
     "@atproto/common": "workspace:^",
     "@atproto/crypto": "workspace:^",
diff --git a/packages/aws/src/kms.ts b/packages/aws/src/kms.ts
index da2eb1836db..7589307dd6d 100644
--- a/packages/aws/src/kms.ts
+++ b/packages/aws/src/kms.ts
@@ -1,8 +1,8 @@
 import * as aws from '@aws-sdk/client-kms'
 import { secp256k1 as noble } from '@noble/curves/secp256k1'
+import KeyEncoder from 'key-encoder'
 import * as ui8 from 'uint8arrays'
 import * as crypto from '@atproto/crypto'
-import KeyEncoder from 'key-encoder'
 
 const keyEncoder = new KeyEncoder('secp256k1')
 
diff --git a/packages/aws/src/s3.ts b/packages/aws/src/s3.ts
index 81014d63f7d..682a5a0cc8b 100644
--- a/packages/aws/src/s3.ts
+++ b/packages/aws/src/s3.ts
@@ -1,9 +1,9 @@
+import stream from 'node:stream'
 import * as aws from '@aws-sdk/client-s3'
 import { Upload } from '@aws-sdk/lib-storage'
-import { BlobStore, BlobNotFoundError } from '@atproto/repo'
-import { randomStr } from '@atproto/crypto'
 import { CID } from 'multiformats/cid'
-import stream from 'stream'
+import { randomStr } from '@atproto/crypto'
+import { BlobNotFoundError, BlobStore } from '@atproto/repo'
 
 export type S3Config = { bucket: string; uploadTimeoutMs?: number } & Omit<
   aws.S3ClientConfig,
diff --git a/packages/bsky/bin/migration-create.ts b/packages/bsky/bin/migration-create.ts
index 27edc5e0979..4d77afd94fd 100644
--- a/packages/bsky/bin/migration-create.ts
+++ b/packages/bsky/bin/migration-create.ts
@@ -1,7 +1,7 @@
 #!/usr/bin/env ts-node
 
-import * as fs from 'fs/promises'
-import * as path from 'path'
+import * as fs from 'node:fs/promises'
+import * as path from 'node:path'
 
 export async function main() {
   const now = new Date()
diff --git a/packages/bsky/package.json b/packages/bsky/package.json
index 796460106de..069885e6f4e 100644
--- a/packages/bsky/package.json
+++ b/packages/bsky/package.json
@@ -26,6 +26,9 @@
     "migration:create": "ts-node ./bin/migration-create.ts",
     "buf:gen": "buf generate ../bsync/proto && buf generate ./proto"
   },
+  "engines": {
+    "node": ">=18.7.0"
+  },
   "dependencies": {
     "@atproto-labs/fetch-node": "workspace:*",
     "@atproto-labs/xrpc-utils": "workspace:*",
diff --git a/packages/bsky/src/api/app/bsky/actor/getProfile.ts b/packages/bsky/src/api/app/bsky/actor/getProfile.ts
index 046312114b6..a28d790459d 100644
--- a/packages/bsky/src/api/app/bsky/actor/getProfile.ts
+++ b/packages/bsky/src/api/app/bsky/actor/getProfile.ts
@@ -1,15 +1,15 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { Server } from '../../../../lexicon'
-import { QueryParams } from '../../../../lexicon/types/app/bsky/actor/getProfile'
-import AppContext from '../../../../context'
-import { resHeaders } from '../../../util'
-import { createPipeline, noRules } from '../../../../pipeline'
+import { AppContext } from '../../../../context'
 import {
   HydrateCtx,
   HydrationState,
   Hydrator,
 } from '../../../../hydration/hydrator'
+import { Server } from '../../../../lexicon'
+import { QueryParams } from '../../../../lexicon/types/app/bsky/actor/getProfile'
+import { createPipeline, noRules } from '../../../../pipeline'
 import { Views } from '../../../../views'
+import { resHeaders } from '../../../util'
 
 export default function (server: Server, ctx: AppContext) {
   const getProfile = createPipeline(skeleton, hydration, noRules, presentation)
diff --git a/packages/bsky/src/api/app/bsky/actor/getProfiles.ts b/packages/bsky/src/api/app/bsky/actor/getProfiles.ts
index 3328bda7ad2..9f7eb8b5ef2 100644
--- a/packages/bsky/src/api/app/bsky/actor/getProfiles.ts
+++ b/packages/bsky/src/api/app/bsky/actor/getProfiles.ts
@@ -1,16 +1,16 @@
 import { mapDefined } from '@atproto/common'
-import { Server } from '../../../../lexicon'
-import { QueryParams } from '../../../../lexicon/types/app/bsky/actor/getProfiles'
-import AppContext from '../../../../context'
-import { resHeaders } from '../../../util'
-import { createPipeline, noRules } from '../../../../pipeline'
+import { AppContext } from '../../../../context'
 import {
   HydrateCtx,
   HydrationState,
   Hydrator,
 } from '../../../../hydration/hydrator'
-import { Views } from '../../../../views'
+import { Server } from '../../../../lexicon'
 import { ids } from '../../../../lexicon/lexicons'
+import { QueryParams } from '../../../../lexicon/types/app/bsky/actor/getProfiles'
+import { createPipeline, noRules } from '../../../../pipeline'
+import { Views } from '../../../../views'
+import { resHeaders } from '../../../util'
 
 export default function (server: Server, ctx: AppContext) {
   const getProfile = createPipeline(skeleton, hydration, noRules, presentation)
diff --git a/packages/bsky/src/api/app/bsky/actor/getSuggestions.ts b/packages/bsky/src/api/app/bsky/actor/getSuggestions.ts
index 4af0927feed..b6f29a2ac25 100644
--- a/packages/bsky/src/api/app/bsky/actor/getSuggestions.ts
+++ b/packages/bsky/src/api/app/bsky/actor/getSuggestions.ts
@@ -1,18 +1,18 @@
-import { mapDefined, noUndefinedVals } from '@atproto/common'
 import { AtpAgent } from '@atproto/api'
+import { mapDefined, noUndefinedVals } from '@atproto/common'
 import { HeadersMap } from '@atproto/xrpc'
-import AppContext from '../../../../context'
-import { Server } from '../../../../lexicon'
-import { QueryParams } from '../../../../lexicon/types/app/bsky/actor/getSuggestions'
-import { createPipeline } from '../../../../pipeline'
+import { AppContext } from '../../../../context'
+import { DataPlaneClient } from '../../../../data-plane'
 import {
   HydrateCtx,
   HydrationState,
   Hydrator,
 } from '../../../../hydration/hydrator'
-import { Views } from '../../../../views'
-import { DataPlaneClient } from '../../../../data-plane'
 import { parseString } from '../../../../hydration/util'
+import { Server } from '../../../../lexicon'
+import { QueryParams } from '../../../../lexicon/types/app/bsky/actor/getSuggestions'
+import { createPipeline } from '../../../../pipeline'
+import { Views } from '../../../../views'
 import { resHeaders } from '../../../util'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/bsky/src/api/app/bsky/actor/searchActors.ts b/packages/bsky/src/api/app/bsky/actor/searchActors.ts
index 9e0d944e706..88dc6213cdb 100644
--- a/packages/bsky/src/api/app/bsky/actor/searchActors.ts
+++ b/packages/bsky/src/api/app/bsky/actor/searchActors.ts
@@ -1,7 +1,10 @@
-import AppContext from '../../../../context'
-import { Server } from '../../../../lexicon'
-import { mapDefined } from '@atproto/common'
 import { AtpAgent } from '@atproto/api'
+import { mapDefined } from '@atproto/common'
+import { AppContext } from '../../../../context'
+import { DataPlaneClient } from '../../../../data-plane'
+import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
+import { parseString } from '../../../../hydration/util'
+import { Server } from '../../../../lexicon'
 import { QueryParams } from '../../../../lexicon/types/app/bsky/actor/searchActors'
 import {
   HydrationFnInput,
@@ -10,10 +13,7 @@ import {
   SkeletonFnInput,
   createPipeline,
 } from '../../../../pipeline'
-import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
 import { Views } from '../../../../views'
-import { DataPlaneClient } from '../../../../data-plane'
-import { parseString } from '../../../../hydration/util'
 import { resHeaders } from '../../../util'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/bsky/src/api/app/bsky/actor/searchActorsTypeahead.ts b/packages/bsky/src/api/app/bsky/actor/searchActorsTypeahead.ts
index e5fbe0e3291..1808833d99f 100644
--- a/packages/bsky/src/api/app/bsky/actor/searchActorsTypeahead.ts
+++ b/packages/bsky/src/api/app/bsky/actor/searchActorsTypeahead.ts
@@ -1,7 +1,10 @@
-import AppContext from '../../../../context'
-import { Server } from '../../../../lexicon'
 import { AtpAgent } from '@atproto/api'
 import { mapDefined } from '@atproto/common'
+import { AppContext } from '../../../../context'
+import { DataPlaneClient } from '../../../../data-plane'
+import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
+import { parseString } from '../../../../hydration/util'
+import { Server } from '../../../../lexicon'
 import { QueryParams } from '../../../../lexicon/types/app/bsky/actor/searchActorsTypeahead'
 import {
   HydrationFnInput,
@@ -10,10 +13,7 @@ import {
   SkeletonFnInput,
   createPipeline,
 } from '../../../../pipeline'
-import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
 import { Views } from '../../../../views'
-import { DataPlaneClient } from '../../../../data-plane'
-import { parseString } from '../../../../hydration/util'
 import { resHeaders } from '../../../util'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/bsky/src/api/app/bsky/feed/getActorFeeds.ts b/packages/bsky/src/api/app/bsky/feed/getActorFeeds.ts
index 55624324aad..b71bead2d9e 100644
--- a/packages/bsky/src/api/app/bsky/feed/getActorFeeds.ts
+++ b/packages/bsky/src/api/app/bsky/feed/getActorFeeds.ts
@@ -1,17 +1,17 @@
-import { InvalidRequestError } from '@atproto/xrpc-server'
 import { mapDefined } from '@atproto/common'
-import { Server } from '../../../../lexicon'
-import { QueryParams } from '../../../../lexicon/types/app/bsky/feed/getActorFeeds'
-import AppContext from '../../../../context'
-import { createPipeline, noRules } from '../../../../pipeline'
+import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
+import { DataPlaneClient } from '../../../../data-plane'
 import {
   HydrateCtx,
   HydrationState,
   Hydrator,
 } from '../../../../hydration/hydrator'
-import { Views } from '../../../../views'
-import { DataPlaneClient } from '../../../../data-plane'
 import { parseString } from '../../../../hydration/util'
+import { Server } from '../../../../lexicon'
+import { QueryParams } from '../../../../lexicon/types/app/bsky/feed/getActorFeeds'
+import { createPipeline, noRules } from '../../../../pipeline'
+import { Views } from '../../../../views'
 import { clearlyBadCursor, resHeaders } from '../../../util'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/bsky/src/api/app/bsky/feed/getActorLikes.ts b/packages/bsky/src/api/app/bsky/feed/getActorLikes.ts
index 897a1c25149..1c83ddccab2 100644
--- a/packages/bsky/src/api/app/bsky/feed/getActorLikes.ts
+++ b/packages/bsky/src/api/app/bsky/feed/getActorLikes.ts
@@ -1,20 +1,20 @@
-import { InvalidRequestError } from '@atproto/xrpc-server'
 import { mapDefined } from '@atproto/common'
-import { Server } from '../../../../lexicon'
-import { QueryParams } from '../../../../lexicon/types/app/bsky/feed/getActorLikes'
-import AppContext from '../../../../context'
-import { clearlyBadCursor, resHeaders } from '../../../util'
-import { createPipeline } from '../../../../pipeline'
+import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
+import { DataPlaneClient } from '../../../../data-plane'
+import { FeedItem } from '../../../../hydration/feed'
 import {
   HydrateCtx,
   HydrationState,
   Hydrator,
 } from '../../../../hydration/hydrator'
-import { Views } from '../../../../views'
-import { DataPlaneClient } from '../../../../data-plane'
 import { parseString } from '../../../../hydration/util'
+import { Server } from '../../../../lexicon'
+import { QueryParams } from '../../../../lexicon/types/app/bsky/feed/getActorLikes'
+import { createPipeline } from '../../../../pipeline'
 import { uriToDid as creatorFromUri } from '../../../../util/uris'
-import { FeedItem } from '../../../../hydration/feed'
+import { Views } from '../../../../views'
+import { clearlyBadCursor, resHeaders } from '../../../util'
 
 export default function (server: Server, ctx: AppContext) {
   const getActorLikes = createPipeline(
diff --git a/packages/bsky/src/api/app/bsky/feed/getAuthorFeed.ts b/packages/bsky/src/api/app/bsky/feed/getAuthorFeed.ts
index d0804bde221..61ba783196f 100644
--- a/packages/bsky/src/api/app/bsky/feed/getAuthorFeed.ts
+++ b/packages/bsky/src/api/app/bsky/feed/getAuthorFeed.ts
@@ -1,23 +1,23 @@
 import { mapDefined } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { Server } from '../../../../lexicon'
-import { QueryParams } from '../../../../lexicon/types/app/bsky/feed/getAuthorFeed'
-import AppContext from '../../../../context'
-import { clearlyBadCursor, resHeaders } from '../../../util'
-import { createPipeline } from '../../../../pipeline'
+import { AppContext } from '../../../../context'
+import { DataPlaneClient } from '../../../../data-plane'
+import { Actor } from '../../../../hydration/actor'
+import { FeedItem, Post } from '../../../../hydration/feed'
 import {
   HydrateCtx,
   HydrationState,
   Hydrator,
   mergeStates,
 } from '../../../../hydration/hydrator'
-import { Views } from '../../../../views'
-import { DataPlaneClient } from '../../../../data-plane'
 import { parseString } from '../../../../hydration/util'
-import { safePinnedPost, uriToDid } from '../../../../util/uris'
-import { Actor } from '../../../../hydration/actor'
-import { FeedItem, Post } from '../../../../hydration/feed'
+import { Server } from '../../../../lexicon'
+import { QueryParams } from '../../../../lexicon/types/app/bsky/feed/getAuthorFeed'
+import { createPipeline } from '../../../../pipeline'
 import { FeedType } from '../../../../proto/bsky_pb'
+import { safePinnedPost, uriToDid } from '../../../../util/uris'
+import { Views } from '../../../../views'
+import { clearlyBadCursor, resHeaders } from '../../../util'
 
 export default function (server: Server, ctx: AppContext) {
   const getAuthorFeed = createPipeline(
diff --git a/packages/bsky/src/api/app/bsky/feed/getFeed.ts b/packages/bsky/src/api/app/bsky/feed/getFeed.ts
index decd4a045fd..e61ac0e9474 100644
--- a/packages/bsky/src/api/app/bsky/feed/getFeed.ts
+++ b/packages/bsky/src/api/app/bsky/feed/getFeed.ts
@@ -1,17 +1,25 @@
-import { mapDefined } from '@atproto/common'
+import { AppBskyFeedGetFeedSkeleton, AtpAgent } from '@atproto/api'
+import { mapDefined, noUndefinedVals } from '@atproto/common'
+import { ResponseType, XRPCError } from '@atproto/xrpc'
 import {
   InvalidRequestError,
-  UpstreamFailureError,
   ServerTimer,
+  UpstreamFailureError,
   serverTimingHeader,
 } from '@atproto/xrpc-server'
-import { ResponseType, XRPCError } from '@atproto/xrpc'
-import { AtpAgent, AppBskyFeedGetFeedSkeleton } from '@atproto/api'
-import { noUndefinedVals } from '@atproto/common'
+import { AppContext } from '../../../../context'
+import {
+  Code,
+  getServiceEndpoint,
+  isDataplaneError,
+  unpackIdentityServices,
+} from '../../../../data-plane'
+import { FeedItem } from '../../../../hydration/feed'
+import { HydrateCtx } from '../../../../hydration/hydrator'
+import { Server } from '../../../../lexicon'
+import { ids } from '../../../../lexicon/lexicons'
 import { QueryParams as GetFeedParams } from '../../../../lexicon/types/app/bsky/feed/getFeed'
 import { OutputSchema as SkeletonOutput } from '../../../../lexicon/types/app/bsky/feed/getFeedSkeleton'
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import {
   HydrationFnInput,
   PresentationFnInput,
@@ -19,17 +27,8 @@ import {
   SkeletonFnInput,
   createPipeline,
 } from '../../../../pipeline'
-import { HydrateCtx } from '../../../../hydration/hydrator'
-import { FeedItem } from '../../../../hydration/feed'
 import { GetIdentityByDidResponse } from '../../../../proto/bsky_pb'
-import {
-  Code,
-  getServiceEndpoint,
-  isDataplaneError,
-  unpackIdentityServices,
-} from '../../../../data-plane'
 import { BSKY_USER_AGENT, resHeaders } from '../../../util'
-import { ids } from '../../../../lexicon/lexicons'
 
 export default function (server: Server, ctx: AppContext) {
   const getFeed = createPipeline(
diff --git a/packages/bsky/src/api/app/bsky/feed/getFeedGenerator.ts b/packages/bsky/src/api/app/bsky/feed/getFeedGenerator.ts
index 647bfdd090b..12ce1d4dc5c 100644
--- a/packages/bsky/src/api/app/bsky/feed/getFeedGenerator.ts
+++ b/packages/bsky/src/api/app/bsky/feed/getFeedGenerator.ts
@@ -1,13 +1,13 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
-import { GetIdentityByDidResponse } from '../../../../proto/bsky_pb'
+import { AppContext } from '../../../../context'
 import {
   Code,
   getServiceEndpoint,
   isDataplaneError,
   unpackIdentityServices,
 } from '../../../../data-plane'
+import { Server } from '../../../../lexicon'
+import { GetIdentityByDidResponse } from '../../../../proto/bsky_pb'
 import { resHeaders } from '../../../util'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/bsky/src/api/app/bsky/feed/getFeedGenerators.ts b/packages/bsky/src/api/app/bsky/feed/getFeedGenerators.ts
index 9bf3eaf267d..9f8dea404a9 100644
--- a/packages/bsky/src/api/app/bsky/feed/getFeedGenerators.ts
+++ b/packages/bsky/src/api/app/bsky/feed/getFeedGenerators.ts
@@ -1,13 +1,13 @@
 import { mapDefined } from '@atproto/common'
-import { Server } from '../../../../lexicon'
-import { QueryParams } from '../../../../lexicon/types/app/bsky/feed/getFeedGenerators'
-import AppContext from '../../../../context'
-import { createPipeline, noRules } from '../../../../pipeline'
+import { AppContext } from '../../../../context'
 import {
   HydrateCtx,
   HydrationState,
   Hydrator,
 } from '../../../../hydration/hydrator'
+import { Server } from '../../../../lexicon'
+import { QueryParams } from '../../../../lexicon/types/app/bsky/feed/getFeedGenerators'
+import { createPipeline, noRules } from '../../../../pipeline'
 import { Views } from '../../../../views'
 import { resHeaders } from '../../../util'
 
diff --git a/packages/bsky/src/api/app/bsky/feed/getLikes.ts b/packages/bsky/src/api/app/bsky/feed/getLikes.ts
index e99630452ab..4e09bf00f00 100644
--- a/packages/bsky/src/api/app/bsky/feed/getLikes.ts
+++ b/packages/bsky/src/api/app/bsky/feed/getLikes.ts
@@ -1,20 +1,19 @@
 import { mapDefined } from '@atproto/common'
 import { normalizeDatetimeAlways } from '@atproto/syntax'
-import { Server } from '../../../../lexicon'
-import { QueryParams } from '../../../../lexicon/types/app/bsky/feed/getLikes'
-import AppContext from '../../../../context'
-import { createPipeline, RulesFnInput } from '../../../../pipeline'
+import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import {
   HydrateCtx,
   HydrationState,
   Hydrator,
-  mergeStates,
 } from '../../../../hydration/hydrator'
-import { Views } from '../../../../views'
 import { parseString } from '../../../../hydration/util'
+import { Server } from '../../../../lexicon'
+import { QueryParams } from '../../../../lexicon/types/app/bsky/feed/getLikes'
+import { RulesFnInput, createPipeline } from '../../../../pipeline'
 import { uriToDid as creatorFromUri } from '../../../../util/uris'
+import { Views } from '../../../../views'
 import { clearlyBadCursor, resHeaders } from '../../../util'
-import { InvalidRequestError } from '@atproto/xrpc-server'
 
 export default function (server: Server, ctx: AppContext) {
   const getLikes = createPipeline(skeleton, hydration, noBlocks, presentation)
diff --git a/packages/bsky/src/api/app/bsky/feed/getListFeed.ts b/packages/bsky/src/api/app/bsky/feed/getListFeed.ts
index 7d30f3ac67c..e750350aba4 100644
--- a/packages/bsky/src/api/app/bsky/feed/getListFeed.ts
+++ b/packages/bsky/src/api/app/bsky/feed/getListFeed.ts
@@ -1,20 +1,20 @@
-import { Server } from '../../../../lexicon'
-import { QueryParams } from '../../../../lexicon/types/app/bsky/feed/getListFeed'
-import AppContext from '../../../../context'
-import { clearlyBadCursor, resHeaders } from '../../../util'
-import { createPipeline } from '../../../../pipeline'
+import { mapDefined } from '@atproto/common'
+import { AppContext } from '../../../../context'
+import { DataPlaneClient } from '../../../../data-plane'
+import { FeedItem } from '../../../../hydration/feed'
 import {
   HydrateCtx,
   HydrationState,
   Hydrator,
   mergeStates,
 } from '../../../../hydration/hydrator'
-import { Views } from '../../../../views'
-import { DataPlaneClient } from '../../../../data-plane'
-import { mapDefined } from '@atproto/common'
 import { parseString } from '../../../../hydration/util'
-import { FeedItem } from '../../../../hydration/feed'
+import { Server } from '../../../../lexicon'
+import { QueryParams } from '../../../../lexicon/types/app/bsky/feed/getListFeed'
+import { createPipeline } from '../../../../pipeline'
 import { uriToDid } from '../../../../util/uris'
+import { Views } from '../../../../views'
+import { clearlyBadCursor, resHeaders } from '../../../util'
 
 export default function (server: Server, ctx: AppContext) {
   const getListFeed = createPipeline(
diff --git a/packages/bsky/src/api/app/bsky/feed/getPostThread.ts b/packages/bsky/src/api/app/bsky/feed/getPostThread.ts
index e15f91aa617..5b6613b72b4 100644
--- a/packages/bsky/src/api/app/bsky/feed/getPostThread.ts
+++ b/packages/bsky/src/api/app/bsky/feed/getPostThread.ts
@@ -1,12 +1,14 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { ServerConfig } from '../../../../config'
+import { AppContext } from '../../../../context'
+import { Code, DataPlaneClient, isDataplaneError } from '../../../../data-plane'
+import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
 import { Server } from '../../../../lexicon'
 import { isNotFoundPost } from '../../../../lexicon/types/app/bsky/feed/defs'
 import {
-  QueryParams,
   OutputSchema,
+  QueryParams,
 } from '../../../../lexicon/types/app/bsky/feed/getPostThread'
-import AppContext from '../../../../context'
-import { ATPROTO_REPO_REV, resHeaders } from '../../../util'
 import {
   HydrationFnInput,
   PresentationFnInput,
@@ -14,11 +16,9 @@ import {
   createPipeline,
   noRules,
 } from '../../../../pipeline'
-import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
-import { Views } from '../../../../views'
-import { DataPlaneClient, isDataplaneError, Code } from '../../../../data-plane'
 import { postUriToThreadgateUri } from '../../../../util/uris'
-import { ServerConfig } from '../../../../config'
+import { Views } from '../../../../views'
+import { ATPROTO_REPO_REV, resHeaders } from '../../../util'
 
 export default function (server: Server, ctx: AppContext) {
   const getPostThread = createPipeline(
diff --git a/packages/bsky/src/api/app/bsky/feed/getPosts.ts b/packages/bsky/src/api/app/bsky/feed/getPosts.ts
index 86fa1cc3d72..6b441631054 100644
--- a/packages/bsky/src/api/app/bsky/feed/getPosts.ts
+++ b/packages/bsky/src/api/app/bsky/feed/getPosts.ts
@@ -1,17 +1,17 @@
 import { dedupeStrs, mapDefined } from '@atproto/common'
-import { Server } from '../../../../lexicon'
-import { QueryParams } from '../../../../lexicon/types/app/bsky/feed/getPosts'
-import AppContext from '../../../../context'
-import { createPipeline } from '../../../../pipeline'
+import { AppContext } from '../../../../context'
 import {
   HydrateCtx,
   HydrationState,
   Hydrator,
 } from '../../../../hydration/hydrator'
-import { Views } from '../../../../views'
+import { Server } from '../../../../lexicon'
+import { ids } from '../../../../lexicon/lexicons'
+import { QueryParams } from '../../../../lexicon/types/app/bsky/feed/getPosts'
+import { createPipeline } from '../../../../pipeline'
 import { uriToDid as creatorFromUri } from '../../../../util/uris'
+import { Views } from '../../../../views'
 import { resHeaders } from '../../../util'
-import { ids } from '../../../../lexicon/lexicons'
 
 export default function (server: Server, ctx: AppContext) {
   const getPosts = createPipeline(skeleton, hydration, noBlocks, presentation)
diff --git a/packages/bsky/src/api/app/bsky/feed/getQuotes.ts b/packages/bsky/src/api/app/bsky/feed/getQuotes.ts
index 630f02d5dd1..d7c7f95d3dc 100644
--- a/packages/bsky/src/api/app/bsky/feed/getQuotes.ts
+++ b/packages/bsky/src/api/app/bsky/feed/getQuotes.ts
@@ -1,17 +1,17 @@
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
-import { createPipeline } from '../../../../pipeline'
-import { clearlyBadCursor, resHeaders } from '../../../util'
+import { mapDefined } from '@atproto/common'
+import { AppContext } from '../../../../context'
 import {
   HydrateCtx,
   HydrationState,
   Hydrator,
 } from '../../../../hydration/hydrator'
-import { Views } from '../../../../views'
-import { mapDefined } from '@atproto/common'
-import { QueryParams } from '../../../../lexicon/types/app/bsky/feed/getQuotes'
 import { parseString } from '../../../../hydration/util'
+import { Server } from '../../../../lexicon'
+import { QueryParams } from '../../../../lexicon/types/app/bsky/feed/getQuotes'
+import { createPipeline } from '../../../../pipeline'
 import { uriToDid } from '../../../../util/uris'
+import { Views } from '../../../../views'
+import { clearlyBadCursor, resHeaders } from '../../../util'
 
 export default function (server: Server, ctx: AppContext) {
   const getQuotes = createPipeline(
diff --git a/packages/bsky/src/api/app/bsky/feed/getRepostedBy.ts b/packages/bsky/src/api/app/bsky/feed/getRepostedBy.ts
index 6055c55798d..cf514bbf84b 100644
--- a/packages/bsky/src/api/app/bsky/feed/getRepostedBy.ts
+++ b/packages/bsky/src/api/app/bsky/feed/getRepostedBy.ts
@@ -1,16 +1,16 @@
 import { mapDefined } from '@atproto/common'
-import { Server } from '../../../../lexicon'
-import { QueryParams } from '../../../../lexicon/types/app/bsky/feed/getRepostedBy'
-import AppContext from '../../../../context'
-import { createPipeline } from '../../../../pipeline'
+import { AppContext } from '../../../../context'
 import {
   HydrateCtx,
   HydrationState,
   Hydrator,
 } from '../../../../hydration/hydrator'
-import { Views } from '../../../../views'
 import { parseString } from '../../../../hydration/util'
+import { Server } from '../../../../lexicon'
+import { QueryParams } from '../../../../lexicon/types/app/bsky/feed/getRepostedBy'
+import { createPipeline } from '../../../../pipeline'
 import { uriToDid as creatorFromUri } from '../../../../util/uris'
+import { Views } from '../../../../views'
 import { clearlyBadCursor, resHeaders } from '../../../util'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/bsky/src/api/app/bsky/feed/getSuggestedFeeds.ts b/packages/bsky/src/api/app/bsky/feed/getSuggestedFeeds.ts
index ad13b3a0a31..17e91c5449c 100644
--- a/packages/bsky/src/api/app/bsky/feed/getSuggestedFeeds.ts
+++ b/packages/bsky/src/api/app/bsky/feed/getSuggestedFeeds.ts
@@ -1,7 +1,7 @@
 import { mapDefined } from '@atproto/common'
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { parseString } from '../../../../hydration/util'
+import { Server } from '../../../../lexicon'
 import { resHeaders } from '../../../util'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/bsky/src/api/app/bsky/feed/getTimeline.ts b/packages/bsky/src/api/app/bsky/feed/getTimeline.ts
index 37f1b601b0b..31930e9995e 100644
--- a/packages/bsky/src/api/app/bsky/feed/getTimeline.ts
+++ b/packages/bsky/src/api/app/bsky/feed/getTimeline.ts
@@ -1,18 +1,18 @@
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
-import { QueryParams } from '../../../../lexicon/types/app/bsky/feed/getTimeline'
-import { clearlyBadCursor, resHeaders } from '../../../util'
-import { createPipeline } from '../../../../pipeline'
+import { mapDefined } from '@atproto/common'
+import { AppContext } from '../../../../context'
+import { DataPlaneClient } from '../../../../data-plane'
+import { FeedItem } from '../../../../hydration/feed'
 import {
   HydrateCtx,
   HydrationState,
   Hydrator,
 } from '../../../../hydration/hydrator'
-import { Views } from '../../../../views'
-import { DataPlaneClient } from '../../../../data-plane'
 import { parseString } from '../../../../hydration/util'
-import { mapDefined } from '@atproto/common'
-import { FeedItem } from '../../../../hydration/feed'
+import { Server } from '../../../../lexicon'
+import { QueryParams } from '../../../../lexicon/types/app/bsky/feed/getTimeline'
+import { createPipeline } from '../../../../pipeline'
+import { Views } from '../../../../views'
+import { clearlyBadCursor, resHeaders } from '../../../util'
 
 export default function (server: Server, ctx: AppContext) {
   const getTimeline = createPipeline(
diff --git a/packages/bsky/src/api/app/bsky/feed/searchPosts.ts b/packages/bsky/src/api/app/bsky/feed/searchPosts.ts
index 853c5453032..d0d31951820 100644
--- a/packages/bsky/src/api/app/bsky/feed/searchPosts.ts
+++ b/packages/bsky/src/api/app/bsky/feed/searchPosts.ts
@@ -1,7 +1,10 @@
-import AppContext from '../../../../context'
-import { Server } from '../../../../lexicon'
 import { AtpAgent } from '@atproto/api'
 import { mapDefined } from '@atproto/common'
+import { AppContext } from '../../../../context'
+import { DataPlaneClient } from '../../../../data-plane'
+import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
+import { parseString } from '../../../../hydration/util'
+import { Server } from '../../../../lexicon'
 import { QueryParams } from '../../../../lexicon/types/app/bsky/feed/searchPosts'
 import {
   HydrationFnInput,
@@ -10,11 +13,8 @@ import {
   SkeletonFnInput,
   createPipeline,
 } from '../../../../pipeline'
-import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
-import { Views } from '../../../../views'
-import { DataPlaneClient } from '../../../../data-plane'
-import { parseString } from '../../../../hydration/util'
 import { uriToDid as creatorFromUri } from '../../../../util/uris'
+import { Views } from '../../../../views'
 import { resHeaders } from '../../../util'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/bsky/src/api/app/bsky/graph/getActorStarterPacks.ts b/packages/bsky/src/api/app/bsky/graph/getActorStarterPacks.ts
index e56efe17a3f..744297b9726 100644
--- a/packages/bsky/src/api/app/bsky/graph/getActorStarterPacks.ts
+++ b/packages/bsky/src/api/app/bsky/graph/getActorStarterPacks.ts
@@ -1,20 +1,20 @@
+import { mapDefined } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
+import { DataPlaneClient } from '../../../../data-plane'
+import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
+import { parseString } from '../../../../hydration/util'
 import { Server } from '../../../../lexicon'
 import { QueryParams } from '../../../../lexicon/types/app/bsky/graph/getActorStarterPacks'
-import AppContext from '../../../../context'
 import {
-  createPipeline,
   HydrationFnInput,
-  noRules,
   PresentationFnInput,
   SkeletonFnInput,
+  createPipeline,
+  noRules,
 } from '../../../../pipeline'
-import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
 import { Views } from '../../../../views'
 import { resHeaders } from '../../../util'
-import { DataPlaneClient } from '../../../../data-plane'
-import { parseString } from '../../../../hydration/util'
-import { mapDefined } from '@atproto/common'
 
 export default function (server: Server, ctx: AppContext) {
   const getActorStarterPacks = createPipeline(
diff --git a/packages/bsky/src/api/app/bsky/graph/getBlocks.ts b/packages/bsky/src/api/app/bsky/graph/getBlocks.ts
index 3042b07ed13..bed8610babd 100644
--- a/packages/bsky/src/api/app/bsky/graph/getBlocks.ts
+++ b/packages/bsky/src/api/app/bsky/graph/getBlocks.ts
@@ -1,15 +1,15 @@
 import { mapDefined } from '@atproto/common'
+import { AppContext } from '../../../../context'
+import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
 import { Server } from '../../../../lexicon'
 import { QueryParams } from '../../../../lexicon/types/app/bsky/graph/getBlocks'
-import AppContext from '../../../../context'
 import {
-  createPipeline,
   HydrationFnInput,
-  noRules,
   PresentationFnInput,
   SkeletonFnInput,
+  createPipeline,
+  noRules,
 } from '../../../../pipeline'
-import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
 import { Views } from '../../../../views'
 import { clearlyBadCursor, resHeaders } from '../../../util'
 
diff --git a/packages/bsky/src/api/app/bsky/graph/getFollowers.ts b/packages/bsky/src/api/app/bsky/graph/getFollowers.ts
index 76a501a3c6e..80594ab1665 100644
--- a/packages/bsky/src/api/app/bsky/graph/getFollowers.ts
+++ b/packages/bsky/src/api/app/bsky/graph/getFollowers.ts
@@ -1,8 +1,13 @@
 import { mapDefined } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
+import {
+  HydrateCtx,
+  Hydrator,
+  mergeStates,
+} from '../../../../hydration/hydrator'
 import { Server } from '../../../../lexicon'
 import { QueryParams } from '../../../../lexicon/types/app/bsky/graph/getFollowers'
-import AppContext from '../../../../context'
 import {
   HydrationFnInput,
   PresentationFnInput,
@@ -11,11 +16,6 @@ import {
   createPipeline,
 } from '../../../../pipeline'
 import { uriToDid as didFromUri } from '../../../../util/uris'
-import {
-  HydrateCtx,
-  Hydrator,
-  mergeStates,
-} from '../../../../hydration/hydrator'
 import { Views } from '../../../../views'
 import { clearlyBadCursor, resHeaders } from '../../../util'
 
diff --git a/packages/bsky/src/api/app/bsky/graph/getFollows.ts b/packages/bsky/src/api/app/bsky/graph/getFollows.ts
index 94aac9cdbcb..46bf7af6677 100644
--- a/packages/bsky/src/api/app/bsky/graph/getFollows.ts
+++ b/packages/bsky/src/api/app/bsky/graph/getFollows.ts
@@ -1,8 +1,13 @@
 import { mapDefined } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
+import {
+  HydrateCtx,
+  Hydrator,
+  mergeStates,
+} from '../../../../hydration/hydrator'
 import { Server } from '../../../../lexicon'
 import { QueryParams } from '../../../../lexicon/types/app/bsky/graph/getFollowers'
-import AppContext from '../../../../context'
 import {
   HydrationFnInput,
   PresentationFnInput,
@@ -10,11 +15,6 @@ import {
   SkeletonFnInput,
   createPipeline,
 } from '../../../../pipeline'
-import {
-  HydrateCtx,
-  Hydrator,
-  mergeStates,
-} from '../../../../hydration/hydrator'
 import { Views } from '../../../../views'
 import { clearlyBadCursor, resHeaders } from '../../../util'
 
diff --git a/packages/bsky/src/api/app/bsky/graph/getKnownFollowers.ts b/packages/bsky/src/api/app/bsky/graph/getKnownFollowers.ts
index 71501ba2344..b314e0a1dad 100644
--- a/packages/bsky/src/api/app/bsky/graph/getKnownFollowers.ts
+++ b/packages/bsky/src/api/app/bsky/graph/getKnownFollowers.ts
@@ -1,8 +1,9 @@
 import { mapDefined } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
+import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
 import { Server } from '../../../../lexicon'
 import { QueryParams } from '../../../../lexicon/types/app/bsky/graph/getKnownFollowers'
-import AppContext from '../../../../context'
 import {
   HydrationFnInput,
   PresentationFnInput,
@@ -10,7 +11,6 @@ import {
   SkeletonFnInput,
   createPipeline,
 } from '../../../../pipeline'
-import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
 import { Views } from '../../../../views'
 import { clearlyBadCursor, resHeaders } from '../../../util'
 
diff --git a/packages/bsky/src/api/app/bsky/graph/getList.ts b/packages/bsky/src/api/app/bsky/graph/getList.ts
index 995bc294c6e..e009637c489 100644
--- a/packages/bsky/src/api/app/bsky/graph/getList.ts
+++ b/packages/bsky/src/api/app/bsky/graph/getList.ts
@@ -1,25 +1,25 @@
 import { mapDefined } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
+import {
+  HydrateCtx,
+  HydrationState,
+  Hydrator,
+  mergeManyStates,
+} from '../../../../hydration/hydrator'
 import { Server } from '../../../../lexicon'
 import { QueryParams } from '../../../../lexicon/types/app/bsky/graph/getList'
-import AppContext from '../../../../context'
 import {
-  createPipeline,
   HydrationFnInput,
   PresentationFnInput,
   RulesFnInput,
   SkeletonFnInput,
+  createPipeline,
 } from '../../../../pipeline'
-import {
-  HydrateCtx,
-  HydrationState,
-  Hydrator,
-  mergeManyStates,
-} from '../../../../hydration/hydrator'
-import { Views } from '../../../../views'
-import { clearlyBadCursor, resHeaders } from '../../../util'
 import { ListItemInfo } from '../../../../proto/bsky_pb'
 import { uriToDid as didFromUri } from '../../../../util/uris'
+import { Views } from '../../../../views'
+import { clearlyBadCursor, resHeaders } from '../../../util'
 
 export default function (server: Server, ctx: AppContext) {
   const getList = createPipeline(skeleton, hydration, noBlocks, presentation)
diff --git a/packages/bsky/src/api/app/bsky/graph/getListBlocks.ts b/packages/bsky/src/api/app/bsky/graph/getListBlocks.ts
index 89f79edbb8f..70fd3c9b4a2 100644
--- a/packages/bsky/src/api/app/bsky/graph/getListBlocks.ts
+++ b/packages/bsky/src/api/app/bsky/graph/getListBlocks.ts
@@ -1,15 +1,15 @@
 import { mapDefined } from '@atproto/common'
+import { AppContext } from '../../../../context'
+import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
 import { Server } from '../../../../lexicon'
 import { QueryParams } from '../../../../lexicon/types/app/bsky/graph/getListBlocks'
-import AppContext from '../../../../context'
 import {
-  createPipeline,
   HydrationFnInput,
-  noRules,
   PresentationFnInput,
   SkeletonFnInput,
+  createPipeline,
+  noRules,
 } from '../../../../pipeline'
-import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
 import { Views } from '../../../../views'
 import { clearlyBadCursor, resHeaders } from '../../../util'
 
diff --git a/packages/bsky/src/api/app/bsky/graph/getListMutes.ts b/packages/bsky/src/api/app/bsky/graph/getListMutes.ts
index fbd62c215c7..61f951d06d2 100644
--- a/packages/bsky/src/api/app/bsky/graph/getListMutes.ts
+++ b/packages/bsky/src/api/app/bsky/graph/getListMutes.ts
@@ -1,15 +1,15 @@
 import { mapDefined } from '@atproto/common'
+import { AppContext } from '../../../../context'
+import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
 import { Server } from '../../../../lexicon'
 import { QueryParams } from '../../../../lexicon/types/app/bsky/graph/getListBlocks'
-import AppContext from '../../../../context'
 import {
-  createPipeline,
   HydrationFnInput,
-  noRules,
   PresentationFnInput,
   SkeletonFnInput,
+  createPipeline,
+  noRules,
 } from '../../../../pipeline'
-import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
 import { Views } from '../../../../views'
 import { clearlyBadCursor, resHeaders } from '../../../util'
 
diff --git a/packages/bsky/src/api/app/bsky/graph/getLists.ts b/packages/bsky/src/api/app/bsky/graph/getLists.ts
index 31d241710c2..e913658a9ba 100644
--- a/packages/bsky/src/api/app/bsky/graph/getLists.ts
+++ b/packages/bsky/src/api/app/bsky/graph/getLists.ts
@@ -1,17 +1,17 @@
 import { mapDefined } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
+import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
 import { Server } from '../../../../lexicon'
-import { QueryParams } from '../../../../lexicon/types/app/bsky/graph/getLists'
 import { REFERENCELIST } from '../../../../lexicon/types/app/bsky/graph/defs'
-import AppContext from '../../../../context'
+import { QueryParams } from '../../../../lexicon/types/app/bsky/graph/getLists'
 import {
-  createPipeline,
   HydrationFnInput,
   PresentationFnInput,
   RulesFnInput,
   SkeletonFnInput,
+  createPipeline,
 } from '../../../../pipeline'
-import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
 import { Views } from '../../../../views'
 import { clearlyBadCursor, resHeaders } from '../../../util'
 
diff --git a/packages/bsky/src/api/app/bsky/graph/getMutes.ts b/packages/bsky/src/api/app/bsky/graph/getMutes.ts
index 1f417c32b39..c28671ad716 100644
--- a/packages/bsky/src/api/app/bsky/graph/getMutes.ts
+++ b/packages/bsky/src/api/app/bsky/graph/getMutes.ts
@@ -1,9 +1,8 @@
 import { mapDefined } from '@atproto/common'
+import { AppContext } from '../../../../context'
+import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
 import { Server } from '../../../../lexicon'
 import { QueryParams } from '../../../../lexicon/types/app/bsky/graph/getMutes'
-import AppContext from '../../../../context'
-import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
-import { Views } from '../../../../views'
 import {
   HydrationFnInput,
   PresentationFnInput,
@@ -11,6 +10,7 @@ import {
   createPipeline,
   noRules,
 } from '../../../../pipeline'
+import { Views } from '../../../../views'
 import { clearlyBadCursor, resHeaders } from '../../../util'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/bsky/src/api/app/bsky/graph/getRelationships.ts b/packages/bsky/src/api/app/bsky/graph/getRelationships.ts
index 47aaa6cd083..b311ac918a9 100644
--- a/packages/bsky/src/api/app/bsky/graph/getRelationships.ts
+++ b/packages/bsky/src/api/app/bsky/graph/getRelationships.ts
@@ -1,5 +1,5 @@
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.app.bsky.graph.getRelationships({
diff --git a/packages/bsky/src/api/app/bsky/graph/getStarterPack.ts b/packages/bsky/src/api/app/bsky/graph/getStarterPack.ts
index 770f79294ff..8832bfd5f38 100644
--- a/packages/bsky/src/api/app/bsky/graph/getStarterPack.ts
+++ b/packages/bsky/src/api/app/bsky/graph/getStarterPack.ts
@@ -1,15 +1,15 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
+import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
 import { Server } from '../../../../lexicon'
 import { QueryParams } from '../../../../lexicon/types/app/bsky/graph/getStarterPack'
-import AppContext from '../../../../context'
 import {
-  createPipeline,
   HydrationFnInput,
-  noRules,
   PresentationFnInput,
   SkeletonFnInput,
+  createPipeline,
+  noRules,
 } from '../../../../pipeline'
-import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
 import { Views } from '../../../../views'
 import { resHeaders } from '../../../util'
 
diff --git a/packages/bsky/src/api/app/bsky/graph/getStarterPacks.ts b/packages/bsky/src/api/app/bsky/graph/getStarterPacks.ts
index 845bc87b19c..dac4baf0315 100644
--- a/packages/bsky/src/api/app/bsky/graph/getStarterPacks.ts
+++ b/packages/bsky/src/api/app/bsky/graph/getStarterPacks.ts
@@ -1,15 +1,15 @@
 import { dedupeStrs, mapDefined } from '@atproto/common'
-import { Server } from '../../../../lexicon'
-import { QueryParams } from '../../../../lexicon/types/app/bsky/graph/getStarterPacks'
-import AppContext from '../../../../context'
-import { resHeaders } from '../../../util'
-import { createPipeline, noRules } from '../../../../pipeline'
+import { AppContext } from '../../../../context'
 import {
   HydrateCtx,
   HydrationState,
   Hydrator,
 } from '../../../../hydration/hydrator'
+import { Server } from '../../../../lexicon'
+import { QueryParams } from '../../../../lexicon/types/app/bsky/graph/getStarterPacks'
+import { createPipeline, noRules } from '../../../../pipeline'
 import { Views } from '../../../../views'
+import { resHeaders } from '../../../util'
 
 export default function (server: Server, ctx: AppContext) {
   const getStarterPacks = createPipeline(
diff --git a/packages/bsky/src/api/app/bsky/graph/getSuggestedFollowsByActor.ts b/packages/bsky/src/api/app/bsky/graph/getSuggestedFollowsByActor.ts
index c7eec21bad9..9aeb9816c81 100644
--- a/packages/bsky/src/api/app/bsky/graph/getSuggestedFollowsByActor.ts
+++ b/packages/bsky/src/api/app/bsky/graph/getSuggestedFollowsByActor.ts
@@ -1,10 +1,11 @@
+import { AtpAgent } from '@atproto/api'
 import { mapDefined, noUndefinedVals } from '@atproto/common'
-import { InvalidRequestError } from '@atproto/xrpc-server'
-import AtpAgent from '@atproto/api'
 import { HeadersMap } from '@atproto/xrpc'
+import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
+import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
 import { Server } from '../../../../lexicon'
 import { QueryParams } from '../../../../lexicon/types/app/bsky/graph/getSuggestedFollowsByActor'
-import AppContext from '../../../../context'
 import {
   HydrationFnInput,
   PresentationFnInput,
@@ -12,7 +13,6 @@ import {
   SkeletonFnInput,
   createPipeline,
 } from '../../../../pipeline'
-import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
 import { Views } from '../../../../views'
 import { resHeaders } from '../../../util'
 
diff --git a/packages/bsky/src/api/app/bsky/graph/muteActor.ts b/packages/bsky/src/api/app/bsky/graph/muteActor.ts
index 051e5564b9e..2f25af7966e 100644
--- a/packages/bsky/src/api/app/bsky/graph/muteActor.ts
+++ b/packages/bsky/src/api/app/bsky/graph/muteActor.ts
@@ -1,6 +1,6 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { MuteOperation_Type } from '../../../../proto/bsync_pb'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/bsky/src/api/app/bsky/graph/muteActorList.ts b/packages/bsky/src/api/app/bsky/graph/muteActorList.ts
index 2f9f8c7573f..177e6a7c21f 100644
--- a/packages/bsky/src/api/app/bsky/graph/muteActorList.ts
+++ b/packages/bsky/src/api/app/bsky/graph/muteActorList.ts
@@ -1,5 +1,5 @@
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { MuteOperation_Type } from '../../../../proto/bsync_pb'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/bsky/src/api/app/bsky/graph/muteThread.ts b/packages/bsky/src/api/app/bsky/graph/muteThread.ts
index a0e1cf9df00..013a6772519 100644
--- a/packages/bsky/src/api/app/bsky/graph/muteThread.ts
+++ b/packages/bsky/src/api/app/bsky/graph/muteThread.ts
@@ -1,5 +1,5 @@
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { MuteOperation_Type } from '../../../../proto/bsync_pb'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/bsky/src/api/app/bsky/graph/searchStarterPacks.ts b/packages/bsky/src/api/app/bsky/graph/searchStarterPacks.ts
index 53ca0dba859..5665950a63c 100644
--- a/packages/bsky/src/api/app/bsky/graph/searchStarterPacks.ts
+++ b/packages/bsky/src/api/app/bsky/graph/searchStarterPacks.ts
@@ -1,7 +1,10 @@
-import AppContext from '../../../../context'
-import { Server } from '../../../../lexicon'
+import { AtpAgent } from '@atproto/api'
 import { mapDefined } from '@atproto/common'
-import { AtpAgent, AtUri } from '@atproto/api'
+import { AppContext } from '../../../../context'
+import { DataPlaneClient } from '../../../../data-plane'
+import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
+import { parseString } from '../../../../hydration/util'
+import { Server } from '../../../../lexicon'
 import { QueryParams } from '../../../../lexicon/types/app/bsky/graph/searchStarterPacks'
 import {
   HydrationFnInput,
@@ -10,12 +13,9 @@ import {
   SkeletonFnInput,
   createPipeline,
 } from '../../../../pipeline'
-import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
+import { uriToDid as creatorFromUri } from '../../../../util/uris'
 import { Views } from '../../../../views'
-import { DataPlaneClient } from '../../../../data-plane'
-import { parseString } from '../../../../hydration/util'
 import { resHeaders } from '../../../util'
-import { uriToDid as creatorFromUri } from '../../../../util/uris'
 
 export default function (server: Server, ctx: AppContext) {
   const searchStarterPacks = createPipeline(
diff --git a/packages/bsky/src/api/app/bsky/graph/unmuteActor.ts b/packages/bsky/src/api/app/bsky/graph/unmuteActor.ts
index 5462d7a7117..393da722d5c 100644
--- a/packages/bsky/src/api/app/bsky/graph/unmuteActor.ts
+++ b/packages/bsky/src/api/app/bsky/graph/unmuteActor.ts
@@ -1,6 +1,6 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { MuteOperation_Type } from '../../../../proto/bsync_pb'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/bsky/src/api/app/bsky/graph/unmuteActorList.ts b/packages/bsky/src/api/app/bsky/graph/unmuteActorList.ts
index 2c80e42187f..8ebd4c7006c 100644
--- a/packages/bsky/src/api/app/bsky/graph/unmuteActorList.ts
+++ b/packages/bsky/src/api/app/bsky/graph/unmuteActorList.ts
@@ -1,5 +1,5 @@
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { MuteOperation_Type } from '../../../../proto/bsync_pb'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/bsky/src/api/app/bsky/graph/unmuteThread.ts b/packages/bsky/src/api/app/bsky/graph/unmuteThread.ts
index d8e53200317..55507633a38 100644
--- a/packages/bsky/src/api/app/bsky/graph/unmuteThread.ts
+++ b/packages/bsky/src/api/app/bsky/graph/unmuteThread.ts
@@ -1,5 +1,5 @@
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { MuteOperation_Type } from '../../../../proto/bsync_pb'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/bsky/src/api/app/bsky/labeler/getServices.ts b/packages/bsky/src/api/app/bsky/labeler/getServices.ts
index f5df1cbf5ca..c40b6a4b13f 100644
--- a/packages/bsky/src/api/app/bsky/labeler/getServices.ts
+++ b/packages/bsky/src/api/app/bsky/labeler/getServices.ts
@@ -1,6 +1,6 @@
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { mapDefined } from '@atproto/common'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
 import { resHeaders } from '../../../util'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/bsky/src/api/app/bsky/notification/getUnreadCount.ts b/packages/bsky/src/api/app/bsky/notification/getUnreadCount.ts
index fe58a66b0a5..1b25638dd10 100644
--- a/packages/bsky/src/api/app/bsky/notification/getUnreadCount.ts
+++ b/packages/bsky/src/api/app/bsky/notification/getUnreadCount.ts
@@ -1,7 +1,8 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
+import { Hydrator } from '../../../../hydration/hydrator'
 import { Server } from '../../../../lexicon'
 import { QueryParams } from '../../../../lexicon/types/app/bsky/notification/getUnreadCount'
-import AppContext from '../../../../context'
 import {
   HydrationFnInput,
   PresentationFnInput,
@@ -9,7 +10,6 @@ import {
   createPipeline,
   noRules,
 } from '../../../../pipeline'
-import { Hydrator } from '../../../../hydration/hydrator'
 import { Views } from '../../../../views'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/bsky/src/api/app/bsky/notification/listNotifications.ts b/packages/bsky/src/api/app/bsky/notification/listNotifications.ts
index 8f4fa2f073e..07d11dac56e 100644
--- a/packages/bsky/src/api/app/bsky/notification/listNotifications.ts
+++ b/packages/bsky/src/api/app/bsky/notification/listNotifications.ts
@@ -1,20 +1,20 @@
-import { InvalidRequestError } from '@atproto/xrpc-server'
 import { mapDefined } from '@atproto/common'
+import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
+import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
 import { Server } from '../../../../lexicon'
-import { QueryParams } from '../../../../lexicon/types/app/bsky/notification/listNotifications'
 import { isRecord as isPostRecord } from '../../../../lexicon/types/app/bsky/feed/post'
-import AppContext from '../../../../context'
+import { QueryParams } from '../../../../lexicon/types/app/bsky/notification/listNotifications'
 import {
-  createPipeline,
   HydrationFnInput,
   PresentationFnInput,
   RulesFnInput,
   SkeletonFnInput,
+  createPipeline,
 } from '../../../../pipeline'
-import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
-import { Views } from '../../../../views'
 import { Notification } from '../../../../proto/bsky_pb'
 import { uriToDid as didFromUri } from '../../../../util/uris'
+import { Views } from '../../../../views'
 import { clearlyBadCursor, resHeaders } from '../../../util'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/bsky/src/api/app/bsky/notification/putPreferences.ts b/packages/bsky/src/api/app/bsky/notification/putPreferences.ts
index 7cafa2283ad..901b2549fb5 100644
--- a/packages/bsky/src/api/app/bsky/notification/putPreferences.ts
+++ b/packages/bsky/src/api/app/bsky/notification/putPreferences.ts
@@ -1,5 +1,5 @@
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.app.bsky.notification.putPreferences({
diff --git a/packages/bsky/src/api/app/bsky/notification/registerPush.ts b/packages/bsky/src/api/app/bsky/notification/registerPush.ts
index 32c04b608f7..959a20acec6 100644
--- a/packages/bsky/src/api/app/bsky/notification/registerPush.ts
+++ b/packages/bsky/src/api/app/bsky/notification/registerPush.ts
@@ -2,8 +2,8 @@ import {
   InvalidRequestError,
   MethodNotImplementedError,
 } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { AppPlatform } from '../../../../proto/courier_pb'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/bsky/src/api/app/bsky/notification/updateSeen.ts b/packages/bsky/src/api/app/bsky/notification/updateSeen.ts
index 923b4dfe4b6..2ecdea14c86 100644
--- a/packages/bsky/src/api/app/bsky/notification/updateSeen.ts
+++ b/packages/bsky/src/api/app/bsky/notification/updateSeen.ts
@@ -1,7 +1,7 @@
-import murmur from 'murmurhash'
 import { Struct, Timestamp } from '@bufbuild/protobuf'
+import { v3 as murmurV3 } from 'murmurhash'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.app.bsky.notification.updateSeen({
@@ -45,5 +45,5 @@ function getNotifId(viewer: string, seenAt: Date) {
   const key = ['mark-read-generic', viewer, seenAt.getTime().toString()].join(
     '::',
   )
-  return murmur.v3(key).toString(16)
+  return murmurV3(key).toString(16)
 }
diff --git a/packages/bsky/src/api/app/bsky/unspecced/getConfig.ts b/packages/bsky/src/api/app/bsky/unspecced/getConfig.ts
index f77c4a1993e..441c3f1fe2b 100644
--- a/packages/bsky/src/api/app/bsky/unspecced/getConfig.ts
+++ b/packages/bsky/src/api/app/bsky/unspecced/getConfig.ts
@@ -1,5 +1,5 @@
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 
 // THIS IS A TEMPORARY UNSPECCED ROUTE
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/bsky/src/api/app/bsky/unspecced/getPopularFeedGenerators.ts b/packages/bsky/src/api/app/bsky/unspecced/getPopularFeedGenerators.ts
index d9694382709..8753c44ae80 100644
--- a/packages/bsky/src/api/app/bsky/unspecced/getPopularFeedGenerators.ts
+++ b/packages/bsky/src/api/app/bsky/unspecced/getPopularFeedGenerators.ts
@@ -1,7 +1,7 @@
 import { mapDefined } from '@atproto/common'
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { parseString } from '../../../../hydration/util'
+import { Server } from '../../../../lexicon'
 import { clearlyBadCursor, resHeaders } from '../../../util'
 
 // THIS IS A TEMPORARY UNSPECCED ROUTE
diff --git a/packages/bsky/src/api/app/bsky/unspecced/getTaggedSuggestions.ts b/packages/bsky/src/api/app/bsky/unspecced/getTaggedSuggestions.ts
index 79df4857945..ffe077505db 100644
--- a/packages/bsky/src/api/app/bsky/unspecced/getTaggedSuggestions.ts
+++ b/packages/bsky/src/api/app/bsky/unspecced/getTaggedSuggestions.ts
@@ -1,5 +1,5 @@
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 
 // THIS IS A TEMPORARY UNSPECCED ROUTE
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/bsky/src/api/app/bsky/unspecced/getTrendingTopics.ts b/packages/bsky/src/api/app/bsky/unspecced/getTrendingTopics.ts
index 35187f78135..7c53caecb1b 100644
--- a/packages/bsky/src/api/app/bsky/unspecced/getTrendingTopics.ts
+++ b/packages/bsky/src/api/app/bsky/unspecced/getTrendingTopics.ts
@@ -1,19 +1,19 @@
+import AtpAgent from '@atproto/api'
 import { noUndefinedVals } from '@atproto/common'
-import AppContext from '../../../../context'
+import { InternalServerError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
+import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
 import { Server } from '../../../../lexicon'
+import { TrendingTopic } from '../../../../lexicon/types/app/bsky/unspecced/defs'
+import { QueryParams } from '../../../../lexicon/types/app/bsky/unspecced/getTrendingTopics'
 import {
-  createPipeline,
   HydrationFnInput,
   PresentationFnInput,
   RulesFnInput,
   SkeletonFnInput,
+  createPipeline,
 } from '../../../../pipeline'
-import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
 import { Views } from '../../../../views'
-import { QueryParams } from '../../../../lexicon/types/app/bsky/unspecced/getTrendingTopics'
-import AtpAgent from '@atproto/api'
-import { TrendingTopic } from '../../../../lexicon/types/app/bsky/unspecced/defs'
-import { InternalServerError } from '@atproto/xrpc-server'
 
 export default function (server: Server, ctx: AppContext) {
   const getTrendingTopics = createPipeline(
diff --git a/packages/bsky/src/api/blob-dispatcher.ts b/packages/bsky/src/api/blob-dispatcher.ts
index 24dd9694571..3baa89a0c1e 100644
--- a/packages/bsky/src/api/blob-dispatcher.ts
+++ b/packages/bsky/src/api/blob-dispatcher.ts
@@ -1,6 +1,5 @@
-import { isUnicastIp, unicastLookup } from '@atproto-labs/fetch-node'
 import { Agent, Dispatcher, Pool, RetryAgent } from 'undici'
-
+import { isUnicastIp, unicastLookup } from '@atproto-labs/fetch-node'
 import { ServerConfig } from '../config'
 import { RETRYABLE_HTTP_STATUS_CODES } from '../util/retry'
 
diff --git a/packages/bsky/src/api/blob-resolver.ts b/packages/bsky/src/api/blob-resolver.ts
index 562c1003843..c7098065ffd 100644
--- a/packages/bsky/src/api/blob-resolver.ts
+++ b/packages/bsky/src/api/blob-resolver.ts
@@ -1,23 +1,22 @@
+import { Duplex, Transform, Writable } from 'node:stream'
+import { pipeline } from 'node:stream/promises'
+import createError, { isHttpError } from 'http-errors'
+import { CID } from 'multiformats/cid'
+import { Dispatcher } from 'undici'
+import {
+  VerifyCidError,
+  VerifyCidTransform,
+  createDecoders,
+} from '@atproto/common'
+import { AtprotoDid, isAtprotoDid } from '@atproto/did'
 import {
   ACCEPT_ENCODING_COMPRESSED,
   ACCEPT_ENCODING_UNCOMPRESSED,
   buildProxiedContentEncoding,
   formatAcceptHeader,
 } from '@atproto-labs/xrpc-utils'
-import {
-  createDecoders,
-  VerifyCidError,
-  VerifyCidTransform,
-} from '@atproto/common'
-import { AtprotoDid, isAtprotoDid } from '@atproto/did'
-import createError, { isHttpError } from 'http-errors'
-import { CID } from 'multiformats/cid'
-import { Duplex, Transform, Writable } from 'node:stream'
-import { pipeline } from 'node:stream/promises'
-import { Dispatcher } from 'undici'
-
 import { ServerConfig } from '../config'
-import AppContext from '../context'
+import { AppContext } from '../context'
 import {
   Code,
   DataPlaneClient,
diff --git a/packages/bsky/src/api/com/atproto/admin/getAccountInfos.ts b/packages/bsky/src/api/com/atproto/admin/getAccountInfos.ts
index 788e7dbefc6..4efee135c3f 100644
--- a/packages/bsky/src/api/com/atproto/admin/getAccountInfos.ts
+++ b/packages/bsky/src/api/com/atproto/admin/getAccountInfos.ts
@@ -1,7 +1,7 @@
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { mapDefined } from '@atproto/common'
 import { INVALID_HANDLE } from '@atproto/syntax'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.admin.getAccountInfos({
diff --git a/packages/bsky/src/api/com/atproto/admin/getSubjectStatus.ts b/packages/bsky/src/api/com/atproto/admin/getSubjectStatus.ts
index 3be4c1c0185..74078737578 100644
--- a/packages/bsky/src/api/com/atproto/admin/getSubjectStatus.ts
+++ b/packages/bsky/src/api/com/atproto/admin/getSubjectStatus.ts
@@ -1,6 +1,6 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { OutputSchema } from '../../../../lexicon/types/com/atproto/admin/getSubjectStatus'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/bsky/src/api/com/atproto/admin/updateSubjectStatus.ts b/packages/bsky/src/api/com/atproto/admin/updateSubjectStatus.ts
index 8256efbe7e5..14cf1b9a50d 100644
--- a/packages/bsky/src/api/com/atproto/admin/updateSubjectStatus.ts
+++ b/packages/bsky/src/api/com/atproto/admin/updateSubjectStatus.ts
@@ -1,10 +1,10 @@
 import { Timestamp } from '@bufbuild/protobuf'
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import {
-  isRepoRef,
   isRepoBlobRef,
+  isRepoRef,
 } from '../../../../lexicon/types/com/atproto/admin/defs'
 import { isMain as isStrongRef } from '../../../../lexicon/types/com/atproto/repo/strongRef'
 
diff --git a/packages/bsky/src/api/com/atproto/identity/resolveHandle.ts b/packages/bsky/src/api/com/atproto/identity/resolveHandle.ts
index 6cb524c6ec2..f917ede3de8 100644
--- a/packages/bsky/src/api/com/atproto/identity/resolveHandle.ts
+++ b/packages/bsky/src/api/com/atproto/identity/resolveHandle.ts
@@ -1,7 +1,7 @@
-import { InvalidRequestError } from '@atproto/xrpc-server'
 import * as ident from '@atproto/syntax'
+import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.identity.resolveHandle(async ({ req, params }) => {
diff --git a/packages/bsky/src/api/com/atproto/label/queryLabels.ts b/packages/bsky/src/api/com/atproto/label/queryLabels.ts
index dbbf32d1049..f9d2b14485d 100644
--- a/packages/bsky/src/api/com/atproto/label/queryLabels.ts
+++ b/packages/bsky/src/api/com/atproto/label/queryLabels.ts
@@ -1,6 +1,6 @@
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.label.queryLabels(async ({ params }) => {
diff --git a/packages/bsky/src/api/com/atproto/repo/getRecord.ts b/packages/bsky/src/api/com/atproto/repo/getRecord.ts
index bb8c8660ae7..c7c9897c3af 100644
--- a/packages/bsky/src/api/com/atproto/repo/getRecord.ts
+++ b/packages/bsky/src/api/com/atproto/repo/getRecord.ts
@@ -1,7 +1,7 @@
-import { InvalidRequestError } from '@atproto/xrpc-server'
 import { AtUri } from '@atproto/syntax'
+import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.repo.getRecord({
diff --git a/packages/bsky/src/api/com/atproto/temp/fetchLabels.ts b/packages/bsky/src/api/com/atproto/temp/fetchLabels.ts
index 044a8d4dfd4..5bbebc40af5 100644
--- a/packages/bsky/src/api/com/atproto/temp/fetchLabels.ts
+++ b/packages/bsky/src/api/com/atproto/temp/fetchLabels.ts
@@ -1,6 +1,6 @@
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
 
 export default function (server: Server, _ctx: AppContext) {
   server.com.atproto.temp.fetchLabels(async (_reqCtx) => {
diff --git a/packages/bsky/src/api/health.ts b/packages/bsky/src/api/health.ts
index 8b0f42dae95..dd385909007 100644
--- a/packages/bsky/src/api/health.ts
+++ b/packages/bsky/src/api/health.ts
@@ -1,8 +1,8 @@
-import express from 'express'
-import AppContext from '../context'
+import { Router } from 'express'
+import { AppContext } from '../context'
 
-export const createRouter = (ctx: AppContext): express.Router => {
-  const router = express.Router()
+export const createRouter = (ctx: AppContext): Router => {
+  const router = Router()
 
   router.get('/', function (req, res) {
     res.type('text/plain')
diff --git a/packages/bsky/src/api/index.ts b/packages/bsky/src/api/index.ts
index a8eaabf291c..3eb292664c0 100644
--- a/packages/bsky/src/api/index.ts
+++ b/packages/bsky/src/api/index.ts
@@ -1,8 +1,12 @@
+import { AppContext } from '../context'
 import { Server } from '../lexicon'
-import AppContext from '../context'
-import getTimeline from './app/bsky/feed/getTimeline'
+import getProfile from './app/bsky/actor/getProfile'
+import getProfiles from './app/bsky/actor/getProfiles'
+import getSuggestions from './app/bsky/actor/getSuggestions'
+import searchActors from './app/bsky/actor/searchActors'
+import searchActorsTypeahead from './app/bsky/actor/searchActorsTypeahead'
 import getActorFeeds from './app/bsky/feed/getActorFeeds'
-import getSuggestedFeeds from './app/bsky/feed/getSuggestedFeeds'
+import getActorLikes from './app/bsky/feed/getActorLikes'
 import getAuthorFeed from './app/bsky/feed/getAuthorFeed'
 import getFeed from './app/bsky/feed/getFeed'
 import getFeedGenerator from './app/bsky/feed/getFeedGenerator'
@@ -11,53 +15,49 @@ import getLikes from './app/bsky/feed/getLikes'
 import getListFeed from './app/bsky/feed/getListFeed'
 import getPostThread from './app/bsky/feed/getPostThread'
 import getPosts from './app/bsky/feed/getPosts'
-import searchPosts from './app/bsky/feed/searchPosts'
-import getActorLikes from './app/bsky/feed/getActorLikes'
 import getQuotes from './app/bsky/feed/getQuotes'
-import getProfile from './app/bsky/actor/getProfile'
-import getProfiles from './app/bsky/actor/getProfiles'
 import getRepostedBy from './app/bsky/feed/getRepostedBy'
+import getSuggestedFeeds from './app/bsky/feed/getSuggestedFeeds'
+import getTimeline from './app/bsky/feed/getTimeline'
+import searchPosts from './app/bsky/feed/searchPosts'
 import getActorStarterPacks from './app/bsky/graph/getActorStarterPacks'
 import getBlocks from './app/bsky/graph/getBlocks'
-import getListBlocks from './app/bsky/graph/getListBlocks'
 import getFollowers from './app/bsky/graph/getFollowers'
-import getKnownFollowers from './app/bsky/graph/getKnownFollowers'
 import getFollows from './app/bsky/graph/getFollows'
+import getKnownFollowers from './app/bsky/graph/getKnownFollowers'
 import getList from './app/bsky/graph/getList'
-import getLists from './app/bsky/graph/getLists'
+import getListBlocks from './app/bsky/graph/getListBlocks'
 import getListMutes from './app/bsky/graph/getListMutes'
+import getLists from './app/bsky/graph/getLists'
 import getMutes from './app/bsky/graph/getMutes'
 import getRelationships from './app/bsky/graph/getRelationships'
 import getStarterPack from './app/bsky/graph/getStarterPack'
 import getStarterPacks from './app/bsky/graph/getStarterPacks'
-import searchStarterPacks from './app/bsky/graph/searchStarterPacks'
+import getSuggestedFollowsByActor from './app/bsky/graph/getSuggestedFollowsByActor'
 import muteActor from './app/bsky/graph/muteActor'
-import unmuteActor from './app/bsky/graph/unmuteActor'
 import muteActorList from './app/bsky/graph/muteActorList'
-import unmuteActorList from './app/bsky/graph/unmuteActorList'
 import muteThread from './app/bsky/graph/muteThread'
+import searchStarterPacks from './app/bsky/graph/searchStarterPacks'
+import unmuteActor from './app/bsky/graph/unmuteActor'
+import unmuteActorList from './app/bsky/graph/unmuteActorList'
 import unmuteThread from './app/bsky/graph/unmuteThread'
-import getSuggestedFollowsByActor from './app/bsky/graph/getSuggestedFollowsByActor'
-import getTrendingTopics from './app/bsky/unspecced/getTrendingTopics'
 import getLabelerServices from './app/bsky/labeler/getServices'
-import searchActors from './app/bsky/actor/searchActors'
-import searchActorsTypeahead from './app/bsky/actor/searchActorsTypeahead'
-import getSuggestions from './app/bsky/actor/getSuggestions'
 import getUnreadCount from './app/bsky/notification/getUnreadCount'
 import listNotifications from './app/bsky/notification/listNotifications'
-import updateSeen from './app/bsky/notification/updateSeen'
 import putPreferences from './app/bsky/notification/putPreferences'
 import registerPush from './app/bsky/notification/registerPush'
+import updateSeen from './app/bsky/notification/updateSeen'
 import getConfig from './app/bsky/unspecced/getConfig'
 import getPopularFeedGenerators from './app/bsky/unspecced/getPopularFeedGenerators'
 import getTaggedSuggestions from './app/bsky/unspecced/getTaggedSuggestions'
+import getTrendingTopics from './app/bsky/unspecced/getTrendingTopics'
+import getAccountInfos from './com/atproto/admin/getAccountInfos'
 import getSubjectStatus from './com/atproto/admin/getSubjectStatus'
 import updateSubjectStatus from './com/atproto/admin/updateSubjectStatus'
-import getAccountInfos from './com/atproto/admin/getAccountInfos'
 import resolveHandle from './com/atproto/identity/resolveHandle'
+import queryLabels from './com/atproto/label/queryLabels'
 import getRecord from './com/atproto/repo/getRecord'
 import fetchLabels from './com/atproto/temp/fetchLabels'
-import queryLabels from './com/atproto/label/queryLabels'
 
 export * as health from './health'
 
diff --git a/packages/bsky/src/api/well-known.ts b/packages/bsky/src/api/well-known.ts
index e628d0ab2be..cc65a0d8c4b 100644
--- a/packages/bsky/src/api/well-known.ts
+++ b/packages/bsky/src/api/well-known.ts
@@ -1,8 +1,8 @@
-import express from 'express'
-import AppContext from '../context'
+import { Router } from 'express'
+import { AppContext } from '../context'
 
-export const createRouter = (ctx: AppContext): express.Router => {
-  const router = express.Router()
+export const createRouter = (ctx: AppContext): Router => {
+  const router = Router()
 
   const did = ctx.cfg.serverDid
   if (did.startsWith('did:web:')) {
diff --git a/packages/bsky/src/auth-verifier.ts b/packages/bsky/src/auth-verifier.ts
index d1bc06cc8d0..29cfa1bb4db 100644
--- a/packages/bsky/src/auth-verifier.ts
+++ b/packages/bsky/src/auth-verifier.ts
@@ -1,15 +1,16 @@
 import crypto, { KeyObject } from 'node:crypto'
+import express from 'express'
+import * as jose from 'jose'
+import KeyEncoder from 'key-encoder'
+import * as ui8 from 'uint8arrays'
+import { SECP256K1_JWT_ALG, parseDidKey } from '@atproto/crypto'
 import {
   AuthRequiredError,
+  VerifySignatureWithKeyFn,
   cryptoVerifySignatureWithKey,
   parseReqNsid,
   verifyJwt as verifyServiceJwt,
-  VerifySignatureWithKeyFn,
 } from '@atproto/xrpc-server'
-import KeyEncoder from 'key-encoder'
-import * as ui8 from 'uint8arrays'
-import * as jose from 'jose'
-import express from 'express'
 import {
   Code,
   DataPlaneClient,
@@ -18,7 +19,6 @@ import {
   unpackIdentityKeys,
 } from './data-plane'
 import { GetIdentityByDidResponse } from './proto/bsky_pb'
-import { parseDidKey, SECP256K1_JWT_ALG } from '@atproto/crypto'
 
 type ReqCtx = {
   req: express.Request
diff --git a/packages/bsky/src/bsync.ts b/packages/bsky/src/bsync.ts
index 40a21a9c2c5..83e0bc7b12b 100644
--- a/packages/bsky/src/bsync.ts
+++ b/packages/bsky/src/bsync.ts
@@ -1,15 +1,15 @@
-import { Service } from './proto/bsync_connect'
 import {
   Code,
   ConnectError,
+  Interceptor,
   PromiseClient,
   createPromiseClient,
-  Interceptor,
 } from '@connectrpc/connect'
 import {
-  createConnectTransport,
   ConnectTransportOptions,
+  createConnectTransport,
 } from '@connectrpc/connect-node'
+import { Service } from './proto/bsync_connect'
 
 export type BsyncClient = PromiseClient<typeof Service>
 
diff --git a/packages/bsky/src/context.ts b/packages/bsky/src/context.ts
index 06e48ba8cf4..55c66599947 100644
--- a/packages/bsky/src/context.ts
+++ b/packages/bsky/src/context.ts
@@ -1,23 +1,23 @@
-import express from 'express'
 import * as plc from '@did-plc/lib'
-import { IdResolver } from '@atproto/identity'
+import express from 'express'
+import { Dispatcher } from 'undici'
 import { AtpAgent } from '@atproto/api'
 import { Keypair } from '@atproto/crypto'
-import { ServerConfig } from './config'
-import { DataPlaneClient } from './data-plane/client'
-import { Hydrator } from './hydration/hydrator'
-import { Views } from './views'
+import { IdResolver } from '@atproto/identity'
 import { AuthVerifier } from './auth-verifier'
 import { BsyncClient } from './bsync'
+import { ServerConfig } from './config'
 import { CourierClient } from './courier'
+import { DataPlaneClient } from './data-plane/client'
 import { FeatureGates } from './feature-gates'
+import { Hydrator } from './hydration/hydrator'
+import { httpLogger as log } from './logger'
 import {
   ParsedLabelers,
   defaultLabelerHeader,
   parseLabelerHeader,
 } from './util'
-import { httpLogger as log } from './logger'
-import { Dispatcher } from 'undici'
+import { Views } from './views'
 
 export class AppContext {
   constructor(
@@ -112,5 +112,3 @@ export class AppContext {
     return parsed
   }
 }
-
-export default AppContext
diff --git a/packages/bsky/src/courier.ts b/packages/bsky/src/courier.ts
index aeb095898f6..8de5fe72229 100644
--- a/packages/bsky/src/courier.ts
+++ b/packages/bsky/src/courier.ts
@@ -1,15 +1,15 @@
-import { Service } from './proto/courier_connect'
 import {
   Code,
   ConnectError,
+  Interceptor,
   PromiseClient,
   createPromiseClient,
-  Interceptor,
 } from '@connectrpc/connect'
 import {
-  createConnectTransport,
   ConnectTransportOptions,
+  createConnectTransport,
 } from '@connectrpc/connect-node'
+import { Service } from './proto/courier_connect'
 
 export type CourierClient = PromiseClient<typeof Service>
 
diff --git a/packages/bsky/src/data-plane/bsync/index.ts b/packages/bsky/src/data-plane/bsync/index.ts
index a8ad57467bc..722d4fa7f83 100644
--- a/packages/bsky/src/data-plane/bsync/index.ts
+++ b/packages/bsky/src/data-plane/bsync/index.ts
@@ -1,14 +1,14 @@
-import http from 'http'
-import events from 'events'
-import assert from 'assert'
-import express from 'express'
+import assert from 'node:assert'
+import events from 'node:events'
+import http from 'node:http'
 import { ConnectRouter } from '@connectrpc/connect'
 import { expressConnectMiddleware } from '@connectrpc/connect-express'
+import express from 'express'
 import { AtUri } from '@atproto/syntax'
-import { Database } from '../server/db'
+import { ids } from '../../lexicon/lexicons'
 import { Service } from '../../proto/bsync_connect'
 import { MuteOperation_Type } from '../../proto/bsync_pb'
-import { ids } from '../../lexicon/lexicons'
+import { Database } from '../server/db'
 
 export class MockBsync {
   constructor(public server: http.Server) {}
diff --git a/packages/bsky/src/data-plane/client.ts b/packages/bsky/src/data-plane/client.ts
index 11e68a6680c..0b12db4c670 100644
--- a/packages/bsky/src/data-plane/client.ts
+++ b/packages/bsky/src/data-plane/client.ts
@@ -1,6 +1,5 @@
 import assert from 'node:assert'
 import { randomInt } from 'node:crypto'
-import * as ui8 from 'uint8arrays'
 import {
   Code,
   ConnectError,
@@ -9,6 +8,7 @@ import {
   makeAnyClient,
 } from '@connectrpc/connect'
 import { createGrpcTransport } from '@connectrpc/connect-node'
+import * as ui8 from 'uint8arrays'
 import { getDidKeyFromMultibase } from '@atproto/identity'
 import { Service } from '../proto/bsky_connect'
 
diff --git a/packages/bsky/src/data-plane/server/background.ts b/packages/bsky/src/data-plane/server/background.ts
index 59d8ccf0ddf..ef74d3a09bc 100644
--- a/packages/bsky/src/data-plane/server/background.ts
+++ b/packages/bsky/src/data-plane/server/background.ts
@@ -1,6 +1,6 @@
 import PQueue from 'p-queue'
-import { Database } from './db'
 import { dbLogger } from '../../logger'
+import { Database } from './db'
 
 // A simple queue for in-process, out-of-band/backgrounded work
 
diff --git a/packages/bsky/src/data-plane/server/db/database-schema.ts b/packages/bsky/src/data-plane/server/db/database-schema.ts
index 195b09483e0..5fe3f830a1b 100644
--- a/packages/bsky/src/data-plane/server/db/database-schema.ts
+++ b/packages/bsky/src/data-plane/server/db/database-schema.ts
@@ -1,42 +1,42 @@
 import { Kysely } from 'kysely'
+import * as actor from './tables/actor'
+import * as actorBlock from './tables/actor-block'
+import * as actorState from './tables/actor-state'
+import * as actorSync from './tables/actor-sync'
+import * as algo from './tables/algo'
+import * as blobTakedown from './tables/blob-takedown'
+import * as didCache from './tables/did-cache'
 import * as duplicateRecord from './tables/duplicate-record'
-import * as profile from './tables/profile'
-import * as profileAgg from './tables/profile-agg'
-import * as post from './tables/post'
-import * as postEmbed from './tables/post-embed'
-import * as postAgg from './tables/post-agg'
-import * as repost from './tables/repost'
-import * as threadgate from './tables/thread-gate'
-import * as postgate from './tables/post-gate'
+import * as feedGenerator from './tables/feed-generator'
 import * as feedItem from './tables/feed-item'
 import * as follow from './tables/follow'
+import * as label from './tables/label'
+import * as labeler from './tables/labeler'
 import * as like from './tables/like'
 import * as list from './tables/list'
+import * as listBlock from './tables/list-block'
 import * as listItem from './tables/list-item'
 import * as listMute from './tables/list-mute'
-import * as listBlock from './tables/list-block'
 import * as mute from './tables/mute'
-import * as actorBlock from './tables/actor-block'
-import * as threadMute from './tables/thread-mute'
-import * as feedGenerator from './tables/feed-generator'
-import * as subscription from './tables/subscription'
-import * as actor from './tables/actor'
-import * as actorState from './tables/actor-state'
-import * as actorSync from './tables/actor-sync'
-import * as record from './tables/record'
 import * as notification from './tables/notification'
 import * as notificationPushToken from './tables/notification-push-token'
-import * as didCache from './tables/did-cache'
-import * as label from './tables/label'
-import * as algo from './tables/algo'
-import * as viewParam from './tables/view-param'
-import * as suggestedFollow from './tables/suggested-follow'
+import * as post from './tables/post'
+import * as postAgg from './tables/post-agg'
+import * as postEmbed from './tables/post-embed'
+import * as postgate from './tables/post-gate'
+import * as profile from './tables/profile'
+import * as profileAgg from './tables/profile-agg'
+import * as quote from './tables/quote'
+import * as record from './tables/record'
+import * as repost from './tables/repost'
+import * as starterPack from './tables/starter-pack'
+import * as subscription from './tables/subscription'
 import * as suggestedFeed from './tables/suggested-feed'
+import * as suggestedFollow from './tables/suggested-follow'
 import * as taggedSuggestion from './tables/tagged-suggestion'
-import * as blobTakedown from './tables/blob-takedown'
-import * as labeler from './tables/labeler'
-import * as starterPack from './tables/starter-pack'
-import * as quote from './tables/quote'
+import * as threadgate from './tables/thread-gate'
+import * as threadMute from './tables/thread-mute'
+import * as viewParam from './tables/view-param'
 
 export type DatabaseSchemaType = duplicateRecord.PartialDB &
   profile.PartialDB &
@@ -78,5 +78,3 @@ export type DatabaseSchemaType = duplicateRecord.PartialDB &
   quote.PartialDB
 
 export type DatabaseSchema = Kysely<DatabaseSchemaType>
-
-export default DatabaseSchema
diff --git a/packages/bsky/src/data-plane/server/db/db.ts b/packages/bsky/src/data-plane/server/db/db.ts
index 9b1cc645d62..063aef8e248 100644
--- a/packages/bsky/src/data-plane/server/db/db.ts
+++ b/packages/bsky/src/data-plane/server/db/db.ts
@@ -1,5 +1,5 @@
-import assert from 'assert'
-import EventEmitter from 'events'
+import assert from 'node:assert'
+import EventEmitter from 'node:events'
 import {
   Kysely,
   KyselyPlugin,
@@ -11,13 +11,13 @@ import {
   RootOperationNode,
   UnknownRow,
 } from 'kysely'
-import TypedEmitter from 'typed-emitter'
 import { Pool as PgPool, types as pgTypes } from 'pg'
-import * as migrations from './migrations'
-import DatabaseSchema, { DatabaseSchemaType } from './database-schema'
-import { PgOptions } from './types'
+import TypedEmitter from 'typed-emitter'
 import { dbLogger } from '../../../logger'
+import { DatabaseSchema, DatabaseSchemaType } from './database-schema'
+import * as migrations from './migrations'
 import { CtxMigrationProvider } from './migrations/provider'
+import { PgOptions } from './types'
 
 export class Database {
   pool: PgPool
diff --git a/packages/bsky/src/data-plane/server/db/util.ts b/packages/bsky/src/data-plane/server/db/util.ts
index cee5d100f3d..ae9dddbf4b0 100644
--- a/packages/bsky/src/data-plane/server/db/util.ts
+++ b/packages/bsky/src/data-plane/server/db/util.ts
@@ -4,12 +4,12 @@ import {
   ExpressionBuilder,
   RawBuilder,
   SelectQueryBuilder,
-  sql,
   SqliteAdapter,
   SqliteIntrospector,
   SqliteQueryCompiler,
+  sql,
 } from 'kysely'
-import DatabaseSchema, { DatabaseSchemaType } from './database-schema'
+import { DatabaseSchema, DatabaseSchemaType } from './database-schema'
 
 export const actorWhereClause = (actor: string) => {
   if (actor.startsWith('did:')) {
diff --git a/packages/bsky/src/data-plane/server/index.ts b/packages/bsky/src/data-plane/server/index.ts
index a12c63a22b3..6814e58a495 100644
--- a/packages/bsky/src/data-plane/server/index.ts
+++ b/packages/bsky/src/data-plane/server/index.ts
@@ -1,10 +1,10 @@
-import http from 'http'
-import events from 'events'
-import express from 'express'
+import events from 'node:events'
+import http from 'node:http'
 import { expressConnectMiddleware } from '@connectrpc/connect-express'
-import createRoutes from './routes'
-import { Database } from './db'
+import express from 'express'
 import { IdResolver, MemoryCache } from '@atproto/identity'
+import { Database } from './db'
+import createRoutes from './routes'
 
 export { RepoSubscription } from './subscription'
 
diff --git a/packages/bsky/src/data-plane/server/indexing/index.ts b/packages/bsky/src/data-plane/server/indexing/index.ts
index 66f9f98f6b4..17578099a98 100644
--- a/packages/bsky/src/data-plane/server/indexing/index.ts
+++ b/packages/bsky/src/data-plane/server/indexing/index.ts
@@ -1,38 +1,38 @@
 import { sql } from 'kysely'
 import { CID } from 'multiformats/cid'
 import { AtpAgent, ComAtprotoSyncGetLatestCommit } from '@atproto/api'
+import { DAY, HOUR } from '@atproto/common'
+import { IdResolver, getPds } from '@atproto/identity'
+import { ValidationError } from '@atproto/lexicon'
 import {
-  readCarWithRoot,
-  WriteOpAction,
-  verifyRepo,
   VerifiedRepo,
+  WriteOpAction,
   getAndParseRecord,
+  readCarWithRoot,
+  verifyRepo,
 } from '@atproto/repo'
 import { AtUri } from '@atproto/syntax'
-import { IdResolver, getPds } from '@atproto/identity'
-import { DAY, HOUR } from '@atproto/common'
-import { ValidationError } from '@atproto/lexicon'
+import { subLogger } from '../../../logger'
+import { retryXrpc } from '../../../util/retry'
+import { BackgroundQueue } from '../background'
 import { Database } from '../db'
 import { Actor } from '../db/tables/actor'
-import * as Post from './plugins/post'
-import * as Threadgate from './plugins/thread-gate'
-import * as Postgate from './plugins/post-gate'
-import * as Like from './plugins/like'
-import * as Repost from './plugins/repost'
+import * as Block from './plugins/block'
+import * as ChatDeclaration from './plugins/chat-declaration'
+import * as FeedGenerator from './plugins/feed-generator'
 import * as Follow from './plugins/follow'
-import * as Profile from './plugins/profile'
+import * as Labeler from './plugins/labeler'
+import * as Like from './plugins/like'
 import * as List from './plugins/list'
-import * as ListItem from './plugins/list-item'
 import * as ListBlock from './plugins/list-block'
-import * as Block from './plugins/block'
-import * as FeedGenerator from './plugins/feed-generator'
+import * as ListItem from './plugins/list-item'
+import * as Post from './plugins/post'
+import * as Postgate from './plugins/post-gate'
+import * as Profile from './plugins/profile'
+import * as Repost from './plugins/repost'
 import * as StarterPack from './plugins/starter-pack'
-import * as Labeler from './plugins/labeler'
-import * as ChatDeclaration from './plugins/chat-declaration'
-import RecordProcessor from './processor'
-import { subLogger } from '../../../logger'
-import { retryXrpc } from '../../../util/retry'
-import { BackgroundQueue } from '../background'
+import * as Threadgate from './plugins/thread-gate'
+import { RecordProcessor } from './processor'
 
 export class IndexingService {
   records: {
diff --git a/packages/bsky/src/data-plane/server/indexing/plugins/block.ts b/packages/bsky/src/data-plane/server/indexing/plugins/block.ts
index ec4956a04f5..290a376f47c 100644
--- a/packages/bsky/src/data-plane/server/indexing/plugins/block.ts
+++ b/packages/bsky/src/data-plane/server/indexing/plugins/block.ts
@@ -1,12 +1,12 @@
 import { Selectable } from 'kysely'
-import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { CID } from 'multiformats/cid'
-import * as Block from '../../../../lexicon/types/app/bsky/graph/block'
+import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import * as lex from '../../../../lexicon/lexicons'
+import * as Block from '../../../../lexicon/types/app/bsky/graph/block'
+import { BackgroundQueue } from '../../background'
 import { Database } from '../../db'
 import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
-import RecordProcessor from '../processor'
-import { BackgroundQueue } from '../../background'
+import { RecordProcessor } from '../processor'
 
 const lexId = lex.ids.AppBskyGraphBlock
 type IndexedBlock = Selectable<DatabaseSchemaType['actor_block']>
diff --git a/packages/bsky/src/data-plane/server/indexing/plugins/chat-declaration.ts b/packages/bsky/src/data-plane/server/indexing/plugins/chat-declaration.ts
index e234768e8b5..08e168595ab 100644
--- a/packages/bsky/src/data-plane/server/indexing/plugins/chat-declaration.ts
+++ b/packages/bsky/src/data-plane/server/indexing/plugins/chat-declaration.ts
@@ -1,10 +1,10 @@
-import { AtUri } from '@atproto/syntax'
 import { CID } from 'multiformats/cid'
+import { AtUri } from '@atproto/syntax'
 import * as lex from '../../../../lexicon/lexicons'
-import { DatabaseSchema } from '../../db/database-schema'
-import RecordProcessor from '../processor'
-import { Database } from '../../db'
 import { BackgroundQueue } from '../../background'
+import { Database } from '../../db'
+import { DatabaseSchema } from '../../db/database-schema'
+import { RecordProcessor } from '../processor'
 
 // @NOTE this indexer is a placeholder to ensure it gets indexed in the generic records table
 
diff --git a/packages/bsky/src/data-plane/server/indexing/plugins/feed-generator.ts b/packages/bsky/src/data-plane/server/indexing/plugins/feed-generator.ts
index f3b82c75567..8e567680d88 100644
--- a/packages/bsky/src/data-plane/server/indexing/plugins/feed-generator.ts
+++ b/packages/bsky/src/data-plane/server/indexing/plugins/feed-generator.ts
@@ -1,12 +1,12 @@
 import { Selectable } from 'kysely'
-import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { CID } from 'multiformats/cid'
-import * as FeedGenerator from '../../../../lexicon/types/app/bsky/feed/generator'
+import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import * as lex from '../../../../lexicon/lexicons'
+import * as FeedGenerator from '../../../../lexicon/types/app/bsky/feed/generator'
+import { BackgroundQueue } from '../../background'
 import { Database } from '../../db'
 import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
-import RecordProcessor from '../processor'
-import { BackgroundQueue } from '../../background'
+import { RecordProcessor } from '../processor'
 
 const lexId = lex.ids.AppBskyFeedGenerator
 type IndexedFeedGenerator = Selectable<DatabaseSchemaType['feed_generator']>
diff --git a/packages/bsky/src/data-plane/server/indexing/plugins/follow.ts b/packages/bsky/src/data-plane/server/indexing/plugins/follow.ts
index 6f238755761..36f8e1d9bb2 100644
--- a/packages/bsky/src/data-plane/server/indexing/plugins/follow.ts
+++ b/packages/bsky/src/data-plane/server/indexing/plugins/follow.ts
@@ -1,13 +1,13 @@
 import { Selectable } from 'kysely'
-import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { CID } from 'multiformats/cid'
-import * as Follow from '../../../../lexicon/types/app/bsky/graph/follow'
+import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import * as lex from '../../../../lexicon/lexicons'
-import RecordProcessor from '../processor'
+import * as Follow from '../../../../lexicon/types/app/bsky/graph/follow'
+import { BackgroundQueue } from '../../background'
 import { Database } from '../../db'
-import { countAll, excluded } from '../../db/util'
 import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
-import { BackgroundQueue } from '../../background'
+import { countAll, excluded } from '../../db/util'
+import { RecordProcessor } from '../processor'
 
 const lexId = lex.ids.AppBskyGraphFollow
 type IndexedFollow = Selectable<DatabaseSchemaType['follow']>
diff --git a/packages/bsky/src/data-plane/server/indexing/plugins/labeler.ts b/packages/bsky/src/data-plane/server/indexing/plugins/labeler.ts
index 5efdb0e30ca..7ee479055ee 100644
--- a/packages/bsky/src/data-plane/server/indexing/plugins/labeler.ts
+++ b/packages/bsky/src/data-plane/server/indexing/plugins/labeler.ts
@@ -1,12 +1,12 @@
 import { Selectable } from 'kysely'
-import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { CID } from 'multiformats/cid'
-import * as Labeler from '../../../../lexicon/types/app/bsky/labeler/service'
+import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import * as lex from '../../../../lexicon/lexicons'
+import * as Labeler from '../../../../lexicon/types/app/bsky/labeler/service'
+import { BackgroundQueue } from '../../background'
 import { Database } from '../../db'
 import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
-import RecordProcessor from '../processor'
-import { BackgroundQueue } from '../../background'
+import { RecordProcessor } from '../processor'
 
 const lexId = lex.ids.AppBskyLabelerService
 type IndexedLabeler = Selectable<DatabaseSchemaType['labeler']>
diff --git a/packages/bsky/src/data-plane/server/indexing/plugins/like.ts b/packages/bsky/src/data-plane/server/indexing/plugins/like.ts
index 98e9fc722f8..6afd30aff37 100644
--- a/packages/bsky/src/data-plane/server/indexing/plugins/like.ts
+++ b/packages/bsky/src/data-plane/server/indexing/plugins/like.ts
@@ -1,13 +1,13 @@
 import { Selectable } from 'kysely'
-import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { CID } from 'multiformats/cid'
-import * as Like from '../../../../lexicon/types/app/bsky/feed/like'
+import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import * as lex from '../../../../lexicon/lexicons'
-import RecordProcessor from '../processor'
-import { countAll, excluded } from '../../db/util'
+import * as Like from '../../../../lexicon/types/app/bsky/feed/like'
+import { BackgroundQueue } from '../../background'
 import { Database } from '../../db'
 import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
-import { BackgroundQueue } from '../../background'
+import { countAll, excluded } from '../../db/util'
+import { RecordProcessor } from '../processor'
 
 const lexId = lex.ids.AppBskyFeedLike
 type IndexedLike = Selectable<DatabaseSchemaType['like']>
diff --git a/packages/bsky/src/data-plane/server/indexing/plugins/list-block.ts b/packages/bsky/src/data-plane/server/indexing/plugins/list-block.ts
index 09eabcdb9f4..19cd392bdcc 100644
--- a/packages/bsky/src/data-plane/server/indexing/plugins/list-block.ts
+++ b/packages/bsky/src/data-plane/server/indexing/plugins/list-block.ts
@@ -1,12 +1,12 @@
 import { Selectable } from 'kysely'
-import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { CID } from 'multiformats/cid'
-import * as ListBlock from '../../../../lexicon/types/app/bsky/graph/listblock'
+import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import * as lex from '../../../../lexicon/lexicons'
+import * as ListBlock from '../../../../lexicon/types/app/bsky/graph/listblock'
+import { BackgroundQueue } from '../../background'
 import { Database } from '../../db'
 import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
-import RecordProcessor from '../processor'
-import { BackgroundQueue } from '../../background'
+import { RecordProcessor } from '../processor'
 
 const lexId = lex.ids.AppBskyGraphListblock
 type IndexedListBlock = Selectable<DatabaseSchemaType['list_block']>
diff --git a/packages/bsky/src/data-plane/server/indexing/plugins/list-item.ts b/packages/bsky/src/data-plane/server/indexing/plugins/list-item.ts
index f2a43cff485..0536176da92 100644
--- a/packages/bsky/src/data-plane/server/indexing/plugins/list-item.ts
+++ b/packages/bsky/src/data-plane/server/indexing/plugins/list-item.ts
@@ -1,13 +1,13 @@
 import { Selectable } from 'kysely'
-import { InvalidRequestError } from '@atproto/xrpc-server'
-import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { CID } from 'multiformats/cid'
-import * as ListItem from '../../../../lexicon/types/app/bsky/graph/listitem'
+import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
+import { InvalidRequestError } from '@atproto/xrpc-server'
 import * as lex from '../../../../lexicon/lexicons'
-import RecordProcessor from '../processor'
+import * as ListItem from '../../../../lexicon/types/app/bsky/graph/listitem'
+import { BackgroundQueue } from '../../background'
 import { Database } from '../../db'
 import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
-import { BackgroundQueue } from '../../background'
+import { RecordProcessor } from '../processor'
 
 const lexId = lex.ids.AppBskyGraphListitem
 type IndexedListItem = Selectable<DatabaseSchemaType['list_item']>
diff --git a/packages/bsky/src/data-plane/server/indexing/plugins/list.ts b/packages/bsky/src/data-plane/server/indexing/plugins/list.ts
index f6deaf0a68e..7451060d7c2 100644
--- a/packages/bsky/src/data-plane/server/indexing/plugins/list.ts
+++ b/packages/bsky/src/data-plane/server/indexing/plugins/list.ts
@@ -1,12 +1,12 @@
 import { Selectable } from 'kysely'
-import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { CID } from 'multiformats/cid'
-import * as List from '../../../../lexicon/types/app/bsky/graph/list'
+import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import * as lex from '../../../../lexicon/lexicons'
-import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
-import RecordProcessor from '../processor'
-import { Database } from '../../db'
+import * as List from '../../../../lexicon/types/app/bsky/graph/list'
 import { BackgroundQueue } from '../../background'
+import { Database } from '../../db'
+import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
+import { RecordProcessor } from '../processor'
 
 const lexId = lex.ids.AppBskyGraphList
 type IndexedList = Selectable<DatabaseSchemaType['list']>
diff --git a/packages/bsky/src/data-plane/server/indexing/plugins/post-gate.ts b/packages/bsky/src/data-plane/server/indexing/plugins/post-gate.ts
index 3b92d4a1312..34b9bb4b8ad 100644
--- a/packages/bsky/src/data-plane/server/indexing/plugins/post-gate.ts
+++ b/packages/bsky/src/data-plane/server/indexing/plugins/post-gate.ts
@@ -1,12 +1,12 @@
+import { CID } from 'multiformats/cid'
 import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { CID } from 'multiformats/cid'
-import * as Postgate from '../../../../lexicon/types/app/bsky/feed/postgate'
 import * as lex from '../../../../lexicon/lexicons'
-import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
-import { Database } from '../../db'
-import RecordProcessor from '../processor'
+import * as Postgate from '../../../../lexicon/types/app/bsky/feed/postgate'
 import { BackgroundQueue } from '../../background'
+import { Database } from '../../db'
+import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
+import { RecordProcessor } from '../processor'
 
 const lexId = lex.ids.AppBskyFeedPostgate
 type IndexedGate = DatabaseSchemaType['post_gate']
diff --git a/packages/bsky/src/data-plane/server/indexing/plugins/post.ts b/packages/bsky/src/data-plane/server/indexing/plugins/post.ts
index 606d2aff3f8..80ce451354e 100644
--- a/packages/bsky/src/data-plane/server/indexing/plugins/post.ts
+++ b/packages/bsky/src/data-plane/server/indexing/plugins/post.ts
@@ -1,27 +1,33 @@
 import { Insertable, Selectable, sql } from 'kysely'
 import { CID } from 'multiformats/cid'
-import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { jsonStringToLex } from '@atproto/lexicon'
+import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
+import * as lex from '../../../../lexicon/lexicons'
+import { isMain as isEmbedExternal } from '../../../../lexicon/types/app/bsky/embed/external'
+import { isMain as isEmbedImage } from '../../../../lexicon/types/app/bsky/embed/images'
+import { isMain as isEmbedRecord } from '../../../../lexicon/types/app/bsky/embed/record'
+import { isMain as isEmbedRecordWithMedia } from '../../../../lexicon/types/app/bsky/embed/recordWithMedia'
+import { isMain as isEmbedVideo } from '../../../../lexicon/types/app/bsky/embed/video'
 import {
   Record as PostRecord,
   ReplyRef,
 } from '../../../../lexicon/types/app/bsky/feed/post'
-import { Record as GateRecord } from '../../../../lexicon/types/app/bsky/feed/threadgate'
 import { Record as PostgateRecord } from '../../../../lexicon/types/app/bsky/feed/postgate'
-import { isMain as isEmbedImage } from '../../../../lexicon/types/app/bsky/embed/images'
-import { isMain as isEmbedExternal } from '../../../../lexicon/types/app/bsky/embed/external'
-import { isMain as isEmbedRecord } from '../../../../lexicon/types/app/bsky/embed/record'
-import { isMain as isEmbedRecordWithMedia } from '../../../../lexicon/types/app/bsky/embed/recordWithMedia'
-import { isMain as isEmbedVideo } from '../../../../lexicon/types/app/bsky/embed/video'
+import { Record as GateRecord } from '../../../../lexicon/types/app/bsky/feed/threadgate'
 import {
-  isMention,
   isLink,
+  isMention,
 } from '../../../../lexicon/types/app/bsky/richtext/facet'
-import * as lex from '../../../../lexicon/lexicons'
+import {
+  postUriToPostgateUri,
+  postUriToThreadgateUri,
+  uriToDid,
+} from '../../../../util/uris'
+import { parsePostgate } from '../../../../views/util'
+import { BackgroundQueue } from '../../background'
+import { Database } from '../../db'
 import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
-import RecordProcessor from '../processor'
 import { Notification } from '../../db/tables/notification'
-import { Database } from '../../db'
 import { countAll, excluded } from '../../db/util'
 import {
   getAncestorsAndSelfQb,
@@ -29,13 +35,7 @@ import {
   invalidReplyRoot as checkInvalidReplyRoot,
   violatesThreadGate as checkViolatesThreadGate,
 } from '../../util'
-import { BackgroundQueue } from '../../background'
-import { parsePostgate } from '../../../../views/util'
-import {
-  postUriToThreadgateUri,
-  postUriToPostgateUri,
-  uriToDid,
-} from '../../../../util/uris'
+import { RecordProcessor } from '../processor'
 
 type Notif = Insertable<Notification>
 type Post = Selectable<DatabaseSchemaType['post']>
diff --git a/packages/bsky/src/data-plane/server/indexing/plugins/profile.ts b/packages/bsky/src/data-plane/server/indexing/plugins/profile.ts
index 762fb4c4b29..deeca3f5607 100644
--- a/packages/bsky/src/data-plane/server/indexing/plugins/profile.ts
+++ b/packages/bsky/src/data-plane/server/indexing/plugins/profile.ts
@@ -1,11 +1,11 @@
-import { AtUri } from '@atproto/syntax'
 import { CID } from 'multiformats/cid'
-import * as Profile from '../../../../lexicon/types/app/bsky/actor/profile'
+import { AtUri } from '@atproto/syntax'
 import * as lex from '../../../../lexicon/lexicons'
-import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
-import RecordProcessor from '../processor'
-import { Database } from '../../db'
+import * as Profile from '../../../../lexicon/types/app/bsky/actor/profile'
 import { BackgroundQueue } from '../../background'
+import { Database } from '../../db'
+import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
+import { RecordProcessor } from '../processor'
 
 const lexId = lex.ids.AppBskyActorProfile
 type IndexedProfile = DatabaseSchemaType['profile']
diff --git a/packages/bsky/src/data-plane/server/indexing/plugins/repost.ts b/packages/bsky/src/data-plane/server/indexing/plugins/repost.ts
index ec2e7754fb0..c43267b8d57 100644
--- a/packages/bsky/src/data-plane/server/indexing/plugins/repost.ts
+++ b/packages/bsky/src/data-plane/server/indexing/plugins/repost.ts
@@ -1,13 +1,13 @@
 import { Selectable } from 'kysely'
 import { CID } from 'multiformats/cid'
 import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
-import * as Repost from '../../../../lexicon/types/app/bsky/feed/repost'
 import * as lex from '../../../../lexicon/lexicons'
-import RecordProcessor from '../processor'
+import * as Repost from '../../../../lexicon/types/app/bsky/feed/repost'
+import { BackgroundQueue } from '../../background'
 import { Database } from '../../db'
-import { countAll, excluded } from '../../db/util'
 import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
-import { BackgroundQueue } from '../../background'
+import { countAll, excluded } from '../../db/util'
+import { RecordProcessor } from '../processor'
 
 const lexId = lex.ids.AppBskyFeedRepost
 type IndexedRepost = Selectable<DatabaseSchemaType['repost']>
diff --git a/packages/bsky/src/data-plane/server/indexing/plugins/starter-pack.ts b/packages/bsky/src/data-plane/server/indexing/plugins/starter-pack.ts
index 844c84544a9..fe237c5cffd 100644
--- a/packages/bsky/src/data-plane/server/indexing/plugins/starter-pack.ts
+++ b/packages/bsky/src/data-plane/server/indexing/plugins/starter-pack.ts
@@ -1,12 +1,12 @@
 import { Selectable } from 'kysely'
-import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { CID } from 'multiformats/cid'
-import * as StarterPack from '../../../../lexicon/types/app/bsky/graph/starterpack'
+import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import * as lex from '../../../../lexicon/lexicons'
+import * as StarterPack from '../../../../lexicon/types/app/bsky/graph/starterpack'
+import { BackgroundQueue } from '../../background'
 import { Database } from '../../db'
 import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
-import RecordProcessor from '../processor'
-import { BackgroundQueue } from '../../background'
+import { RecordProcessor } from '../processor'
 
 const lexId = lex.ids.AppBskyGraphStarterpack
 type IndexedStarterPack = Selectable<DatabaseSchemaType['starter_pack']>
diff --git a/packages/bsky/src/data-plane/server/indexing/plugins/thread-gate.ts b/packages/bsky/src/data-plane/server/indexing/plugins/thread-gate.ts
index bbcd42190ed..a6c53d84e18 100644
--- a/packages/bsky/src/data-plane/server/indexing/plugins/thread-gate.ts
+++ b/packages/bsky/src/data-plane/server/indexing/plugins/thread-gate.ts
@@ -1,12 +1,12 @@
+import { CID } from 'multiformats/cid'
 import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { CID } from 'multiformats/cid'
-import * as Threadgate from '../../../../lexicon/types/app/bsky/feed/threadgate'
 import * as lex from '../../../../lexicon/lexicons'
-import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
-import { Database } from '../../db'
-import RecordProcessor from '../processor'
+import * as Threadgate from '../../../../lexicon/types/app/bsky/feed/threadgate'
 import { BackgroundQueue } from '../../background'
+import { Database } from '../../db'
+import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
+import { RecordProcessor } from '../processor'
 
 const lexId = lex.ids.AppBskyFeedThreadgate
 type IndexedGate = DatabaseSchemaType['thread_gate']
diff --git a/packages/bsky/src/data-plane/server/indexing/processor.ts b/packages/bsky/src/data-plane/server/indexing/processor.ts
index d88d230dd5d..ade9dea328a 100644
--- a/packages/bsky/src/data-plane/server/indexing/processor.ts
+++ b/packages/bsky/src/data-plane/server/indexing/processor.ts
@@ -1,13 +1,13 @@
 import { Insertable } from 'kysely'
 import { CID } from 'multiformats/cid'
-import { AtUri } from '@atproto/syntax'
 import { chunkArray } from '@atproto/common'
 import { jsonStringToLex, stringifyLex } from '@atproto/lexicon'
+import { AtUri } from '@atproto/syntax'
 import { lexicons } from '../../../lexicon/lexicons'
+import { BackgroundQueue } from '../background'
 import { Database } from '../db'
-import DatabaseSchema from '../db/database-schema'
+import { DatabaseSchema } from '../db/database-schema'
 import { Notification } from '../db/tables/notification'
-import { BackgroundQueue } from '../background'
 
 // @NOTE re: insertions and deletions. Due to how record updates are handled,
 // (insertFn) should have the same effect as (insertFn -> deleteFn -> insertFn).
diff --git a/packages/bsky/src/data-plane/server/routes/feeds.ts b/packages/bsky/src/data-plane/server/routes/feeds.ts
index 60b737a889a..4a0135d748d 100644
--- a/packages/bsky/src/data-plane/server/routes/feeds.ts
+++ b/packages/bsky/src/data-plane/server/routes/feeds.ts
@@ -1,8 +1,8 @@
 import { ServiceImpl } from '@connectrpc/connect'
 import { Service } from '../../../proto/bsky_connect'
+import { FeedType } from '../../../proto/bsky_pb'
 import { Database } from '../db'
 import { TimeCidKeyset, paginate } from '../db/pagination'
-import { FeedType } from '../../../proto/bsky_pb'
 
 export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
   async getAuthorFeed(req) {
diff --git a/packages/bsky/src/data-plane/server/routes/follows.ts b/packages/bsky/src/data-plane/server/routes/follows.ts
index 8ef27fdfe05..9038807fdac 100644
--- a/packages/bsky/src/data-plane/server/routes/follows.ts
+++ b/packages/bsky/src/data-plane/server/routes/follows.ts
@@ -1,5 +1,5 @@
-import { keyBy } from '@atproto/common'
 import { ServiceImpl } from '@connectrpc/connect'
+import { keyBy } from '@atproto/common'
 import { Service } from '../../../proto/bsky_connect'
 import { FollowsFollowing } from '../../../proto/bsky_pb'
 import { Database } from '../db'
diff --git a/packages/bsky/src/data-plane/server/routes/identity.ts b/packages/bsky/src/data-plane/server/routes/identity.ts
index fb8dffc096c..007ace4fe88 100644
--- a/packages/bsky/src/data-plane/server/routes/identity.ts
+++ b/packages/bsky/src/data-plane/server/routes/identity.ts
@@ -1,8 +1,8 @@
+import { Timestamp } from '@bufbuild/protobuf'
 import { Code, ConnectError, ServiceImpl } from '@connectrpc/connect'
+import { DidDocument, IdResolver, getDid, getHandle } from '@atproto/identity'
 import { Service } from '../../../proto/bsky_connect'
 import { Database } from '../db'
-import { DidDocument, IdResolver, getDid, getHandle } from '@atproto/identity'
-import { Timestamp } from '@bufbuild/protobuf'
 
 export default (
   _db: Database,
diff --git a/packages/bsky/src/data-plane/server/routes/index.ts b/packages/bsky/src/data-plane/server/routes/index.ts
index 5504d38f812..f64bf4bd07f 100644
--- a/packages/bsky/src/data-plane/server/routes/index.ts
+++ b/packages/bsky/src/data-plane/server/routes/index.ts
@@ -1,6 +1,7 @@
 import { ConnectRouter } from '@connectrpc/connect'
 import { IdResolver } from '@atproto/identity'
 import { Service } from '../../../proto/bsky_connect'
+import { Database } from '../db'
 import blocks from './blocks'
 import feedGens from './feed-gens'
 import feeds from './feeds'
@@ -20,11 +21,10 @@ import records from './records'
 import relationships from './relationships'
 import reposts from './reposts'
 import search from './search'
+import starterPacks from './starter-packs'
 import suggestions from './suggestions'
 import sync from './sync'
 import threads from './threads'
-import starterPacks from './starter-packs'
-import { Database } from '../db'
 
 export default (db: Database, idResolver: IdResolver) =>
   (router: ConnectRouter) =>
diff --git a/packages/bsky/src/data-plane/server/routes/interactions.ts b/packages/bsky/src/data-plane/server/routes/interactions.ts
index 2a0e00f2cfc..2ce84b391e4 100644
--- a/packages/bsky/src/data-plane/server/routes/interactions.ts
+++ b/packages/bsky/src/data-plane/server/routes/interactions.ts
@@ -1,5 +1,5 @@
-import { DAY, keyBy } from '@atproto/common'
 import { ServiceImpl } from '@connectrpc/connect'
+import { DAY, keyBy } from '@atproto/common'
 import { Service } from '../../../proto/bsky_connect'
 import { Database } from '../db'
 import { countAll } from '../db/util'
diff --git a/packages/bsky/src/data-plane/server/routes/labels.ts b/packages/bsky/src/data-plane/server/routes/labels.ts
index ccd485da3ba..045279f8238 100644
--- a/packages/bsky/src/data-plane/server/routes/labels.ts
+++ b/packages/bsky/src/data-plane/server/routes/labels.ts
@@ -1,9 +1,9 @@
+import { ServiceImpl } from '@connectrpc/connect'
+import { Selectable } from 'kysely'
 import * as ui8 from 'uint8arrays'
 import { noUndefinedVals } from '@atproto/common'
-import { ServiceImpl } from '@connectrpc/connect'
 import { Service } from '../../../proto/bsky_connect'
 import { Database } from '../db'
-import { Selectable } from 'kysely'
 import { Label } from '../db/tables/label'
 
 type LabelRow = Selectable<Label>
diff --git a/packages/bsky/src/data-plane/server/routes/likes.ts b/packages/bsky/src/data-plane/server/routes/likes.ts
index cb9af0b80d5..5404325ed6c 100644
--- a/packages/bsky/src/data-plane/server/routes/likes.ts
+++ b/packages/bsky/src/data-plane/server/routes/likes.ts
@@ -1,6 +1,6 @@
 import assert from 'node:assert'
-import { keyBy } from '@atproto/common'
 import { ServiceImpl } from '@connectrpc/connect'
+import { keyBy } from '@atproto/common'
 import { Service } from '../../../proto/bsky_connect'
 import { Database } from '../db'
 import { TimeCidKeyset, paginate } from '../db/pagination'
diff --git a/packages/bsky/src/data-plane/server/routes/lists.ts b/packages/bsky/src/data-plane/server/routes/lists.ts
index 064d0e9c604..a9122010bab 100644
--- a/packages/bsky/src/data-plane/server/routes/lists.ts
+++ b/packages/bsky/src/data-plane/server/routes/lists.ts
@@ -1,9 +1,9 @@
-import { keyBy } from '@atproto/common'
 import { ServiceImpl } from '@connectrpc/connect'
+import { keyBy } from '@atproto/common'
 import { Service } from '../../../proto/bsky_connect'
 import { Database } from '../db'
-import { countAll } from '../db/util'
 import { TimeCidKeyset, paginate } from '../db/pagination'
+import { countAll } from '../db/util'
 
 export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
   async getActorLists(req) {
diff --git a/packages/bsky/src/data-plane/server/routes/mutes.ts b/packages/bsky/src/data-plane/server/routes/mutes.ts
index d941ffc66a8..58b24e5c827 100644
--- a/packages/bsky/src/data-plane/server/routes/mutes.ts
+++ b/packages/bsky/src/data-plane/server/routes/mutes.ts
@@ -1,11 +1,11 @@
-import assert from 'assert'
+import assert from 'node:assert'
 import { ServiceImpl } from '@connectrpc/connect'
+import { keyBy } from '@atproto/common'
 import { AtUri } from '@atproto/syntax'
 import { ids } from '../../../lexicon/lexicons'
 import { Service } from '../../../proto/bsky_connect'
 import { Database } from '../db'
 import { CreatedAtDidKeyset, TimeCidKeyset, paginate } from '../db/pagination'
-import { keyBy } from '@atproto/common'
 
 export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
   async getActorMutesActor(req) {
diff --git a/packages/bsky/src/data-plane/server/routes/notifs.ts b/packages/bsky/src/data-plane/server/routes/notifs.ts
index 282c2098046..f8a53efca03 100644
--- a/packages/bsky/src/data-plane/server/routes/notifs.ts
+++ b/packages/bsky/src/data-plane/server/routes/notifs.ts
@@ -1,10 +1,10 @@
-import { sql } from 'kysely'
-import { ServiceImpl } from '@connectrpc/connect'
 import { Timestamp } from '@bufbuild/protobuf'
+import { ServiceImpl } from '@connectrpc/connect'
+import { sql } from 'kysely'
 import { Service } from '../../../proto/bsky_connect'
 import { Database } from '../db'
-import { countAll, notSoftDeletedClause } from '../db/util'
 import { TimeCidKeyset, paginate } from '../db/pagination'
+import { countAll, notSoftDeletedClause } from '../db/util'
 
 export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
   async getNotifications(req) {
diff --git a/packages/bsky/src/data-plane/server/routes/posts.ts b/packages/bsky/src/data-plane/server/routes/posts.ts
index b400490576d..aa85688fcea 100644
--- a/packages/bsky/src/data-plane/server/routes/posts.ts
+++ b/packages/bsky/src/data-plane/server/routes/posts.ts
@@ -1,6 +1,6 @@
 import { ServiceImpl } from '@connectrpc/connect'
-import { Service } from '../../../proto/bsky_connect'
 import { keyBy } from '@atproto/common'
+import { Service } from '../../../proto/bsky_connect'
 import { Database } from '../db'
 
 export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
diff --git a/packages/bsky/src/data-plane/server/routes/profile.ts b/packages/bsky/src/data-plane/server/routes/profile.ts
index 7f56ff95a82..7d98f1107bb 100644
--- a/packages/bsky/src/data-plane/server/routes/profile.ts
+++ b/packages/bsky/src/data-plane/server/routes/profile.ts
@@ -1,10 +1,10 @@
 import { ServiceImpl } from '@connectrpc/connect'
-import { Service } from '../../../proto/bsky_connect'
-import { keyBy } from '@atproto/common'
-import { getRecords } from './records'
-import { Database } from '../db'
 import { sql } from 'kysely'
+import { keyBy } from '@atproto/common'
 import { parseRecordBytes } from '../../../hydration/util'
+import { Service } from '../../../proto/bsky_connect'
+import { Database } from '../db'
+import { getRecords } from './records'
 
 export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
   async getActors(req) {
diff --git a/packages/bsky/src/data-plane/server/routes/quotes.ts b/packages/bsky/src/data-plane/server/routes/quotes.ts
index 70992101611..0e5ff1829ed 100644
--- a/packages/bsky/src/data-plane/server/routes/quotes.ts
+++ b/packages/bsky/src/data-plane/server/routes/quotes.ts
@@ -1,7 +1,7 @@
 import { ServiceImpl } from '@connectrpc/connect'
 import { Service } from '../../../proto/bsky_connect'
 import { Database } from '../db'
-import { paginate, TimeCidKeyset } from '../db/pagination'
+import { TimeCidKeyset, paginate } from '../db/pagination'
 
 export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
   async getQuotesBySubjectSorted(req) {
diff --git a/packages/bsky/src/data-plane/server/routes/records.ts b/packages/bsky/src/data-plane/server/routes/records.ts
index 97c5c57375c..3234acfb986 100644
--- a/packages/bsky/src/data-plane/server/routes/records.ts
+++ b/packages/bsky/src/data-plane/server/routes/records.ts
@@ -1,8 +1,8 @@
-import { keyBy } from '@atproto/common'
-import { AtUri } from '@atproto/syntax'
 import { Timestamp } from '@bufbuild/protobuf'
 import { ServiceImpl } from '@connectrpc/connect'
 import * as ui8 from 'uint8arrays'
+import { keyBy } from '@atproto/common'
+import { AtUri } from '@atproto/syntax'
 import { ids } from '../../../lexicon/lexicons'
 import { Service } from '../../../proto/bsky_connect'
 import { PostRecordMeta, Record } from '../../../proto/bsky_pb'
diff --git a/packages/bsky/src/data-plane/server/routes/relationships.ts b/packages/bsky/src/data-plane/server/routes/relationships.ts
index b6a16d4b05f..209fba7952c 100644
--- a/packages/bsky/src/data-plane/server/routes/relationships.ts
+++ b/packages/bsky/src/data-plane/server/routes/relationships.ts
@@ -1,5 +1,5 @@
-import { sql } from 'kysely'
 import { ServiceImpl } from '@connectrpc/connect'
+import { sql } from 'kysely'
 import { keyBy } from '@atproto/common'
 import { Service } from '../../../proto/bsky_connect'
 import { Database } from '../db'
diff --git a/packages/bsky/src/data-plane/server/routes/reposts.ts b/packages/bsky/src/data-plane/server/routes/reposts.ts
index 4b9e1f9f87b..30506347991 100644
--- a/packages/bsky/src/data-plane/server/routes/reposts.ts
+++ b/packages/bsky/src/data-plane/server/routes/reposts.ts
@@ -1,5 +1,5 @@
-import { keyBy } from '@atproto/common'
 import { ServiceImpl } from '@connectrpc/connect'
+import { keyBy } from '@atproto/common'
 import { Service } from '../../../proto/bsky_connect'
 import { Database } from '../db'
 import { TimeCidKeyset, paginate } from '../db/pagination'
diff --git a/packages/bsky/src/data-plane/server/routes/suggestions.ts b/packages/bsky/src/data-plane/server/routes/suggestions.ts
index 68b1dc54d5b..57d8faf3e5d 100644
--- a/packages/bsky/src/data-plane/server/routes/suggestions.ts
+++ b/packages/bsky/src/data-plane/server/routes/suggestions.ts
@@ -1,5 +1,5 @@
-import { sql } from 'kysely'
 import { ServiceImpl } from '@connectrpc/connect'
+import { sql } from 'kysely'
 import { Service } from '../../../proto/bsky_connect'
 import { Database } from '../db'
 
diff --git a/packages/bsky/src/data-plane/server/subscription.ts b/packages/bsky/src/data-plane/server/subscription.ts
index c52e09f89c5..0ef25569140 100644
--- a/packages/bsky/src/data-plane/server/subscription.ts
+++ b/packages/bsky/src/data-plane/server/subscription.ts
@@ -1,10 +1,10 @@
-import { Firehose, MemoryRunner } from '@atproto/sync'
 import { IdResolver } from '@atproto/identity'
 import { WriteOpAction } from '@atproto/repo'
+import { Firehose, MemoryRunner } from '@atproto/sync'
 import { subLogger as log } from '../../logger'
-import { IndexingService } from './indexing'
-import { Database } from './db'
 import { BackgroundQueue } from './background'
+import { Database } from './db'
+import { IndexingService } from './indexing'
 
 export class RepoSubscription {
   firehose: Firehose
diff --git a/packages/bsky/src/data-plane/server/util.ts b/packages/bsky/src/data-plane/server/util.ts
index e873fb1f5bc..55d090cbae8 100644
--- a/packages/bsky/src/data-plane/server/util.ts
+++ b/packages/bsky/src/data-plane/server/util.ts
@@ -4,9 +4,9 @@ import {
   ReplyRef,
 } from '../../lexicon/types/app/bsky/feed/post'
 import { Record as GateRecord } from '../../lexicon/types/app/bsky/feed/threadgate'
-import DatabaseSchema from './db/database-schema'
-import { valuesList } from './db/util'
 import { parseThreadGate } from '../../views/util'
+import { DatabaseSchema } from './db/database-schema'
+import { valuesList } from './db/util'
 
 export const getDescendentsQb = (
   db: DatabaseSchema,
diff --git a/packages/bsky/src/error.ts b/packages/bsky/src/error.ts
index a4de90f580e..65fbf17b2bd 100644
--- a/packages/bsky/src/error.ts
+++ b/packages/bsky/src/error.ts
@@ -1,5 +1,5 @@
-import { XRPCError } from '@atproto/xrpc-server'
 import { ErrorRequestHandler } from 'express'
+import { XRPCError } from '@atproto/xrpc-server'
 import { httpLogger as log } from './logger'
 
 export const handler: ErrorRequestHandler = (err, _req, res, next) => {
diff --git a/packages/bsky/src/feature-gates.ts b/packages/bsky/src/feature-gates.ts
index ccfa9280609..d49b647c600 100644
--- a/packages/bsky/src/feature-gates.ts
+++ b/packages/bsky/src/feature-gates.ts
@@ -1,8 +1,6 @@
 import Statsig, { StatsigUser } from 'statsig-node'
 import { sha256Hex } from '@atproto/crypto'
-
 import { featureGatesLogger } from './logger'
-import type { ServerConfig } from './config'
 
 export type Config = {
   apiKey?: string
diff --git a/packages/bsky/src/hydration/feed.ts b/packages/bsky/src/hydration/feed.ts
index 1db35e4f28a..2d561569021 100644
--- a/packages/bsky/src/hydration/feed.ts
+++ b/packages/bsky/src/hydration/feed.ts
@@ -1,10 +1,16 @@
+import { dedupeStrs } from '@atproto/common'
 import { DataPlaneClient } from '../data-plane/client'
-import { Record as PostRecord } from '../lexicon/types/app/bsky/feed/post'
+import { Record as FeedGenRecord } from '../lexicon/types/app/bsky/feed/generator'
 import { Record as LikeRecord } from '../lexicon/types/app/bsky/feed/like'
+import { Record as PostRecord } from '../lexicon/types/app/bsky/feed/post'
+import { Record as PostgateRecord } from '../lexicon/types/app/bsky/feed/postgate'
 import { Record as RepostRecord } from '../lexicon/types/app/bsky/feed/repost'
-import { Record as FeedGenRecord } from '../lexicon/types/app/bsky/feed/generator'
 import { Record as ThreadgateRecord } from '../lexicon/types/app/bsky/feed/threadgate'
-import { Record as PostgateRecord } from '../lexicon/types/app/bsky/feed/postgate'
+import {
+  postUriToPostgateUri,
+  postUriToThreadgateUri,
+  uriToDid as didFromUri,
+} from '../util/uris'
 import {
   HydrationMap,
   ItemRef,
@@ -13,12 +19,6 @@ import {
   parseString,
   split,
 } from './util'
-import { dedupeStrs } from '@atproto/common'
-import {
-  postUriToThreadgateUri,
-  postUriToPostgateUri,
-  uriToDid as didFromUri,
-} from '../util/uris'
 
 export type Post = RecordInfo<PostRecord> & {
   violatesThreadGate: boolean
diff --git a/packages/bsky/src/hydration/graph.ts b/packages/bsky/src/hydration/graph.ts
index a153e96ca65..148a7e0da3b 100644
--- a/packages/bsky/src/hydration/graph.ts
+++ b/packages/bsky/src/hydration/graph.ts
@@ -1,11 +1,11 @@
-import { Record as FollowRecord } from '../lexicon/types/app/bsky/graph/follow'
+import { DataPlaneClient } from '../data-plane/client'
 import { Record as BlockRecord } from '../lexicon/types/app/bsky/graph/block'
-import { Record as StarterPackRecord } from '../lexicon/types/app/bsky/graph/starterpack'
+import { Record as FollowRecord } from '../lexicon/types/app/bsky/graph/follow'
 import { Record as ListRecord } from '../lexicon/types/app/bsky/graph/list'
 import { Record as ListItemRecord } from '../lexicon/types/app/bsky/graph/listitem'
-import { DataPlaneClient } from '../data-plane/client'
-import { HydrationMap, ItemRef, RecordInfo, parseRecord } from './util'
+import { Record as StarterPackRecord } from '../lexicon/types/app/bsky/graph/starterpack'
 import { FollowInfo } from '../proto/bsky_pb'
+import { HydrationMap, ItemRef, RecordInfo, parseRecord } from './util'
 
 export type List = RecordInfo<ListRecord>
 export type Lists = HydrationMap<List>
diff --git a/packages/bsky/src/hydration/hydrator.ts b/packages/bsky/src/hydration/hydrator.ts
index 39d6015e6a9..788b9c52806 100644
--- a/packages/bsky/src/hydration/hydrator.ts
+++ b/packages/bsky/src/hydration/hydrator.ts
@@ -1,21 +1,40 @@
-import assert from 'assert'
+import assert from 'node:assert'
 import { mapDefined } from '@atproto/common'
 import { AtUri } from '@atproto/syntax'
 import { DataPlaneClient } from '../data-plane/client'
-import { Notification } from '../proto/bsky_pb'
 import { ids } from '../lexicon/lexicons'
 import { isMain as isEmbedRecord } from '../lexicon/types/app/bsky/embed/record'
 import { isMain as isEmbedRecordWithMedia } from '../lexicon/types/app/bsky/embed/recordWithMedia'
 import { isListRule as isThreadgateListRule } from '../lexicon/types/app/bsky/feed/threadgate'
 import { hydrationLogger } from '../logger'
+import { Notification } from '../proto/bsky_pb'
+import { ParsedLabelers } from '../util'
+import { uriToDid, uriToDid as didFromUri } from '../util/uris'
 import {
   ActorHydrator,
-  ProfileAggs,
   Actors,
-  ProfileViewerStates,
-  ProfileViewerState,
   KnownFollowers,
+  ProfileAggs,
+  ProfileViewerState,
+  ProfileViewerStates,
 } from './actor'
+import {
+  FeedGenAggs,
+  FeedGenViewerStates,
+  FeedGens,
+  FeedHydrator,
+  FeedItem,
+  Likes,
+  Post,
+  PostAggs,
+  PostViewerStates,
+  Postgates,
+  Posts,
+  Reposts,
+  ThreadContexts,
+  ThreadRef,
+  Threadgates,
+} from './feed'
 import {
   Follows,
   GraphHydrator,
@@ -36,32 +55,13 @@ import {
 } from './label'
 import {
   HydrationMap,
-  RecordInfo,
   ItemRef,
-  urisByCollection,
+  RecordInfo,
+  mergeManyMaps,
   mergeMaps,
   mergeNestedMaps,
-  mergeManyMaps,
+  urisByCollection,
 } from './util'
-import { uriToDid as didFromUri, uriToDid } from '../util/uris'
-import {
-  FeedGenAggs,
-  FeedGens,
-  FeedGenViewerStates,
-  FeedHydrator,
-  Likes,
-  Post,
-  Posts,
-  Reposts,
-  PostAggs,
-  PostViewerStates,
-  Threadgates,
-  Postgates,
-  FeedItem,
-  ThreadContexts,
-  ThreadRef,
-} from './feed'
-import { ParsedLabelers } from '../util'
 
 export class HydrateCtx {
   labelers = this.vals.labelers
diff --git a/packages/bsky/src/hydration/label.ts b/packages/bsky/src/hydration/label.ts
index 89fb3eedb9a..13e46e13fe4 100644
--- a/packages/bsky/src/hydration/label.ts
+++ b/packages/bsky/src/hydration/label.ts
@@ -1,6 +1,9 @@
+import { AtUri } from '@atproto/syntax'
 import { DataPlaneClient } from '../data-plane/client'
-import { Label } from '../lexicon/types/com/atproto/label/defs'
+import { ids } from '../lexicon/lexicons'
 import { Record as LabelerRecord } from '../lexicon/types/app/bsky/labeler/service'
+import { Label } from '../lexicon/types/com/atproto/label/defs'
+import { ParsedLabelers } from '../util'
 import {
   HydrationMap,
   Merges,
@@ -9,9 +12,6 @@ import {
   parseRecord,
   parseString,
 } from './util'
-import { AtUri } from '@atproto/syntax'
-import { ids } from '../lexicon/lexicons'
-import { ParsedLabelers } from '../util'
 
 export type { Label } from '../lexicon/types/com/atproto/label/defs'
 
diff --git a/packages/bsky/src/hydration/util.ts b/packages/bsky/src/hydration/util.ts
index 7fe3b0269d7..fae89596044 100644
--- a/packages/bsky/src/hydration/util.ts
+++ b/packages/bsky/src/hydration/util.ts
@@ -1,7 +1,7 @@
-import { AtUri } from '@atproto/syntax'
-import { jsonToLex } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
 import * as ui8 from 'uint8arrays'
+import { jsonToLex } from '@atproto/lexicon'
+import { AtUri } from '@atproto/syntax'
 import { lexicons } from '../lexicon/lexicons'
 import { Record } from '../proto/bsky_pb'
 
diff --git a/packages/bsky/src/image/index.ts b/packages/bsky/src/image/index.ts
index 3197b5aeb5c..56781f3adba 100644
--- a/packages/bsky/src/image/index.ts
+++ b/packages/bsky/src/image/index.ts
@@ -1,2 +1,2 @@
 export * from './sharp'
-export type { Options, ImageInfo } from './util'
+export type { ImageInfo, Options } from './util'
diff --git a/packages/bsky/src/image/server.ts b/packages/bsky/src/image/server.ts
index 3ee752b25a0..f4427bd2cf9 100644
--- a/packages/bsky/src/image/server.ts
+++ b/packages/bsky/src/image/server.ts
@@ -1,26 +1,25 @@
-import {
-  cloneStream,
-  createDecoders,
-  isErrnoException,
-  VerifyCidError,
-  VerifyCidTransform,
-} from '@atproto/common'
-import { BlobNotFoundError } from '@atproto/repo'
-import createError, { isHttpError } from 'http-errors'
 import fsSync from 'node:fs'
 import fs from 'node:fs/promises'
 import os from 'node:os'
 import path from 'node:path'
 import { Duplex, Readable } from 'node:stream'
 import { pipeline } from 'node:stream/promises'
-
-import { streamBlob, StreamBlobOptions } from '../api/blob-resolver'
-import AppContext from '../context'
+import createError, { isHttpError } from 'http-errors'
+import {
+  VerifyCidError,
+  VerifyCidTransform,
+  cloneStream,
+  createDecoders,
+  isErrnoException,
+} from '@atproto/common'
+import { BlobNotFoundError } from '@atproto/repo'
+import { StreamBlobOptions, streamBlob } from '../api/blob-resolver'
+import { AppContext } from '../context'
 import { Middleware, responseSignal } from '../util/http'
 import log from './logger'
 import { createImageProcessor, createImageUpscaler } from './sharp'
 import { BadPathError, ImageUriBuilder } from './uri'
-import { formatsToMimes, Options, SharpInfo } from './util'
+import { Options, SharpInfo, formatsToMimes } from './util'
 
 export function createMiddleware(
   ctx: AppContext,
diff --git a/packages/bsky/src/image/sharp.ts b/packages/bsky/src/image/sharp.ts
index 0df4dc9e333..030a2f084c9 100644
--- a/packages/bsky/src/image/sharp.ts
+++ b/packages/bsky/src/image/sharp.ts
@@ -1,8 +1,8 @@
-import { errHasMsg } from '@atproto/common'
 import { PassThrough, Readable } from 'node:stream'
 import { pipeline } from 'node:stream/promises'
 import sharp from 'sharp'
-import { formatsToMimes, ImageInfo, Options } from './util'
+import { errHasMsg } from '@atproto/common'
+import { ImageInfo, Options, formatsToMimes } from './util'
 
 export type { Options }
 
diff --git a/packages/bsky/src/index.ts b/packages/bsky/src/index.ts
index 3c3f826df28..68462f9c39d 100644
--- a/packages/bsky/src/index.ts
+++ b/packages/bsky/src/index.ts
@@ -1,39 +1,39 @@
-import express from 'express'
-import http from 'http'
-import { AddressInfo } from 'net'
-import events from 'events'
-import { createHttpTerminator, HttpTerminator } from 'http-terminator'
-import cors from 'cors'
+import events from 'node:events'
+import http from 'node:http'
+import { AddressInfo } from 'node:net'
 import compression from 'compression'
+import cors from 'cors'
+import express from 'express'
+import { HttpTerminator, createHttpTerminator } from 'http-terminator'
 import { AtpAgent } from '@atproto/api'
-import { IdResolver } from '@atproto/identity'
 import { DAY, SECOND } from '@atproto/common'
 import { Keypair } from '@atproto/crypto'
-import API, { health, wellKnown, blobResolver } from './api'
-import * as error from './error'
-import { loggerMiddleware } from './logger'
-import { ServerConfig } from './config'
-import { createServer } from './lexicon'
-import { ImageUriBuilder } from './image/uri'
-import * as imageServer from './image/server'
-import AppContext from './context'
-import { createDataPlaneClient } from './data-plane/client'
-import { Hydrator } from './hydration/hydrator'
-import { Views } from './views'
+import { IdResolver } from '@atproto/identity'
+import API, { blobResolver, health, wellKnown } from './api'
+import { createBlobDispatcher } from './api/blob-dispatcher'
 import { AuthVerifier, createPublicKeyObject } from './auth-verifier'
 import { authWithApiKey as bsyncAuth, createBsyncClient } from './bsync'
+import { ServerConfig } from './config'
+import { AppContext } from './context'
 import { authWithApiKey as courierAuth, createCourierClient } from './courier'
+import { createDataPlaneClient } from './data-plane/client'
+import * as error from './error'
 import { FeatureGates } from './feature-gates'
+import { Hydrator } from './hydration/hydrator'
+import * as imageServer from './image/server'
+import { ImageUriBuilder } from './image/uri'
+import { createServer } from './lexicon'
+import { loggerMiddleware } from './logger'
+import { Views } from './views'
 import { VideoUriBuilder } from './views/util'
-import { createBlobDispatcher } from './api/blob-dispatcher'
 
-export * from './data-plane'
-export type { ServerConfigValues } from './config'
 export { ServerConfig } from './config'
-export { Database } from './data-plane/server/db'
-export { Redis } from './redis'
+export type { ServerConfigValues } from './config'
 export { AppContext } from './context'
+export * from './data-plane'
 export { BackgroundQueue } from './data-plane/server/background'
+export { Database } from './data-plane/server/db'
+export { Redis } from './redis'
 
 export class BskyAppView {
   public ctx: AppContext
diff --git a/packages/bsky/src/logger.ts b/packages/bsky/src/logger.ts
index 0355ac3455f..81530b2f648 100644
--- a/packages/bsky/src/logger.ts
+++ b/packages/bsky/src/logger.ts
@@ -1,6 +1,6 @@
 import { IncomingMessage } from 'node:http'
 import { stdSerializers } from 'pino'
-import pinoHttp from 'pino-http'
+import { pinoHttp } from 'pino-http'
 import { obfuscateHeaders, subsystemLogger } from '@atproto/common'
 
 export const dbLogger: ReturnType<typeof subsystemLogger> =
diff --git a/packages/bsky/src/redis.ts b/packages/bsky/src/redis.ts
index 3104f021e4a..b9f3d3fcf28 100644
--- a/packages/bsky/src/redis.ts
+++ b/packages/bsky/src/redis.ts
@@ -1,4 +1,4 @@
-import assert from 'assert'
+import assert from 'node:assert'
 import { Redis as RedisDriver } from 'ioredis'
 
 export class Redis {
diff --git a/packages/bsky/src/util/http.ts b/packages/bsky/src/util/http.ts
index fcc980d6ddf..3a5d8b53ab5 100644
--- a/packages/bsky/src/util/http.ts
+++ b/packages/bsky/src/util/http.ts
@@ -1,5 +1,5 @@
-import createHttpError from 'http-errors'
 import { IncomingMessage, ServerResponse } from 'node:http'
+import createHttpError from 'http-errors'
 import { IncomingHttpHeaders } from 'undici/types/header'
 
 type NextFunction = (err?: unknown) => void
diff --git a/packages/bsky/src/util/uris.ts b/packages/bsky/src/util/uris.ts
index 044dc37df1f..95b8f22b7b2 100644
--- a/packages/bsky/src/util/uris.ts
+++ b/packages/bsky/src/util/uris.ts
@@ -1,8 +1,8 @@
 import { AtUri } from '@atproto/syntax'
 import { ids } from '../lexicon/lexicons'
 import {
-  validateMain as validateStrongRef,
   Main as StrongRef,
+  validateMain as validateStrongRef,
 } from '../lexicon/types/com/atproto/repo/strongRef'
 
 /**
diff --git a/packages/bsky/src/views/index.ts b/packages/bsky/src/views/index.ts
index e0290eb9b83..78273ad2331 100644
--- a/packages/bsky/src/views/index.ts
+++ b/packages/bsky/src/views/index.ts
@@ -1,12 +1,16 @@
-import { AtUri, INVALID_HANDLE, normalizeDatetimeAlways } from '@atproto/syntax'
 import { mapDefined } from '@atproto/common'
-import { ImageUriBuilder } from '../image/uri'
+import { AtUri, INVALID_HANDLE, normalizeDatetimeAlways } from '@atproto/syntax'
+import { ProfileViewerState } from '../hydration/actor'
+import { FeedItem, Post, Repost } from '../hydration/feed'
 import { HydrationState } from '../hydration/hydrator'
+import { Label } from '../hydration/label'
+import { RecordInfo } from '../hydration/util'
+import { ImageUriBuilder } from '../image/uri'
 import { ids } from '../lexicon/lexicons'
 import {
-  ProfileViewDetailed,
   ProfileView,
   ProfileViewBasic,
+  ProfileViewDetailed,
   ViewerState as ProfileViewer,
 } from '../lexicon/types/app/bsky/actor/defs'
 import {
@@ -15,14 +19,15 @@ import {
   GeneratorView,
   NotFoundPost,
   PostView,
-  ReasonRepost,
   ReasonPin,
+  ReasonRepost,
   ReplyRef,
   ThreadViewPost,
   ThreadgateView,
   isPostView,
 } from '../lexicon/types/app/bsky/feed/defs'
 import { isRecord as isPostRecord } from '../lexicon/types/app/bsky/feed/post'
+import { isListRule } from '../lexicon/types/app/bsky/feed/threadgate'
 import {
   ListView,
   ListViewBasic,
@@ -30,23 +35,23 @@ import {
   StarterPackViewBasic,
 } from '../lexicon/types/app/bsky/graph/defs'
 import {
-  parseThreadGate,
-  cidFromBlobJson,
-  VideoUriBuilder,
-  parsePostgate,
-} from './util'
+  LabelerView,
+  LabelerViewDetailed,
+} from '../lexicon/types/app/bsky/labeler/defs'
+import { isSelfLabels } from '../lexicon/types/com/atproto/label/defs'
+import { Notification } from '../proto/bsky_pb'
 import {
-  uriToDid as creatorFromUri,
+  postUriToPostgateUri,
+  postUriToThreadgateUri,
   safePinnedPost,
   uriToDid,
+  uriToDid as creatorFromUri,
 } from '../util/uris'
-import { isListRule } from '../lexicon/types/app/bsky/feed/threadgate'
-import { isSelfLabels } from '../lexicon/types/com/atproto/label/defs'
 import {
   Embed,
   EmbedBlocked,
-  EmbedNotFound,
   EmbedDetached,
+  EmbedNotFound,
   EmbedView,
   ExternalEmbed,
   ExternalEmbedView,
@@ -68,16 +73,12 @@ import {
   isRecordWithMedia,
   isVideoEmbed,
 } from './types'
-import { Label } from '../hydration/label'
-import { FeedItem, Post, Repost } from '../hydration/feed'
-import { RecordInfo } from '../hydration/util'
 import {
-  LabelerView,
-  LabelerViewDetailed,
-} from '../lexicon/types/app/bsky/labeler/defs'
-import { Notification } from '../proto/bsky_pb'
-import { postUriToThreadgateUri, postUriToPostgateUri } from '../util/uris'
-import { ProfileViewerState } from '../hydration/actor'
+  VideoUriBuilder,
+  cidFromBlobJson,
+  parsePostgate,
+  parseThreadGate,
+} from './util'
 
 export class Views {
   public imgUriBuilder: ImageUriBuilder = this.opts.imgUriBuilder
diff --git a/packages/bsky/src/views/types.ts b/packages/bsky/src/views/types.ts
index 3470a857207..a3e30c827f5 100644
--- a/packages/bsky/src/views/types.ts
+++ b/packages/bsky/src/views/types.ts
@@ -1,15 +1,11 @@
-import {
-  Main as ImagesEmbed,
-  View as ImagesEmbedView,
-} from '../lexicon/types/app/bsky/embed/images'
-import {
-  Main as VideoEmbed,
-  View as VideoEmbedView,
-} from '../lexicon/types/app/bsky/embed/video'
 import {
   Main as ExternalEmbed,
   View as ExternalEmbedView,
 } from '../lexicon/types/app/bsky/embed/external'
+import {
+  Main as ImagesEmbed,
+  View as ImagesEmbedView,
+} from '../lexicon/types/app/bsky/embed/images'
 import {
   Main as RecordEmbed,
   View as RecordEmbedView,
@@ -19,6 +15,10 @@ import {
   Main as RecordWithMedia,
   View as RecordWithMediaView,
 } from '../lexicon/types/app/bsky/embed/recordWithMedia'
+import {
+  Main as VideoEmbed,
+  View as VideoEmbedView,
+} from '../lexicon/types/app/bsky/embed/video'
 import {
   BlockedPost,
   GeneratorView,
@@ -47,8 +47,8 @@ export type {
   Main as RecordEmbed,
   View as RecordEmbedView,
   ViewBlocked as EmbedBlocked,
-  ViewNotFound as EmbedNotFound,
   ViewDetached as EmbedDetached,
+  ViewNotFound as EmbedNotFound,
   ViewRecord as PostEmbedView,
 } from '../lexicon/types/app/bsky/embed/record'
 export { isMain as isRecordEmbed } from '../lexicon/types/app/bsky/embed/record'
diff --git a/packages/bsky/src/views/util.ts b/packages/bsky/src/views/util.ts
index f9e54f713cf..2ec393d53a0 100644
--- a/packages/bsky/src/views/util.ts
+++ b/packages/bsky/src/views/util.ts
@@ -1,16 +1,16 @@
 import * as util from 'node:util'
 import { BlobRef } from '@atproto/lexicon'
 import { Record as PostRecord } from '../lexicon/types/app/bsky/feed/post'
+import {
+  Record as PostgateRecord,
+  isDisableRule as isPostgateDisableRule,
+} from '../lexicon/types/app/bsky/feed/postgate'
 import {
   Record as GateRecord,
   isFollowingRule,
   isListRule,
   isMentionRule,
 } from '../lexicon/types/app/bsky/feed/threadgate'
-import {
-  Record as PostgateRecord,
-  isDisableRule as isPostgateDisableRule,
-} from '../lexicon/types/app/bsky/feed/postgate'
 import { isMention } from '../lexicon/types/app/bsky/richtext/facet'
 
 export const parseThreadGate = (
diff --git a/packages/bsky/tests/_util.ts b/packages/bsky/tests/_util.ts
index 30dc53c0eea..954c6c69035 100644
--- a/packages/bsky/tests/_util.ts
+++ b/packages/bsky/tests/_util.ts
@@ -1,11 +1,10 @@
+import { Server } from 'node:http'
+import { AddressInfo } from 'node:net'
+import { type Express } from 'express'
+import { CID } from 'multiformats/cid'
 import { AppBskyFeedGetPostThread } from '@atproto/api'
 import { lexToJson } from '@atproto/lexicon'
 import { AtUri } from '@atproto/syntax'
-import { type Express } from 'express'
-import { CID } from 'multiformats/cid'
-import { Server } from 'node:http'
-
-import { AddressInfo } from 'node:net'
 import { isViewRecord } from '../src/lexicon/types/app/bsky/embed/record'
 import {
   FeedViewPost,
diff --git a/packages/bsky/tests/admin/admin-auth.test.ts b/packages/bsky/tests/admin/admin-auth.test.ts
index 027ff49eb1e..8379cb83361 100644
--- a/packages/bsky/tests/admin/admin-auth.test.ts
+++ b/packages/bsky/tests/admin/admin-auth.test.ts
@@ -1,9 +1,9 @@
-import { SeedClient, usersSeed, TestNetwork } from '@atproto/dev-env'
 import { AtpAgent } from '@atproto/api'
 import { Secp256k1Keypair } from '@atproto/crypto'
+import { SeedClient, TestNetwork, usersSeed } from '@atproto/dev-env'
 import { createServiceAuthHeaders } from '@atproto/xrpc-server'
-import { RepoRef } from '../../src/lexicon/types/com/atproto/admin/defs'
 import { ids } from '../../src/lexicon/lexicons'
+import { RepoRef } from '../../src/lexicon/types/com/atproto/admin/defs'
 
 describe('admin auth', () => {
   let network: TestNetwork
diff --git a/packages/bsky/tests/admin/moderation.test.ts b/packages/bsky/tests/admin/moderation.test.ts
index 7bb1c551217..8ce65843013 100644
--- a/packages/bsky/tests/admin/moderation.test.ts
+++ b/packages/bsky/tests/admin/moderation.test.ts
@@ -1,5 +1,5 @@
-import { ImageRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { AtpAgent } from '@atproto/api'
+import { ImageRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import {
   RepoBlobRef,
   RepoRef,
diff --git a/packages/bsky/tests/auth.test.ts b/packages/bsky/tests/auth.test.ts
index 97db9602548..8698e25892c 100644
--- a/packages/bsky/tests/auth.test.ts
+++ b/packages/bsky/tests/auth.test.ts
@@ -1,7 +1,7 @@
 import { AtpAgent } from '@atproto/api'
+import { Keypair, Secp256k1Keypair } from '@atproto/crypto'
 import { SeedClient, TestNetwork, usersSeed } from '@atproto/dev-env'
 import { createServiceJwt } from '@atproto/xrpc-server'
-import { Keypair, Secp256k1Keypair } from '@atproto/crypto'
 import { ids } from '../src/lexicon/lexicons'
 
 describe('auth', () => {
diff --git a/packages/bsky/tests/blob-resolver.test.ts b/packages/bsky/tests/blob-resolver.test.ts
index 71a486862aa..8bdf1677bee 100644
--- a/packages/bsky/tests/blob-resolver.test.ts
+++ b/packages/bsky/tests/blob-resolver.test.ts
@@ -1,8 +1,8 @@
+import { CID } from 'multiformats/cid'
+import { request } from 'undici'
 import { cidForCbor, verifyCidForBytes } from '@atproto/common'
 import { randomBytes } from '@atproto/crypto'
 import { TestNetwork, basicSeed } from '@atproto/dev-env'
-import { CID } from 'multiformats/cid'
-import { request } from 'undici'
 
 describe('blob resolver', () => {
   let network: TestNetwork
diff --git a/packages/bsky/tests/data-plane/duplicate-records.test.ts b/packages/bsky/tests/data-plane/duplicate-records.test.ts
index e09980751d7..ee04b8f1b0e 100644
--- a/packages/bsky/tests/data-plane/duplicate-records.test.ts
+++ b/packages/bsky/tests/data-plane/duplicate-records.test.ts
@@ -1,7 +1,7 @@
-import { AtUri } from '@atproto/syntax'
-import { cidForCbor, TID } from '@atproto/common'
-import { WriteOpAction } from '@atproto/repo'
+import { TID, cidForCbor } from '@atproto/common'
 import { TestNetwork } from '@atproto/dev-env'
+import { WriteOpAction } from '@atproto/repo'
+import { AtUri } from '@atproto/syntax'
 import * as lex from '../../src/lexicon/lexicons'
 
 type Database = TestNetwork['bsky']['db']
diff --git a/packages/bsky/tests/data-plane/handle-invalidation.test.ts b/packages/bsky/tests/data-plane/handle-invalidation.test.ts
index 8c366e23d4b..d6be14b6e8b 100644
--- a/packages/bsky/tests/data-plane/handle-invalidation.test.ts
+++ b/packages/bsky/tests/data-plane/handle-invalidation.test.ts
@@ -1,6 +1,6 @@
-import { DAY } from '@atproto/common'
-import { TestNetwork, SeedClient, usersSeed } from '@atproto/dev-env'
 import { AtpAgent } from '@atproto/api'
+import { DAY } from '@atproto/common'
+import { SeedClient, TestNetwork, usersSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
 
 describe('handle invalidation', () => {
diff --git a/packages/bsky/tests/data-plane/indexing.test.ts b/packages/bsky/tests/data-plane/indexing.test.ts
index b3ed9680d29..74b6d5cf560 100644
--- a/packages/bsky/tests/data-plane/indexing.test.ts
+++ b/packages/bsky/tests/data-plane/indexing.test.ts
@@ -1,21 +1,21 @@
 import { sql } from 'kysely'
 import { CID } from 'multiformats/cid'
-import { cidForCbor, TID } from '@atproto/common'
-import { repoPrepare } from '@atproto/pds'
-import { WriteOpAction } from '@atproto/repo'
-import { AtUri } from '@atproto/syntax'
 import {
   AppBskyActorProfile,
-  AppBskyFeedPost,
   AppBskyFeedLike,
+  AppBskyFeedPost,
   AppBskyFeedRepost,
   AppBskyGraphFollow,
   AtpAgent,
 } from '@atproto/api'
-import { TestNetwork, SeedClient, usersSeed, basicSeed } from '@atproto/dev-env'
-import { forSnapshot } from '../_util'
-import { ids } from '../../src/lexicon/lexicons'
+import { TID, cidForCbor } from '@atproto/common'
+import { SeedClient, TestNetwork, basicSeed, usersSeed } from '@atproto/dev-env'
+import { repoPrepare } from '@atproto/pds'
+import { WriteOpAction } from '@atproto/repo'
+import { AtUri } from '@atproto/syntax'
 import { Database } from '../../src/data-plane/server/db'
+import { ids } from '../../src/lexicon/lexicons'
+import { forSnapshot } from '../_util'
 
 describe('indexing', () => {
   let network: TestNetwork
diff --git a/packages/bsky/tests/data-plane/subscription.test.ts b/packages/bsky/tests/data-plane/subscription.test.ts
index 6b52ccac650..cd1ff717e8c 100644
--- a/packages/bsky/tests/data-plane/subscription.test.ts
+++ b/packages/bsky/tests/data-plane/subscription.test.ts
@@ -1,9 +1,9 @@
 import { AtpAgent } from '@atproto/api'
 import { cborDecode, cborEncode } from '@atproto/common'
-import { DatabaseSchemaType } from '../../src/data-plane/server/db/database-schema'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { PreparedWrite, sequencer } from '@atproto/pds'
 import { CommitData } from '@atproto/repo'
+import { DatabaseSchemaType } from '../../src/data-plane/server/db/database-schema'
 import { ids } from '../../src/lexicon/lexicons'
 import { forSnapshot } from '../_util'
 
diff --git a/packages/bsky/tests/data-plane/thread-mutes.test.ts b/packages/bsky/tests/data-plane/thread-mutes.test.ts
index 5e96432463f..6fd839ebad0 100644
--- a/packages/bsky/tests/data-plane/thread-mutes.test.ts
+++ b/packages/bsky/tests/data-plane/thread-mutes.test.ts
@@ -1,5 +1,5 @@
-import { RecordRef, SeedClient, TestNetwork, usersSeed } from '@atproto/dev-env'
 import { AtpAgent } from '@atproto/api'
+import { RecordRef, SeedClient, TestNetwork, usersSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
 
 describe('thread mutes', () => {
diff --git a/packages/bsky/tests/entryway-auth.test.ts b/packages/bsky/tests/entryway-auth.test.ts
index 75d54248f31..b34ab12d119 100644
--- a/packages/bsky/tests/entryway-auth.test.ts
+++ b/packages/bsky/tests/entryway-auth.test.ts
@@ -1,12 +1,12 @@
+import assert from 'node:assert'
 import * as nodeCrypto from 'node:crypto'
+import * as jose from 'jose'
 import KeyEncoder from 'key-encoder'
 import * as ui8 from 'uint8arrays'
-import * as jose from 'jose'
-import * as crypto from '@atproto/crypto'
-import { AtpAgent, AtUri } from '@atproto/api'
-import { basicSeed, SeedClient, TestNetwork } from '@atproto/dev-env'
-import assert from 'node:assert'
+import { AtUri, AtpAgent } from '@atproto/api'
 import { MINUTE } from '@atproto/common'
+import * as crypto from '@atproto/crypto'
+import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 
 const keyEncoder = new KeyEncoder('secp256k1')
 
diff --git a/packages/bsky/tests/feed-generation.test.ts b/packages/bsky/tests/feed-generation.test.ts
index 47d144ea1b5..aac7b69c3d8 100644
--- a/packages/bsky/tests/feed-generation.test.ts
+++ b/packages/bsky/tests/feed-generation.test.ts
@@ -1,21 +1,21 @@
-import assert from 'assert'
-import { XRPCError } from '@atproto/xrpc'
-import { AuthRequiredError } from '@atproto/xrpc-server'
-import { TID } from '@atproto/common'
+import assert from 'node:assert'
 import { AtUri, AtpAgent } from '@atproto/api'
+import { TID } from '@atproto/common'
 import {
-  TestNetwork,
-  TestFeedGen,
-  SeedClient,
   RecordRef,
+  SeedClient,
+  TestFeedGen,
+  TestNetwork,
   basicSeed,
 } from '@atproto/dev-env'
-import { Handler as SkeletonHandler } from '../src/lexicon/types/app/bsky/feed/getFeedSkeleton'
+import { XRPCError } from '@atproto/xrpc'
+import { AuthRequiredError } from '@atproto/xrpc-server'
 import { ids } from '../src/lexicon/lexicons'
 import {
   FeedViewPost,
   SkeletonFeedPost,
 } from '../src/lexicon/types/app/bsky/feed/defs'
+import { Handler as SkeletonHandler } from '../src/lexicon/types/app/bsky/feed/getFeedSkeleton'
 import { forSnapshot, paginateAll } from './_util'
 
 describe('feed generation', () => {
diff --git a/packages/bsky/tests/hydration/util.test.ts b/packages/bsky/tests/hydration/util.test.ts
index 541746d6ca3..8796c934b79 100644
--- a/packages/bsky/tests/hydration/util.test.ts
+++ b/packages/bsky/tests/hydration/util.test.ts
@@ -1,7 +1,7 @@
 import {
   HydrationMap,
-  mergeMaps,
   mergeManyMaps,
+  mergeMaps,
   mergeNestedMaps,
 } from '../../src/hydration/util'
 
diff --git a/packages/bsky/tests/image/server.test.ts b/packages/bsky/tests/image/server.test.ts
index c2f9b21f8ef..57c4bb1d8d4 100644
--- a/packages/bsky/tests/image/server.test.ts
+++ b/packages/bsky/tests/image/server.test.ts
@@ -1,7 +1,7 @@
+import { Readable } from 'node:stream'
+import { CID } from 'multiformats/cid'
 import { cidForCbor } from '@atproto/common'
 import { TestNetwork, basicSeed } from '@atproto/dev-env'
-import { CID } from 'multiformats/cid'
-import { Readable } from 'node:stream'
 import { getInfo } from '../../src/image/sharp'
 import { ImageUriBuilder } from '../../src/image/uri'
 
diff --git a/packages/bsky/tests/image/uri.test.ts b/packages/bsky/tests/image/uri.test.ts
index 137e2359706..49a95001705 100644
--- a/packages/bsky/tests/image/uri.test.ts
+++ b/packages/bsky/tests/image/uri.test.ts
@@ -1,6 +1,6 @@
-import { cidForCbor } from '@atproto/common'
 import { CID } from 'multiformats/cid'
-import { ImageUriBuilder, BadPathError } from '../../src/image/uri'
+import { cidForCbor } from '@atproto/common'
+import { BadPathError, ImageUriBuilder } from '../../src/image/uri'
 
 describe('image uri builder', () => {
   let uriBuilder: ImageUriBuilder
diff --git a/packages/bsky/tests/label-hydration.test.ts b/packages/bsky/tests/label-hydration.test.ts
index ad5ceb482f6..c9711b24d40 100644
--- a/packages/bsky/tests/label-hydration.test.ts
+++ b/packages/bsky/tests/label-hydration.test.ts
@@ -1,5 +1,5 @@
 import { AtpAgent } from '@atproto/api'
-import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
+import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 
 describe('label hydration', () => {
   let network: TestNetwork
diff --git a/packages/bsky/tests/postgates.test.ts b/packages/bsky/tests/postgates.test.ts
index 5234fd77655..f2e8227f636 100644
--- a/packages/bsky/tests/postgates.test.ts
+++ b/packages/bsky/tests/postgates.test.ts
@@ -1,8 +1,7 @@
-import { TestNetwork, SeedClient, RecordRef } from '@atproto/dev-env'
 import AtpAgent, { AppBskyEmbedRecord } from '@atproto/api'
-
+import { SeedClient, TestNetwork } from '@atproto/dev-env'
 import { ids } from '../src/lexicon/lexicons'
-import { postgatesSeed, Users } from './seed/postgates'
+import { Users, postgatesSeed } from './seed/postgates'
 
 describe('postgates', () => {
   let network: TestNetwork
diff --git a/packages/bsky/tests/query-labels.test.ts b/packages/bsky/tests/query-labels.test.ts
index 4872143caf9..401bba89ecd 100644
--- a/packages/bsky/tests/query-labels.test.ts
+++ b/packages/bsky/tests/query-labels.test.ts
@@ -1,5 +1,5 @@
 import { AtpAgent } from '@atproto/api'
-import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
+import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 
 describe('label hydration', () => {
   let network: TestNetwork
diff --git a/packages/bsky/tests/seed/feed-hidden-replies.ts b/packages/bsky/tests/seed/feed-hidden-replies.ts
index ff64b599558..8df4cc6d439 100644
--- a/packages/bsky/tests/seed/feed-hidden-replies.ts
+++ b/packages/bsky/tests/seed/feed-hidden-replies.ts
@@ -1,4 +1,4 @@
-import { TestNetwork, SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
+import { SeedClient, TestNetwork, TestNetworkNoAppView } from '@atproto/dev-env'
 
 export type User = {
   id: string
diff --git a/packages/bsky/tests/seed/known-followers.ts b/packages/bsky/tests/seed/known-followers.ts
index 7d35dd45780..9764bea804e 100644
--- a/packages/bsky/tests/seed/known-followers.ts
+++ b/packages/bsky/tests/seed/known-followers.ts
@@ -1,4 +1,4 @@
-import { TestNetwork, SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
+import { SeedClient, TestNetwork, TestNetworkNoAppView } from '@atproto/dev-env'
 
 export type User = {
   email: string
diff --git a/packages/bsky/tests/seed/postgates.ts b/packages/bsky/tests/seed/postgates.ts
index 165a1a3ea74..35fdf825f94 100644
--- a/packages/bsky/tests/seed/postgates.ts
+++ b/packages/bsky/tests/seed/postgates.ts
@@ -1,4 +1,4 @@
-import { TestNetwork, SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
+import { SeedClient, TestNetwork, TestNetworkNoAppView } from '@atproto/dev-env'
 
 export type User = {
   id: string
diff --git a/packages/bsky/tests/server.test.ts b/packages/bsky/tests/server.test.ts
index e10e0f66bb1..57b5f27fc53 100644
--- a/packages/bsky/tests/server.test.ts
+++ b/packages/bsky/tests/server.test.ts
@@ -1,9 +1,9 @@
-import { TestNetwork, basicSeed } from '@atproto/dev-env'
-import express from 'express'
 import { once } from 'node:events'
 import { AddressInfo } from 'node:net'
 import { finished } from 'node:stream/promises'
+import express from 'express'
 import { request } from 'undici'
+import { TestNetwork, basicSeed } from '@atproto/dev-env'
 import { handler as errorHandler } from '../src/error'
 import { startServer } from './_util'
 
diff --git a/packages/bsky/tests/views/account-deactivation.test.ts b/packages/bsky/tests/views/account-deactivation.test.ts
index 1efebfdf12e..0ad577b849e 100644
--- a/packages/bsky/tests/views/account-deactivation.test.ts
+++ b/packages/bsky/tests/views/account-deactivation.test.ts
@@ -1,5 +1,5 @@
 import { AtpAgent } from '@atproto/api'
-import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
+import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
 
 describe('bsky account deactivation', () => {
diff --git a/packages/bsky/tests/views/actor-likes.test.ts b/packages/bsky/tests/views/actor-likes.test.ts
index 6879bc58240..cd85a7e8ff6 100644
--- a/packages/bsky/tests/views/actor-likes.test.ts
+++ b/packages/bsky/tests/views/actor-likes.test.ts
@@ -1,5 +1,5 @@
 import { AtUri, AtpAgent } from '@atproto/api'
-import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
+import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
 
 describe('bsky actor likes feed views', () => {
diff --git a/packages/bsky/tests/views/actor-search.test.ts b/packages/bsky/tests/views/actor-search.test.ts
index c82a87d8e33..4e6d022dc71 100644
--- a/packages/bsky/tests/views/actor-search.test.ts
+++ b/packages/bsky/tests/views/actor-search.test.ts
@@ -1,8 +1,8 @@
 import { AtpAgent } from '@atproto/api'
 import { wait } from '@atproto/common'
-import { TestNetwork, SeedClient, usersBulkSeed } from '@atproto/dev-env'
-import { forSnapshot, paginateAll, stripViewer } from '../_util'
+import { SeedClient, TestNetwork, usersBulkSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
+import { forSnapshot, paginateAll, stripViewer } from '../_util'
 
 // @NOTE skipped to help with CI failures
 // The search code is not used in production & we should switch it out for tests on the search proxy interface
diff --git a/packages/bsky/tests/views/author-feed.test.ts b/packages/bsky/tests/views/author-feed.test.ts
index 6c42ab04c45..2e473d48a76 100644
--- a/packages/bsky/tests/views/author-feed.test.ts
+++ b/packages/bsky/tests/views/author-feed.test.ts
@@ -1,19 +1,19 @@
-import { AtpAgent, AppBskyActorProfile, AppBskyFeedDefs } from '@atproto/api'
-import { TestNetwork, SeedClient, authorFeedSeed } from '@atproto/dev-env'
+import { AppBskyActorProfile, AppBskyFeedDefs, AtpAgent } from '@atproto/api'
+import { SeedClient, TestNetwork, authorFeedSeed } from '@atproto/dev-env'
+import { ids } from '../../src/lexicon/lexicons'
+import { isView as isImageEmbed } from '../../src/lexicon/types/app/bsky/embed/images'
+import { isView as isEmbedRecordWithMedia } from '../../src/lexicon/types/app/bsky/embed/recordWithMedia'
+import { isView as isVideoEmbed } from '../../src/lexicon/types/app/bsky/embed/video'
+import { isPostView } from '../../src/lexicon/types/app/bsky/feed/defs'
+import { ReplyRef, isRecord } from '../../src/lexicon/types/app/bsky/feed/post'
+import { uriToDid } from '../../src/util/uris'
+import { VideoEmbed } from '../../src/views/types'
 import {
   forSnapshot,
   paginateAll,
   stripViewer,
   stripViewerFromPost,
 } from '../_util'
-import { ReplyRef, isRecord } from '../../src/lexicon/types/app/bsky/feed/post'
-import { isView as isEmbedRecordWithMedia } from '../../src/lexicon/types/app/bsky/embed/recordWithMedia'
-import { isView as isImageEmbed } from '../../src/lexicon/types/app/bsky/embed/images'
-import { isView as isVideoEmbed } from '../../src/lexicon/types/app/bsky/embed/video'
-import { isPostView } from '../../src/lexicon/types/app/bsky/feed/defs'
-import { uriToDid } from '../../src/util/uris'
-import { ids } from '../../src/lexicon/lexicons'
-import { VideoEmbed } from '../../src/views/types'
 
 describe('pds author feed views', () => {
   let network: TestNetwork
diff --git a/packages/bsky/tests/views/block-lists.test.ts b/packages/bsky/tests/views/block-lists.test.ts
index df5dd3d2874..10eeb66c9b5 100644
--- a/packages/bsky/tests/views/block-lists.test.ts
+++ b/packages/bsky/tests/views/block-lists.test.ts
@@ -1,7 +1,7 @@
-import { AtpAgent, AtUri } from '@atproto/api'
-import { TestNetwork, SeedClient, RecordRef, basicSeed } from '@atproto/dev-env'
-import { forSnapshot } from '../_util'
+import { AtUri, AtpAgent } from '@atproto/api'
+import { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
+import { forSnapshot } from '../_util'
 
 describe('pds views with blocking from block lists', () => {
   let network: TestNetwork
diff --git a/packages/bsky/tests/views/blocks.test.ts b/packages/bsky/tests/views/blocks.test.ts
index 848b8f89c20..a0e5a599625 100644
--- a/packages/bsky/tests/views/blocks.test.ts
+++ b/packages/bsky/tests/views/blocks.test.ts
@@ -1,8 +1,8 @@
-import assert from 'assert'
-import { TestNetwork, RecordRef, SeedClient, basicSeed } from '@atproto/dev-env'
-import { AtpAgent, AtUri } from '@atproto/api'
-import { assertIsThreadViewPost, forSnapshot } from '../_util'
+import assert from 'node:assert'
+import { AtUri, AtpAgent } from '@atproto/api'
+import { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
+import { assertIsThreadViewPost, forSnapshot } from '../_util'
 
 describe('pds views with blocking', () => {
   let network: TestNetwork
diff --git a/packages/bsky/tests/views/feed-hidden-replies.test.ts b/packages/bsky/tests/views/feed-hidden-replies.test.ts
index a75dde85400..9330bb08876 100644
--- a/packages/bsky/tests/views/feed-hidden-replies.test.ts
+++ b/packages/bsky/tests/views/feed-hidden-replies.test.ts
@@ -1,8 +1,7 @@
-import { TestNetwork, SeedClient } from '@atproto/dev-env'
 import AtpAgent from '@atproto/api'
-
+import { SeedClient, TestNetwork } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
-import { feedHiddenRepliesSeed, Users } from '../seed/feed-hidden-replies'
+import { Users, feedHiddenRepliesSeed } from '../seed/feed-hidden-replies'
 
 describe('feed hidden replies', () => {
   let network: TestNetwork
diff --git a/packages/bsky/tests/views/feed-view-post.test.ts b/packages/bsky/tests/views/feed-view-post.test.ts
index 532a2c9074d..d9fd35da1d8 100644
--- a/packages/bsky/tests/views/feed-view-post.test.ts
+++ b/packages/bsky/tests/views/feed-view-post.test.ts
@@ -1,5 +1,5 @@
-import { AtpAgent, AppBskyFeedDefs, AtUri } from '@atproto/api'
-import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
+import { AppBskyFeedDefs, AtUri, AtpAgent } from '@atproto/api'
+import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
 
 /**
diff --git a/packages/bsky/tests/views/follows.test.ts b/packages/bsky/tests/views/follows.test.ts
index 83aa3a40dd6..d0018ed4f6b 100644
--- a/packages/bsky/tests/views/follows.test.ts
+++ b/packages/bsky/tests/views/follows.test.ts
@@ -1,7 +1,7 @@
 import { AtpAgent } from '@atproto/api'
-import { TestNetwork, SeedClient, followsSeed } from '@atproto/dev-env'
-import { forSnapshot, paginateAll, stripViewer } from '../_util'
+import { SeedClient, TestNetwork, followsSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
+import { forSnapshot, paginateAll, stripViewer } from '../_util'
 
 describe('pds follow views', () => {
   let agent: AtpAgent
diff --git a/packages/bsky/tests/views/known-followers.test.ts b/packages/bsky/tests/views/known-followers.test.ts
index dbeb128f526..756876fcf78 100644
--- a/packages/bsky/tests/views/known-followers.test.ts
+++ b/packages/bsky/tests/views/known-followers.test.ts
@@ -1,8 +1,7 @@
-import { TestNetwork, SeedClient } from '@atproto/dev-env'
 import { AtpAgent } from '@atproto/api'
-
-import { knownFollowersSeed } from '../seed/known-followers'
+import { SeedClient, TestNetwork } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
+import { knownFollowersSeed } from '../seed/known-followers'
 
 describe('known followers (social proof)', () => {
   let network: TestNetwork
diff --git a/packages/bsky/tests/views/labeler-service.test.ts b/packages/bsky/tests/views/labeler-service.test.ts
index a979667aa6d..e78517f0fff 100644
--- a/packages/bsky/tests/views/labeler-service.test.ts
+++ b/packages/bsky/tests/views/labeler-service.test.ts
@@ -1,7 +1,7 @@
 import { AtpAgent } from '@atproto/api'
-import { TestNetwork, SeedClient, basicSeed, RecordRef } from '@atproto/dev-env'
-import { forSnapshot, stripViewerFromLabeler } from '../_util'
+import { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
+import { forSnapshot, stripViewerFromLabeler } from '../_util'
 
 describe('labeler service views', () => {
   let network: TestNetwork
diff --git a/packages/bsky/tests/views/labels-needs-review.test.ts b/packages/bsky/tests/views/labels-needs-review.test.ts
index c91845f20d5..dbd37bdb1c3 100644
--- a/packages/bsky/tests/views/labels-needs-review.test.ts
+++ b/packages/bsky/tests/views/labels-needs-review.test.ts
@@ -1,7 +1,7 @@
+import assert from 'node:assert'
 import { AtpAgent } from '@atproto/api'
-import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
+import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
-import assert from 'assert'
 import { isThreadViewPost } from '../../src/lexicon/types/app/bsky/feed/defs'
 
 describe('bsky needs-review labels', () => {
diff --git a/packages/bsky/tests/views/labels-takedown.test.ts b/packages/bsky/tests/views/labels-takedown.test.ts
index f77e9820c8b..98b59810268 100644
--- a/packages/bsky/tests/views/labels-takedown.test.ts
+++ b/packages/bsky/tests/views/labels-takedown.test.ts
@@ -1,5 +1,5 @@
 import { AtpAgent } from '@atproto/api'
-import { TestNetwork, SeedClient, basicSeed, RecordRef } from '@atproto/dev-env'
+import { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
 
 describe('bsky takedown labels', () => {
diff --git a/packages/bsky/tests/views/likes.test.ts b/packages/bsky/tests/views/likes.test.ts
index a3d889ae9f0..427f2af7167 100644
--- a/packages/bsky/tests/views/likes.test.ts
+++ b/packages/bsky/tests/views/likes.test.ts
@@ -1,7 +1,7 @@
 import { AtpAgent } from '@atproto/api'
-import { TestNetwork, SeedClient, likesSeed } from '@atproto/dev-env'
-import { constantDate, forSnapshot, paginateAll, stripViewer } from '../_util'
+import { SeedClient, TestNetwork, likesSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
+import { constantDate, forSnapshot, paginateAll, stripViewer } from '../_util'
 
 describe('pds like views', () => {
   let network: TestNetwork
diff --git a/packages/bsky/tests/views/list-feed.test.ts b/packages/bsky/tests/views/list-feed.test.ts
index d0b0302d69d..f869119f634 100644
--- a/packages/bsky/tests/views/list-feed.test.ts
+++ b/packages/bsky/tests/views/list-feed.test.ts
@@ -1,12 +1,12 @@
 import { AtpAgent } from '@atproto/api'
-import { TestNetwork, SeedClient, RecordRef, basicSeed } from '@atproto/dev-env'
+import { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
+import { ids } from '../../src/lexicon/lexicons'
 import {
   forSnapshot,
   paginateAll,
   stripViewer,
   stripViewerFromPost,
 } from '../_util'
-import { ids } from '../../src/lexicon/lexicons'
 
 describe('list feed views', () => {
   let network: TestNetwork
diff --git a/packages/bsky/tests/views/lists.test.ts b/packages/bsky/tests/views/lists.test.ts
index 15266746d2b..3f104596132 100644
--- a/packages/bsky/tests/views/lists.test.ts
+++ b/packages/bsky/tests/views/lists.test.ts
@@ -1,7 +1,7 @@
 import { AtpAgent } from '@atproto/api'
-import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
-import { forSnapshot } from '../_util'
+import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
+import { forSnapshot } from '../_util'
 
 describe('bsky actor likes feed views', () => {
   let network: TestNetwork
diff --git a/packages/bsky/tests/views/mute-lists.test.ts b/packages/bsky/tests/views/mute-lists.test.ts
index c4e25828d7d..9b2af4d996b 100644
--- a/packages/bsky/tests/views/mute-lists.test.ts
+++ b/packages/bsky/tests/views/mute-lists.test.ts
@@ -1,7 +1,7 @@
-import { AtpAgent, AtUri } from '@atproto/api'
-import { TestNetwork, SeedClient, RecordRef, basicSeed } from '@atproto/dev-env'
-import { forSnapshot } from '../_util'
+import { AtUri, AtpAgent } from '@atproto/api'
+import { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
+import { forSnapshot } from '../_util'
 
 describe('bsky views with mutes from mute lists', () => {
   let network: TestNetwork
diff --git a/packages/bsky/tests/views/mutes.test.ts b/packages/bsky/tests/views/mutes.test.ts
index 5536a115d68..657254db3d1 100644
--- a/packages/bsky/tests/views/mutes.test.ts
+++ b/packages/bsky/tests/views/mutes.test.ts
@@ -1,12 +1,12 @@
 import { AtpAgent } from '@atproto/api'
 import {
-  TestNetwork,
   SeedClient,
+  TestNetwork,
   basicSeed,
   usersBulkSeed,
 } from '@atproto/dev-env'
-import { forSnapshot, paginateAll } from '../_util'
 import { ids } from '../../src/lexicon/lexicons'
+import { forSnapshot, paginateAll } from '../_util'
 
 describe('mute views', () => {
   let network: TestNetwork
diff --git a/packages/bsky/tests/views/notifications.test.ts b/packages/bsky/tests/views/notifications.test.ts
index ca933d3085e..94250ae1bb3 100644
--- a/packages/bsky/tests/views/notifications.test.ts
+++ b/packages/bsky/tests/views/notifications.test.ts
@@ -1,8 +1,8 @@
 import { AtpAgent } from '@atproto/api'
-import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
-import { forSnapshot, paginateAll } from '../_util'
-import { Notification } from '../../src/lexicon/types/app/bsky/notification/listNotifications'
+import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
+import { Notification } from '../../src/lexicon/types/app/bsky/notification/listNotifications'
+import { forSnapshot, paginateAll } from '../_util'
 
 describe('notification views', () => {
   let network: TestNetwork
diff --git a/packages/bsky/tests/views/posts.test.ts b/packages/bsky/tests/views/posts.test.ts
index 8fbaab77019..56f89832f73 100644
--- a/packages/bsky/tests/views/posts.test.ts
+++ b/packages/bsky/tests/views/posts.test.ts
@@ -1,9 +1,9 @@
 import { AppBskyFeedPost, AtpAgent } from '@atproto/api'
-import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
-import { forSnapshot, stripViewerFromPost } from '../_util'
-import { RecordEmbed, VideoEmbed } from '../../src/views/types'
+import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { RecordWithMedia } from '../../dist/views/types'
 import { ids } from '../../src/lexicon/lexicons'
+import { RecordEmbed, VideoEmbed } from '../../src/views/types'
+import { forSnapshot, stripViewerFromPost } from '../_util'
 
 describe('pds posts views', () => {
   let network: TestNetwork
diff --git a/packages/bsky/tests/views/profile.test.ts b/packages/bsky/tests/views/profile.test.ts
index 792cd04c8b6..c74168c9be8 100644
--- a/packages/bsky/tests/views/profile.test.ts
+++ b/packages/bsky/tests/views/profile.test.ts
@@ -1,8 +1,8 @@
-import fs from 'fs/promises'
+import fs from 'node:fs/promises'
 import { AtpAgent } from '@atproto/api'
-import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
-import { forSnapshot, stripViewer } from '../_util'
+import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
+import { forSnapshot, stripViewer } from '../_util'
 
 describe('pds profile views', () => {
   let network: TestNetwork
diff --git a/packages/bsky/tests/views/quotes.test.ts b/packages/bsky/tests/views/quotes.test.ts
index 7efe4ad242a..46b8c053863 100644
--- a/packages/bsky/tests/views/quotes.test.ts
+++ b/packages/bsky/tests/views/quotes.test.ts
@@ -1,7 +1,7 @@
-import { quotesSeed, SeedClient, TestNetwork } from '@atproto/dev-env'
 import AtpAgent from '@atproto/api'
-import { forSnapshot } from '../_util'
+import { SeedClient, TestNetwork, quotesSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
+import { forSnapshot } from '../_util'
 
 describe('pds quote views', () => {
   let network: TestNetwork
diff --git a/packages/bsky/tests/views/reposts.test.ts b/packages/bsky/tests/views/reposts.test.ts
index ad03455e78c..2f8b3fb5509 100644
--- a/packages/bsky/tests/views/reposts.test.ts
+++ b/packages/bsky/tests/views/reposts.test.ts
@@ -1,7 +1,7 @@
 import { AtpAgent } from '@atproto/api'
-import { TestNetwork, SeedClient, repostsSeed } from '@atproto/dev-env'
-import { forSnapshot, paginateAll, stripViewer } from '../_util'
+import { SeedClient, TestNetwork, repostsSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
+import { forSnapshot, paginateAll, stripViewer } from '../_util'
 
 describe('pds repost views', () => {
   let network: TestNetwork
diff --git a/packages/bsky/tests/views/starter-packs.test.ts b/packages/bsky/tests/views/starter-packs.test.ts
index d78e93d0d9f..5751c948884 100644
--- a/packages/bsky/tests/views/starter-packs.test.ts
+++ b/packages/bsky/tests/views/starter-packs.test.ts
@@ -1,9 +1,9 @@
+import assert from 'node:assert'
 import { AtpAgent } from '@atproto/api'
-import { TestNetwork, SeedClient, RecordRef, basicSeed } from '@atproto/dev-env'
+import { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
+import { ids } from '../../src/lexicon/lexicons'
 import { isRecord as isProfile } from '../../src/lexicon/types/app/bsky/actor/profile'
 import { forSnapshot } from '../_util'
-import assert from 'assert'
-import { ids } from '../../src/lexicon/lexicons'
 
 describe('starter packs', () => {
   let network: TestNetwork
diff --git a/packages/bsky/tests/views/suggested-follows.test.ts b/packages/bsky/tests/views/suggested-follows.test.ts
index eb647bd2343..9ea187edd4c 100644
--- a/packages/bsky/tests/views/suggested-follows.test.ts
+++ b/packages/bsky/tests/views/suggested-follows.test.ts
@@ -1,5 +1,5 @@
-import { AtpAgent, AtUri } from '@atproto/api'
-import { TestNetwork, SeedClient, likesSeed } from '@atproto/dev-env'
+import { AtUri, AtpAgent } from '@atproto/api'
+import { SeedClient, TestNetwork, likesSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
 
 describe('suggested follows', () => {
diff --git a/packages/bsky/tests/views/suggestions.test.ts b/packages/bsky/tests/views/suggestions.test.ts
index c7628fda04d..7e43dbab5d5 100644
--- a/packages/bsky/tests/views/suggestions.test.ts
+++ b/packages/bsky/tests/views/suggestions.test.ts
@@ -1,7 +1,7 @@
 import { AtpAgent } from '@atproto/api'
-import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
-import { stripViewer } from '../_util'
+import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
+import { stripViewer } from '../_util'
 
 describe('pds user search views', () => {
   let network: TestNetwork
diff --git a/packages/bsky/tests/views/thread.test.ts b/packages/bsky/tests/views/thread.test.ts
index 67c9f66dd0b..4b46f06b4fd 100644
--- a/packages/bsky/tests/views/thread.test.ts
+++ b/packages/bsky/tests/views/thread.test.ts
@@ -1,11 +1,11 @@
 import { AppBskyFeedGetPostThread, AtpAgent } from '@atproto/api'
-import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
+import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
+import { ids } from '../../src/lexicon/lexicons'
 import {
   assertIsThreadViewPost,
   forSnapshot,
   stripViewerFromThread,
 } from '../_util'
-import { ids } from '../../src/lexicon/lexicons'
 
 describe('pds thread views', () => {
   let network: TestNetwork
diff --git a/packages/bsky/tests/views/threadgating.test.ts b/packages/bsky/tests/views/threadgating.test.ts
index 2a459e24f5c..260c1b8af21 100644
--- a/packages/bsky/tests/views/threadgating.test.ts
+++ b/packages/bsky/tests/views/threadgating.test.ts
@@ -1,12 +1,12 @@
-import assert from 'assert'
+import assert from 'node:assert'
 import { AtpAgent } from '@atproto/api'
-import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
+import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
+import { ids } from '../../src/lexicon/lexicons'
 import {
   isNotFoundPost,
   isThreadViewPost,
 } from '../../src/lexicon/types/app/bsky/feed/defs'
 import { forSnapshot } from '../_util'
-import { ids } from '../../src/lexicon/lexicons'
 
 describe('views with thread gating', () => {
   let network: TestNetwork
diff --git a/packages/bsky/tests/views/timeline.test.ts b/packages/bsky/tests/views/timeline.test.ts
index 53e6d2d2250..46727b0740f 100644
--- a/packages/bsky/tests/views/timeline.test.ts
+++ b/packages/bsky/tests/views/timeline.test.ts
@@ -1,15 +1,15 @@
-import assert from 'assert'
+import assert from 'node:assert'
 import { AtpAgent } from '@atproto/api'
 import {
-  TestNetwork,
+  EXAMPLE_LABELER,
   SeedClient,
+  TestNetwork,
   basicSeed,
-  EXAMPLE_LABELER,
 } from '@atproto/dev-env'
-import { forSnapshot, getOriginator, paginateAll } from '../_util'
-import { FeedViewPost } from '../../src/lexicon/types/app/bsky/feed/defs'
 import { Database } from '../../src'
 import { ids } from '../../src/lexicon/lexicons'
+import { FeedViewPost } from '../../src/lexicon/types/app/bsky/feed/defs'
+import { forSnapshot, getOriginator, paginateAll } from '../_util'
 
 const REVERSE_CHRON = 'reverse-chronological'
 
diff --git a/packages/bsync/bin/migration-create.ts b/packages/bsync/bin/migration-create.ts
index b51c536c4f2..8a483456bef 100644
--- a/packages/bsync/bin/migration-create.ts
+++ b/packages/bsync/bin/migration-create.ts
@@ -1,7 +1,7 @@
 #!/usr/bin/env ts-node
 
-import * as fs from 'fs/promises'
-import * as path from 'path'
+import * as fs from 'node:fs/promises'
+import * as path from 'node:path'
 
 export async function main() {
   const now = new Date()
diff --git a/packages/bsync/package.json b/packages/bsync/package.json
index d9d48fe2f5a..bb339cf6251 100644
--- a/packages/bsync/package.json
+++ b/packages/bsync/package.json
@@ -24,6 +24,9 @@
     "migration:create": "ts-node ./bin/migration-create.ts",
     "buf:gen": "buf generate proto"
   },
+  "engines": {
+    "node": ">=18.7.0"
+  },
   "dependencies": {
     "@atproto/common": "workspace:^",
     "@atproto/syntax": "workspace:^",
diff --git a/packages/bsync/src/config.ts b/packages/bsync/src/config.ts
index d5ea4454c2d..0627f433b37 100644
--- a/packages/bsync/src/config.ts
+++ b/packages/bsync/src/config.ts
@@ -1,5 +1,5 @@
 import assert from 'node:assert'
-import { envInt, envStr, envList, envBool } from '@atproto/common'
+import { envBool, envInt, envList, envStr } from '@atproto/common'
 
 export const envToCfg = (env: ServerEnvironment): ServerConfig => {
   const serviceCfg: ServerConfig['service'] = {
diff --git a/packages/bsync/src/context.ts b/packages/bsync/src/context.ts
index 66a63510ad2..28ada97d859 100644
--- a/packages/bsync/src/context.ts
+++ b/packages/bsync/src/context.ts
@@ -1,9 +1,9 @@
+import { EventEmitter } from 'node:stream'
 import TypedEventEmitter from 'typed-emitter'
 import { ServerConfig } from './config'
-import Database from './db'
+import { Database } from './db'
 import { createMuteOpChannel } from './db/schema/mute_op'
 import { createNotifOpChannel } from './db/schema/notif_op'
-import { EventEmitter } from 'stream'
 
 export type AppContextOptions = {
   db: Database
@@ -40,8 +40,6 @@ export class AppContext {
   }
 }
 
-export default AppContext
-
 export type AppEvents = {
   [createMuteOpChannel]: () => void
   [createNotifOpChannel]: () => void
diff --git a/packages/bsync/src/db/index.ts b/packages/bsync/src/db/index.ts
index 6fa14f365dd..ec986064bd3 100644
--- a/packages/bsync/src/db/index.ts
+++ b/packages/bsync/src/db/index.ts
@@ -1,23 +1,23 @@
-import assert from 'assert'
+import assert from 'node:assert'
+import { EventEmitter } from 'node:stream'
 import {
   Kysely,
-  PostgresDialect,
-  Migrator,
   KyselyPlugin,
+  Migrator,
   PluginTransformQueryArgs,
   PluginTransformResultArgs,
-  RootOperationNode,
+  PostgresDialect,
   QueryResult,
+  RootOperationNode,
   UnknownRow,
 } from 'kysely'
-import TypedEmitter from 'typed-emitter'
 import { Pool as PgPool, types as pgTypes } from 'pg'
-import DatabaseSchema, { DatabaseSchemaType } from './schema'
-import { PgOptions } from './types'
+import TypedEmitter from 'typed-emitter'
 import { dbLogger } from '../logger'
-import { EventEmitter } from 'stream'
 import * as migrations from './migrations'
 import { DbMigrationProvider } from './migrations/provider'
+import { DatabaseSchema, DatabaseSchemaType } from './schema'
+import { PgOptions } from './types'
 
 export class Database {
   pool: PgPool
diff --git a/packages/bsync/src/db/schema/index.ts b/packages/bsync/src/db/schema/index.ts
index 922286feb10..b82b0494cf9 100644
--- a/packages/bsync/src/db/schema/index.ts
+++ b/packages/bsync/src/db/schema/index.ts
@@ -1,8 +1,8 @@
 import { Kysely } from 'kysely'
-import * as muteOp from './mute_op'
 import * as muteItem from './mute_item'
-import * as notifOp from './notif_op'
+import * as muteOp from './mute_op'
 import * as notifItem from './notif_item'
+import * as notifOp from './notif_op'
 
 export type DatabaseSchemaType = muteItem.PartialDB &
   muteOp.PartialDB &
diff --git a/packages/bsync/src/db/types.ts b/packages/bsync/src/db/types.ts
index c38271ee119..015dca7c20c 100644
--- a/packages/bsync/src/db/types.ts
+++ b/packages/bsync/src/db/types.ts
@@ -1,5 +1,5 @@
-import { Pool as PgPool } from 'pg'
 import { DynamicModule, RawBuilder, SelectQueryBuilder } from 'kysely'
+import { Pool as PgPool } from 'pg'
 
 export type DbRef = RawBuilder | ReturnType<DynamicModule['ref']>
 
diff --git a/packages/bsync/src/index.ts b/packages/bsync/src/index.ts
index bf9b944267f..2c21a5d7069 100644
--- a/packages/bsync/src/index.ts
+++ b/packages/bsync/src/index.ts
@@ -1,13 +1,13 @@
-import http from 'node:http'
 import events from 'node:events'
-import { createHttpTerminator, HttpTerminator } from 'http-terminator'
+import http from 'node:http'
 import { connectNodeAdapter } from '@connectrpc/connect-node'
-import { dbLogger, loggerMiddleware } from './logger'
-import AppContext, { AppContextOptions } from './context'
+import { HttpTerminator, createHttpTerminator } from 'http-terminator'
 import { ServerConfig } from './config'
-import routes from './routes'
+import { AppContext, AppContextOptions } from './context'
 import { createMuteOpChannel } from './db/schema/mute_op'
 import { createNotifOpChannel } from './db/schema/notif_op'
+import { dbLogger, loggerMiddleware } from './logger'
+import routes from './routes'
 
 export * from './config'
 export * from './client'
diff --git a/packages/bsync/src/logger.ts b/packages/bsync/src/logger.ts
index daf2e039016..86ef378f59a 100644
--- a/packages/bsync/src/logger.ts
+++ b/packages/bsync/src/logger.ts
@@ -1,5 +1,5 @@
 import { type IncomingMessage } from 'node:http'
-import pinoHttp, { stdSerializers } from 'pino-http'
+import { pinoHttp, stdSerializers } from 'pino-http'
 import { obfuscateHeaders, subsystemLogger } from '@atproto/common'
 
 export const dbLogger: ReturnType<typeof subsystemLogger> =
diff --git a/packages/bsync/src/routes/add-mute-operation.ts b/packages/bsync/src/routes/add-mute-operation.ts
index 7d96a8c2140..94acfb0c71e 100644
--- a/packages/bsync/src/routes/add-mute-operation.ts
+++ b/packages/bsync/src/routes/add-mute-operation.ts
@@ -1,12 +1,12 @@
+import { Code, ConnectError, ServiceImpl } from '@connectrpc/connect'
 import { sql } from 'kysely'
 import { AtUri } from '@atproto/syntax'
-import { Code, ConnectError, ServiceImpl } from '@connectrpc/connect'
+import { AppContext } from '../context'
+import { Database } from '../db'
+import { createMuteOpChannel } from '../db/schema/mute_op'
 import { Service } from '../proto/bsync_connect'
 import { AddMuteOperationResponse, MuteOperation_Type } from '../proto/bsync_pb'
-import AppContext from '../context'
-import { createMuteOpChannel } from '../db/schema/mute_op'
 import { authWithApiKey } from './auth'
-import Database from '../db'
 import { isValidAtUri, isValidDid } from './util'
 
 export default (ctx: AppContext): Partial<ServiceImpl<typeof Service>> => ({
diff --git a/packages/bsync/src/routes/add-notif-operation.ts b/packages/bsync/src/routes/add-notif-operation.ts
index a412346a8d4..77ff0b91700 100644
--- a/packages/bsync/src/routes/add-notif-operation.ts
+++ b/packages/bsync/src/routes/add-notif-operation.ts
@@ -1,11 +1,11 @@
-import { sql } from 'kysely'
 import { Code, ConnectError, ServiceImpl } from '@connectrpc/connect'
+import { sql } from 'kysely'
+import { AppContext } from '../context'
+import { Database } from '../db'
+import { createNotifOpChannel } from '../db/schema/notif_op'
 import { Service } from '../proto/bsync_connect'
 import { AddNotifOperationResponse } from '../proto/bsync_pb'
-import AppContext from '../context'
 import { authWithApiKey } from './auth'
-import Database from '../db'
-import { createNotifOpChannel } from '../db/schema/notif_op'
 import { isValidDid } from './util'
 
 export default (ctx: AppContext): Partial<ServiceImpl<typeof Service>> => ({
diff --git a/packages/bsync/src/routes/auth.ts b/packages/bsync/src/routes/auth.ts
index 003bb03ad9b..fd0339bd157 100644
--- a/packages/bsync/src/routes/auth.ts
+++ b/packages/bsync/src/routes/auth.ts
@@ -1,5 +1,5 @@
 import { Code, ConnectError, HandlerContext } from '@connectrpc/connect'
-import AppContext from '../context'
+import { AppContext } from '../context'
 
 const BEARER = 'Bearer '
 
diff --git a/packages/bsync/src/routes/index.ts b/packages/bsync/src/routes/index.ts
index 5bdb654d16e..6e3282b167c 100644
--- a/packages/bsync/src/routes/index.ts
+++ b/packages/bsync/src/routes/index.ts
@@ -1,10 +1,10 @@
-import { sql } from 'kysely'
 import { ConnectRouter } from '@connectrpc/connect'
+import { sql } from 'kysely'
+import { AppContext } from '../context'
 import { Service } from '../proto/bsync_connect'
-import AppContext from '../context'
 import addMuteOperation from './add-mute-operation'
-import scanMuteOperations from './scan-mute-operations'
 import addNotifOperation from './add-notif-operation'
+import scanMuteOperations from './scan-mute-operations'
 import scanNotifOperations from './scan-notif-operations'
 
 export default (ctx: AppContext) => (router: ConnectRouter) => {
diff --git a/packages/bsync/src/routes/scan-mute-operations.ts b/packages/bsync/src/routes/scan-mute-operations.ts
index cf49067988e..8aaa5745799 100644
--- a/packages/bsync/src/routes/scan-mute-operations.ts
+++ b/packages/bsync/src/routes/scan-mute-operations.ts
@@ -1,9 +1,9 @@
 import { once } from 'node:events'
 import { ServiceImpl } from '@connectrpc/connect'
+import { AppContext } from '../context'
+import { createMuteOpChannel } from '../db/schema/mute_op'
 import { Service } from '../proto/bsync_connect'
 import { ScanMuteOperationsResponse } from '../proto/bsync_pb'
-import AppContext from '../context'
-import { createMuteOpChannel } from '../db/schema/mute_op'
 import { authWithApiKey } from './auth'
 import { combineSignals, validCursor } from './util'
 
diff --git a/packages/bsync/src/routes/scan-notif-operations.ts b/packages/bsync/src/routes/scan-notif-operations.ts
index 769e2260bcf..0f8437063c8 100644
--- a/packages/bsync/src/routes/scan-notif-operations.ts
+++ b/packages/bsync/src/routes/scan-notif-operations.ts
@@ -1,11 +1,11 @@
 import { once } from 'node:events'
 import { ServiceImpl } from '@connectrpc/connect'
+import { AppContext } from '../context'
+import { createNotifOpChannel } from '../db/schema/notif_op'
 import { Service } from '../proto/bsync_connect'
 import { ScanNotifOperationsResponse } from '../proto/bsync_pb'
-import AppContext from '../context'
 import { authWithApiKey } from './auth'
 import { combineSignals, validCursor } from './util'
-import { createNotifOpChannel } from '../db/schema/notif_op'
 
 export default (ctx: AppContext): Partial<ServiceImpl<typeof Service>> => ({
   async scanNotifOperations(req, handlerCtx) {
diff --git a/packages/bsync/tests/mutes.test.ts b/packages/bsync/tests/mutes.test.ts
index 9595015c8a3..4c0fb483f2f 100644
--- a/packages/bsync/tests/mutes.test.ts
+++ b/packages/bsync/tests/mutes.test.ts
@@ -1,6 +1,6 @@
-import { wait } from '@atproto/common'
-import getPort from 'get-port'
 import { Code, ConnectError } from '@connectrpc/connect'
+import getPort from 'get-port'
+import { wait } from '@atproto/common'
 import {
   BsyncClient,
   BsyncService,
diff --git a/packages/bsync/tests/notifications.test.ts b/packages/bsync/tests/notifications.test.ts
index 5de164a7e7b..70d4d7b80b3 100644
--- a/packages/bsync/tests/notifications.test.ts
+++ b/packages/bsync/tests/notifications.test.ts
@@ -1,6 +1,6 @@
-import { wait } from '@atproto/common'
-import getPort from 'get-port'
 import { Code, ConnectError } from '@connectrpc/connect'
+import getPort from 'get-port'
+import { wait } from '@atproto/common'
 import {
   BsyncClient,
   BsyncService,
diff --git a/packages/common-web/src/tid.ts b/packages/common-web/src/tid.ts
index d802956854e..2f9e1874641 100644
--- a/packages/common-web/src/tid.ts
+++ b/packages/common-web/src/tid.ts
@@ -1,4 +1,4 @@
-import { s32encode, s32decode } from './util'
+import { s32decode, s32encode } from './util'
 
 const TID_LEN = 13
 
@@ -108,5 +108,3 @@ export class TID {
     return this.compareTo(other) < 0
   }
 }
-
-export default TID
diff --git a/packages/common-web/tests/check.test.ts b/packages/common-web/tests/check.test.ts
index d17b88bdb15..4fafbf0a0fa 100644
--- a/packages/common-web/tests/check.test.ts
+++ b/packages/common-web/tests/check.test.ts
@@ -1,5 +1,5 @@
-import { check } from '../src/index'
 import { ZodError } from 'zod'
+import { check } from '../src/index'
 
 describe('check', () => {
   describe('is', () => {
diff --git a/packages/common-web/tests/tid.test.ts b/packages/common-web/tests/tid.test.ts
index cc3cc7c0c8b..22f705a17d3 100644
--- a/packages/common-web/tests/tid.test.ts
+++ b/packages/common-web/tests/tid.test.ts
@@ -1,4 +1,4 @@
-import TID from '../src/tid'
+import { TID } from '../src/tid'
 
 describe('TIDs', () => {
   it('creates a new TID', () => {
diff --git a/packages/common/package.json b/packages/common/package.json
index a02a0492510..127817a5dee 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -18,6 +18,9 @@
     "test": "jest",
     "build": "tsc --build tsconfig.build.json"
   },
+  "engines": {
+    "node": ">=18.7.0"
+  },
   "dependencies": {
     "@atproto/common-web": "workspace:^",
     "@ipld/dag-cbor": "^7.0.3",
diff --git a/packages/common/src/fs.ts b/packages/common/src/fs.ts
index b8bcf7be310..459b4edd814 100644
--- a/packages/common/src/fs.ts
+++ b/packages/common/src/fs.ts
@@ -1,6 +1,6 @@
+import { constants } from 'node:fs'
+import fs from 'node:fs/promises'
 import { isErrnoException } from '@atproto/common-web'
-import { constants } from 'fs'
-import fs from 'fs/promises'
 
 export const fileExists = async (location: string): Promise<boolean> => {
   try {
diff --git a/packages/common/src/ipld.ts b/packages/common/src/ipld.ts
index 37681177c28..b2a70844e8f 100644
--- a/packages/common/src/ipld.ts
+++ b/packages/common/src/ipld.ts
@@ -1,12 +1,12 @@
 import { createHash } from 'node:crypto'
 import { Transform } from 'node:stream'
-import { check, schema } from '@atproto/common-web'
-import { CID } from 'multiformats/cid'
+import * as cborCodec from '@ipld/dag-cbor'
+import * as mf from 'multiformats'
 import * as Block from 'multiformats/block'
+import { CID } from 'multiformats/cid'
 import * as rawCodec from 'multiformats/codecs/raw'
 import { sha256 } from 'multiformats/hashes/sha2'
-import * as mf from 'multiformats'
-import * as cborCodec from '@ipld/dag-cbor'
+import { check, schema } from '@atproto/common-web'
 
 export const cborEncode = cborCodec.encode
 export const cborDecode = cborCodec.decode
diff --git a/packages/common/src/logger.ts b/packages/common/src/logger.ts
index 857d32ee9f2..07c833f27ad 100644
--- a/packages/common/src/logger.ts
+++ b/packages/common/src/logger.ts
@@ -1,4 +1,4 @@
-import pino from 'pino'
+import { destination, pino } from 'pino'
 
 const allSystemsEnabled = !process.env.LOG_SYSTEMS
 const enabledSystems = (process.env.LOG_SYSTEMS || '')
@@ -17,7 +17,7 @@ const config = {
 }
 
 const rootLogger = process.env.LOG_DESTINATION
-  ? pino(config, pino.destination(process.env.LOG_DESTINATION))
+  ? pino(config, destination(process.env.LOG_DESTINATION))
   : pino(config)
 
 const subsystems: Record<string, pino.Logger> = {}
diff --git a/packages/common/src/streams.ts b/packages/common/src/streams.ts
index c5400f4a2ba..cafa631f5d7 100644
--- a/packages/common/src/streams.ts
+++ b/packages/common/src/streams.ts
@@ -1,11 +1,11 @@
 import {
   Duplex,
   PassThrough,
-  pipeline,
   Readable,
   Stream,
   Transform,
   TransformCallback,
+  pipeline,
 } from 'node:stream'
 import { createBrotliDecompress, createGunzip, createInflate } from 'node:zlib'
 
diff --git a/packages/common/tests/ipld-multi.test.ts b/packages/common/tests/ipld-multi.test.ts
index 6cdecccaef9..b2b5e7358d3 100644
--- a/packages/common/tests/ipld-multi.test.ts
+++ b/packages/common/tests/ipld-multi.test.ts
@@ -1,6 +1,6 @@
 import { CID } from 'multiformats/cid'
 import * as ui8 from 'uint8arrays'
-import { cborEncode, cborDecodeMulti } from '../src'
+import { cborDecodeMulti, cborEncode } from '../src'
 
 describe('ipld decode multi', () => {
   it('decodes concatenated dag-cbor messages', async () => {
diff --git a/packages/common/tests/ipld-vectors.ts b/packages/common/tests/ipld-vectors.ts
index ca8fede099d..ae601c3423e 100644
--- a/packages/common/tests/ipld-vectors.ts
+++ b/packages/common/tests/ipld-vectors.ts
@@ -275,5 +275,3 @@ export const vectors = [
     cid: 'bafyreico7wgbbfe6dpfsuednrtrlh6t2yjl6xq5rf32gl3pgwhwxk77cn4',
   },
 ]
-
-export default vectors
diff --git a/packages/common/tests/ipld.test.ts b/packages/common/tests/ipld.test.ts
index 1e72ba8f38c..b0988df21b8 100644
--- a/packages/common/tests/ipld.test.ts
+++ b/packages/common/tests/ipld.test.ts
@@ -1,5 +1,4 @@
 import * as ui8 from 'uint8arrays'
-import vectors from './ipld-vectors'
 import {
   cborDecode,
   cborEncode,
@@ -8,6 +7,7 @@ import {
   ipldToJson,
   jsonToIpld,
 } from '../src'
+import { vectors } from './ipld-vectors'
 
 describe('ipld', () => {
   for (const vector of vectors) {
diff --git a/packages/common/tests/streams.test.ts b/packages/common/tests/streams.test.ts
index 8c38078440f..21bf78ed8b5 100644
--- a/packages/common/tests/streams.test.ts
+++ b/packages/common/tests/streams.test.ts
@@ -1,5 +1,5 @@
-import * as streams from '../src/streams'
 import { PassThrough, Readable } from 'node:stream'
+import * as streams from '../src/streams'
 
 describe('streams', () => {
   describe('forwardStreamErrors', () => {
diff --git a/packages/crypto/package.json b/packages/crypto/package.json
index 3f211d383cc..917e570acc1 100644
--- a/packages/crypto/package.json
+++ b/packages/crypto/package.json
@@ -19,6 +19,9 @@
     "test": "jest ",
     "build": "tsc --build tsconfig.build.json"
   },
+  "engines": {
+    "node": ">=18.7.0"
+  },
   "dependencies": {
     "@noble/curves": "^1.7.0",
     "@noble/hashes": "^1.6.1",
diff --git a/packages/crypto/src/did.ts b/packages/crypto/src/did.ts
index a8e4f03a7c1..eb131bf6836 100644
--- a/packages/crypto/src/did.ts
+++ b/packages/crypto/src/did.ts
@@ -1,7 +1,6 @@
 import * as uint8arrays from 'uint8arrays'
-
 import { BASE58_MULTIBASE_PREFIX, DID_KEY_PREFIX } from './const'
-import plugins from './plugins'
+import { plugins } from './plugins'
 import { extractMultikey, extractPrefixedBytes, hasPrefix } from './utils'
 
 export type ParsedMultikey = {
diff --git a/packages/crypto/src/p256/keypair.ts b/packages/crypto/src/p256/keypair.ts
index 94a84c2ad2c..f40eb0d26b1 100644
--- a/packages/crypto/src/p256/keypair.ts
+++ b/packages/crypto/src/p256/keypair.ts
@@ -1,13 +1,12 @@
 import { p256 } from '@noble/curves/p256'
 import { sha256 } from '@noble/hashes/sha256'
-import { SupportedEncodings } from 'uint8arrays/to-string'
 import {
   fromString as ui8FromString,
   toString as ui8ToString,
 } from 'uint8arrays'
-
-import * as did from '../did'
+import { SupportedEncodings } from 'uint8arrays/to-string'
 import { P256_JWT_ALG } from '../const'
+import * as did from '../did'
 import { Keypair } from '../types'
 
 export type P256KeypairOptions = {
@@ -69,5 +68,3 @@ export class P256Keypair implements Keypair {
     return this.privateKey
   }
 }
-
-export default P256Keypair
diff --git a/packages/crypto/src/p256/operations.ts b/packages/crypto/src/p256/operations.ts
index 36153c321f6..91836ea1c95 100644
--- a/packages/crypto/src/p256/operations.ts
+++ b/packages/crypto/src/p256/operations.ts
@@ -1,7 +1,6 @@
 import { p256 } from '@noble/curves/p256'
 import { sha256 } from '@noble/hashes/sha256'
 import { equals as ui8equals } from 'uint8arrays'
-
 import { P256_DID_PREFIX } from '../const'
 import { VerifyOptions } from '../types'
 import { extractMultikey, extractPrefixedBytes, hasPrefix } from '../utils'
diff --git a/packages/crypto/src/p256/plugin.ts b/packages/crypto/src/p256/plugin.ts
index 4fcbafc00ca..6e8924a67df 100644
--- a/packages/crypto/src/p256/plugin.ts
+++ b/packages/crypto/src/p256/plugin.ts
@@ -1,8 +1,7 @@
-import { verifyDidSig } from './operations'
-import { compressPubkey, decompressPubkey } from './encoding'
-
-import { DidKeyPlugin } from '../types'
 import { P256_DID_PREFIX, P256_JWT_ALG } from '../const'
+import { DidKeyPlugin } from '../types'
+import { compressPubkey, decompressPubkey } from './encoding'
+import { verifyDidSig } from './operations'
 
 export const p256Plugin: DidKeyPlugin = {
   prefix: P256_DID_PREFIX,
@@ -12,5 +11,3 @@ export const p256Plugin: DidKeyPlugin = {
   compressPubkey,
   decompressPubkey,
 }
-
-export default p256Plugin
diff --git a/packages/crypto/src/plugins.ts b/packages/crypto/src/plugins.ts
index 18b21f8247c..8ee842c9110 100644
--- a/packages/crypto/src/plugins.ts
+++ b/packages/crypto/src/plugins.ts
@@ -1,6 +1,4 @@
-import p256Plugin from './p256/plugin'
-import secp256k1Plugin from './secp256k1/plugin'
+import { p256Plugin } from './p256/plugin'
+import { secp256k1Plugin } from './secp256k1/plugin'
 
 export const plugins = [p256Plugin, secp256k1Plugin]
-
-export default plugins
diff --git a/packages/crypto/src/secp256k1/keypair.ts b/packages/crypto/src/secp256k1/keypair.ts
index e312ee8f9ba..3c595872dd2 100644
--- a/packages/crypto/src/secp256k1/keypair.ts
+++ b/packages/crypto/src/secp256k1/keypair.ts
@@ -5,7 +5,6 @@ import {
   toString as ui8ToString,
 } from 'uint8arrays'
 import { SupportedEncodings } from 'uint8arrays/to-string'
-
 import { SECP256K1_JWT_ALG } from '../const'
 import * as did from '../did'
 import { Keypair } from '../types'
@@ -69,5 +68,3 @@ export class Secp256k1Keypair implements Keypair {
     return this.privateKey
   }
 }
-
-export default Secp256k1Keypair
diff --git a/packages/crypto/src/secp256k1/operations.ts b/packages/crypto/src/secp256k1/operations.ts
index 4e8dc95d1fa..5d2dde58f95 100644
--- a/packages/crypto/src/secp256k1/operations.ts
+++ b/packages/crypto/src/secp256k1/operations.ts
@@ -1,7 +1,6 @@
 import { secp256k1 as k256 } from '@noble/curves/secp256k1'
 import { sha256 } from '@noble/hashes/sha256'
 import * as ui8 from 'uint8arrays'
-
 import { SECP256K1_DID_PREFIX } from '../const'
 import { VerifyOptions } from '../types'
 import { extractMultikey, extractPrefixedBytes, hasPrefix } from '../utils'
diff --git a/packages/crypto/src/secp256k1/plugin.ts b/packages/crypto/src/secp256k1/plugin.ts
index 1e8c622b752..8a4b4b7732d 100644
--- a/packages/crypto/src/secp256k1/plugin.ts
+++ b/packages/crypto/src/secp256k1/plugin.ts
@@ -1,8 +1,7 @@
-import { verifyDidSig } from './operations'
-import { compressPubkey, decompressPubkey } from './encoding'
-
-import { DidKeyPlugin } from '../types'
 import { SECP256K1_DID_PREFIX, SECP256K1_JWT_ALG } from '../const'
+import { DidKeyPlugin } from '../types'
+import { compressPubkey, decompressPubkey } from './encoding'
+import { verifyDidSig } from './operations'
 
 export const secp256k1Plugin: DidKeyPlugin = {
   prefix: SECP256K1_DID_PREFIX,
@@ -12,5 +11,3 @@ export const secp256k1Plugin: DidKeyPlugin = {
   compressPubkey,
   decompressPubkey,
 }
-
-export default secp256k1Plugin
diff --git a/packages/crypto/src/verify.ts b/packages/crypto/src/verify.ts
index b0fbccbc1ff..7daaf50e4a7 100644
--- a/packages/crypto/src/verify.ts
+++ b/packages/crypto/src/verify.ts
@@ -1,6 +1,6 @@
 import * as uint8arrays from 'uint8arrays'
 import { parseDidKey } from './did'
-import plugins from './plugins'
+import { plugins } from './plugins'
 import { VerifyOptions } from './types'
 
 export const verifySignature = (
diff --git a/packages/crypto/tests/did.test.ts b/packages/crypto/tests/did.test.ts
index 6160c2f88a9..67e18738ba6 100644
--- a/packages/crypto/tests/did.test.ts
+++ b/packages/crypto/tests/did.test.ts
@@ -1,6 +1,6 @@
+import * as uint8arrays from 'uint8arrays'
 import { P256Keypair, Secp256k1Keypair } from '../src'
 import * as did from '../src/did'
-import * as uint8arrays from 'uint8arrays'
 
 describe('secp256k1 did:key', () => {
   it('derives the correct DID from the privatekey', async () => {
diff --git a/packages/crypto/tests/key-compression.test.ts b/packages/crypto/tests/key-compression.test.ts
index fe3e81cd842..0a6900c08ef 100644
--- a/packages/crypto/tests/key-compression.test.ts
+++ b/packages/crypto/tests/key-compression.test.ts
@@ -1,8 +1,8 @@
-import P256Keypair from '../src/p256/keypair'
-import Secp256k1Keypair from '../src/secp256k1/keypair'
-import * as secpEncoding from '../src/secp256k1/encoding'
-import * as p256Encoding from '../src/p256/encoding'
 import * as did from '../src/did'
+import * as p256Encoding from '../src/p256/encoding'
+import { P256Keypair } from '../src/p256/keypair'
+import * as secpEncoding from '../src/secp256k1/encoding'
+import { Secp256k1Keypair } from '../src/secp256k1/keypair'
 
 describe('public key compression', () => {
   describe('secp256k1', () => {
diff --git a/packages/crypto/tests/keypairs.test.ts b/packages/crypto/tests/keypairs.test.ts
index e9deca146d7..1a0eb75bbd0 100644
--- a/packages/crypto/tests/keypairs.test.ts
+++ b/packages/crypto/tests/keypairs.test.ts
@@ -1,8 +1,8 @@
-import P256Keypair from '../src/p256/keypair'
-import Secp256k1Keypair from '../src/secp256k1/keypair'
+import { randomBytes } from '../src'
+import { P256Keypair } from '../src/p256/keypair'
 import * as p256 from '../src/p256/operations'
+import { Secp256k1Keypair } from '../src/secp256k1/keypair'
 import * as secp from '../src/secp256k1/operations'
-import { randomBytes } from '../src'
 
 describe('keypairs', () => {
   describe('secp256k1', () => {
diff --git a/packages/crypto/tests/signatures.test.ts b/packages/crypto/tests/signatures.test.ts
index a849e1c5ec0..d7f054c7d64 100644
--- a/packages/crypto/tests/signatures.test.ts
+++ b/packages/crypto/tests/signatures.test.ts
@@ -1,20 +1,20 @@
 import fs from 'node:fs'
-import * as uint8arrays from 'uint8arrays'
-import { secp256k1 as nobleK256 } from '@noble/curves/secp256k1'
 import { p256 as nobleP256 } from '@noble/curves/p256'
+import { secp256k1 as nobleK256 } from '@noble/curves/secp256k1'
+import * as uint8arrays from 'uint8arrays'
 import { cborEncode } from '@atproto/common'
-import EcdsaKeypair from '../src/p256/keypair'
-import Secp256k1Keypair from '../src/secp256k1/keypair'
-import * as p256 from '../src/p256/operations'
-import * as secp from '../src/secp256k1/operations'
 import {
+  P256_JWT_ALG,
+  SECP256K1_JWT_ALG,
   bytesToMultibase,
   multibaseToBytes,
   parseDidKey,
-  P256_JWT_ALG,
-  SECP256K1_JWT_ALG,
   sha256,
 } from '../src'
+import { P256Keypair } from '../src/p256/keypair'
+import * as p256 from '../src/p256/operations'
+import { Secp256k1Keypair } from '../src/secp256k1/keypair'
+import * as secp from '../src/secp256k1/operations'
 
 describe('signatures', () => {
   let vectors: TestVector[]
@@ -140,7 +140,7 @@ describe('signatures', () => {
 // @ts-expect-error
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 async function generateTestVectors(): Promise<TestVector[]> {
-  const p256Key = await EcdsaKeypair.create({ exportable: true })
+  const p256Key = await P256Keypair.create({ exportable: true })
   const secpKey = await Secp256k1Keypair.create({ exportable: true })
   const messageBytes = cborEncode({ hello: 'world' })
   const messageBase64 = uint8arrays.toString(messageBytes, 'base64')
diff --git a/packages/dev-env/package.json b/packages/dev-env/package.json
index 8dad75d48c0..e279d848b2c 100644
--- a/packages/dev-env/package.json
+++ b/packages/dev-env/package.json
@@ -20,6 +20,9 @@
     "start": "../dev-infra/with-test-redis-and-db.sh node dist/bin.js",
     "dev": "../dev-infra/with-test-redis-and-db.sh node --watch dist/bin.js"
   },
+  "engines": {
+    "node": ">=18.7.0"
+  },
   "dependencies": {
     "@atproto/api": "workspace:^",
     "@atproto/bsky": "workspace:^",
diff --git a/packages/dev-env/src/bsky.ts b/packages/dev-env/src/bsky.ts
index 1e4406b0459..416ad88ec6c 100644
--- a/packages/dev-env/src/bsky.ts
+++ b/packages/dev-env/src/bsky.ts
@@ -1,11 +1,11 @@
+import { Client as PlcClient } from '@did-plc/lib'
 import getPort from 'get-port'
 import * as ui8 from 'uint8arrays'
-import * as bsky from '@atproto/bsky'
 import { AtpAgent } from '@atproto/api'
+import * as bsky from '@atproto/bsky'
 import { Secp256k1Keypair } from '@atproto/crypto'
-import { Client as PlcClient } from '@did-plc/lib'
-import { BskyConfig } from './types'
 import { ADMIN_PASSWORD, EXAMPLE_LABELER } from './const'
+import { BskyConfig } from './types'
 
 export * from '@atproto/bsky'
 
diff --git a/packages/dev-env/src/feed-gen.ts b/packages/dev-env/src/feed-gen.ts
index cd2ffd93c07..33c872161f5 100644
--- a/packages/dev-env/src/feed-gen.ts
+++ b/packages/dev-env/src/feed-gen.ts
@@ -1,11 +1,11 @@
-import { Secp256k1Keypair } from '@atproto/crypto'
-import { SkeletonHandler, createLexiconServer } from '@atproto/pds'
-import { InvalidRequestError } from '@atproto/xrpc-server'
+import events from 'node:events'
+import http from 'node:http'
 import * as plc from '@did-plc/lib'
-import events from 'events'
 import express from 'express'
 import getPort from 'get-port'
-import http from 'http'
+import { Secp256k1Keypair } from '@atproto/crypto'
+import { SkeletonHandler, createLexiconServer } from '@atproto/pds'
+import { InvalidRequestError } from '@atproto/xrpc-server'
 
 export class TestFeedGen {
   destroyed = false
diff --git a/packages/dev-env/src/introspect.ts b/packages/dev-env/src/introspect.ts
index 18e9091cfc7..27d09d2cd6b 100644
--- a/packages/dev-env/src/introspect.ts
+++ b/packages/dev-env/src/introspect.ts
@@ -1,10 +1,10 @@
-import http from 'node:http'
 import events from 'node:events'
+import http from 'node:http'
 import express from 'express'
-import { TestPlc } from './plc'
-import { TestPds } from './pds'
 import { TestBsky } from './bsky'
 import { TestOzone } from './ozone'
+import { TestPds } from './pds'
+import { TestPlc } from './plc'
 
 export class IntrospectServer {
   constructor(
diff --git a/packages/dev-env/src/mock/index.ts b/packages/dev-env/src/mock/index.ts
index ba128367dea..f302daf4a3c 100644
--- a/packages/dev-env/src/mock/index.ts
+++ b/packages/dev-env/src/mock/index.ts
@@ -1,10 +1,10 @@
-import { AtUri } from '@atproto/syntax'
-import { COM_ATPROTO_MODERATION, AtpAgent } from '@atproto/api'
+import { AtpAgent, COM_ATPROTO_MODERATION } from '@atproto/api'
 import { Database } from '@atproto/bsky'
+import { AtUri } from '@atproto/syntax'
 import { EXAMPLE_LABELER, RecordRef, TestNetwork } from '../index'
 import { postTexts, replyTexts } from './data'
-import labeledImgB64 from './img/labeled-img-b64'
 import blurHashB64 from './img/blur-hash-avatar-b64'
+import labeledImgB64 from './img/labeled-img-b64'
 
 // NOTE
 // deterministic date generator
diff --git a/packages/dev-env/src/moderator-client.ts b/packages/dev-env/src/moderator-client.ts
index eb33cc0d566..eb9212fb913 100644
--- a/packages/dev-env/src/moderator-client.ts
+++ b/packages/dev-env/src/moderator-client.ts
@@ -1,10 +1,10 @@
 import {
   AtpAgent,
   ToolsOzoneModerationEmitEvent as EmitModerationEvent,
-  ToolsOzoneModerationQueryStatuses as QueryModerationStatuses,
   ToolsOzoneModerationQueryEvents as QueryModerationEvents,
-  ToolsOzoneSettingUpsertOption,
+  ToolsOzoneModerationQueryStatuses as QueryModerationStatuses,
   ToolsOzoneSettingRemoveOptions,
+  ToolsOzoneSettingUpsertOption,
 } from '@atproto/api'
 import { TestOzone } from './ozone'
 
diff --git a/packages/dev-env/src/network-no-appview.ts b/packages/dev-env/src/network-no-appview.ts
index ee102b0cc98..da0b4c4c711 100644
--- a/packages/dev-env/src/network-no-appview.ts
+++ b/packages/dev-env/src/network-no-appview.ts
@@ -1,10 +1,10 @@
 import { SkeletonHandler } from '@atproto/pds'
-import { TestServerParams } from './types'
-import { TestPlc } from './plc'
-import { TestPds } from './pds'
-import { mockNetworkUtilities } from './util'
 import { TestFeedGen } from './feed-gen'
+import { TestPds } from './pds'
+import { TestPlc } from './plc'
 import { SeedClient } from './seed/client'
+import { TestServerParams } from './types'
+import { mockNetworkUtilities } from './util'
 
 export class TestNetworkNoAppView {
   feedGens: TestFeedGen[] = []
diff --git a/packages/dev-env/src/network.ts b/packages/dev-env/src/network.ts
index 1ce07a19138..be5e5629966 100644
--- a/packages/dev-env/src/network.ts
+++ b/packages/dev-env/src/network.ts
@@ -1,18 +1,18 @@
-import assert from 'assert'
-import * as uint8arrays from 'uint8arrays'
+import assert from 'node:assert'
 import getPort from 'get-port'
+import * as uint8arrays from 'uint8arrays'
 import { wait } from '@atproto/common-web'
 import { createServiceJwt } from '@atproto/xrpc-server'
-import { TestServerParams } from './types'
-import { TestPlc } from './plc'
-import { TestPds } from './pds'
 import { TestBsky } from './bsky'
+import { EXAMPLE_LABELER } from './const'
+import { IntrospectServer } from './introspect'
+import { TestNetworkNoAppView } from './network-no-appview'
 import { TestOzone } from './ozone'
 import { OzoneServiceProfile } from './ozone-service-profile'
+import { TestPds } from './pds'
+import { TestPlc } from './plc'
+import { TestServerParams } from './types'
 import { mockNetworkUtilities } from './util'
-import { TestNetworkNoAppView } from './network-no-appview'
-import { EXAMPLE_LABELER } from './const'
-import { IntrospectServer } from './introspect'
 
 const ADMIN_USERNAME = 'admin'
 const ADMIN_PASSWORD = 'admin-pass'
diff --git a/packages/dev-env/src/ozone-service-profile.ts b/packages/dev-env/src/ozone-service-profile.ts
index 9b8e10d7ad1..10dee397647 100644
--- a/packages/dev-env/src/ozone-service-profile.ts
+++ b/packages/dev-env/src/ozone-service-profile.ts
@@ -1,6 +1,6 @@
-import { TestPds } from './pds'
 import { AtpAgent } from '@atproto/api'
 import { Secp256k1Keypair } from '@atproto/crypto'
+import { TestPds } from './pds'
 
 export class OzoneServiceProfile {
   did?: string
diff --git a/packages/dev-env/src/ozone.ts b/packages/dev-env/src/ozone.ts
index fabe73f5a51..4fb7617a335 100644
--- a/packages/dev-env/src/ozone.ts
+++ b/packages/dev-env/src/ozone.ts
@@ -1,14 +1,14 @@
+import * as plc from '@did-plc/lib'
 import getPort from 'get-port'
 import * as ui8 from 'uint8arrays'
-import * as plc from '@did-plc/lib'
-import * as ozone from '@atproto/ozone'
 import { AtpAgent } from '@atproto/api'
-import { createServiceJwt } from '@atproto/xrpc-server'
 import { Keypair, Secp256k1Keypair } from '@atproto/crypto'
-import { DidAndKey, OzoneConfig } from './types'
+import * as ozone from '@atproto/ozone'
+import { createServiceJwt } from '@atproto/xrpc-server'
 import { ADMIN_PASSWORD, EXAMPLE_LABELER } from './const'
-import { createDidAndKey } from './util'
 import { ModeratorClient } from './moderator-client'
+import { DidAndKey, OzoneConfig } from './types'
+import { createDidAndKey } from './util'
 
 export class TestOzone {
   constructor(
diff --git a/packages/dev-env/src/pds.ts b/packages/dev-env/src/pds.ts
index fefc5643add..d721a8797cd 100644
--- a/packages/dev-env/src/pds.ts
+++ b/packages/dev-env/src/pds.ts
@@ -1,14 +1,14 @@
-import path from 'node:path'
-import os from 'node:os'
 import fs from 'node:fs/promises'
+import os from 'node:os'
+import path from 'node:path'
 import getPort from 'get-port'
 import * as ui8 from 'uint8arrays'
+import { AtpAgent } from '@atproto/api'
+import { Secp256k1Keypair, randomStr } from '@atproto/crypto'
 import * as pds from '@atproto/pds'
 import { createSecretKeyObject } from '@atproto/pds'
-import { Secp256k1Keypair, randomStr } from '@atproto/crypto'
-import { AtpAgent } from '@atproto/api'
-import { PdsConfig } from './types'
 import { ADMIN_PASSWORD, EXAMPLE_LABELER, JWT_SECRET } from './const'
+import { PdsConfig } from './types'
 
 export class TestPds {
   constructor(
diff --git a/packages/dev-env/src/plc.ts b/packages/dev-env/src/plc.ts
index 95273727c16..b7205f5525f 100644
--- a/packages/dev-env/src/plc.ts
+++ b/packages/dev-env/src/plc.ts
@@ -1,6 +1,6 @@
-import getPort from 'get-port'
 import { Client as PlcClient } from '@did-plc/lib'
 import * as plc from '@did-plc/server'
+import getPort from 'get-port'
 import { PlcConfig } from './types'
 
 export class TestPlc {
diff --git a/packages/dev-env/src/seed/author-feed.ts b/packages/dev-env/src/seed/author-feed.ts
index e532412a694..64d26d4192a 100644
--- a/packages/dev-env/src/seed/author-feed.ts
+++ b/packages/dev-env/src/seed/author-feed.ts
@@ -1,5 +1,5 @@
-import { SeedClient } from './client'
 import basicSeed from './basic'
+import { SeedClient } from './client'
 
 export default async (sc: SeedClient) => {
   await basicSeed(sc)
diff --git a/packages/dev-env/src/seed/basic.ts b/packages/dev-env/src/seed/basic.ts
index b27ee93cbbb..5df78e7a395 100644
--- a/packages/dev-env/src/seed/basic.ts
+++ b/packages/dev-env/src/seed/basic.ts
@@ -1,9 +1,9 @@
-import usersSeed from './users'
 import { TestBsky } from '../bsky'
+import { EXAMPLE_LABELER } from '../const'
 import { TestNetwork } from '../network'
 import { TestNetworkNoAppView } from '../network-no-appview'
 import { SeedClient } from './client'
-import { EXAMPLE_LABELER } from '../const'
+import usersSeed from './users'
 
 export default async (
   sc: SeedClient<TestNetwork | TestNetworkNoAppView>,
diff --git a/packages/dev-env/src/seed/client.ts b/packages/dev-env/src/seed/client.ts
index 329788ca663..61babc4dd23 100644
--- a/packages/dev-env/src/seed/client.ts
+++ b/packages/dev-env/src/seed/client.ts
@@ -1,18 +1,17 @@
-import fs from 'fs/promises'
+import fs from 'node:fs/promises'
 import path from 'node:path'
-
 import { CID } from 'multiformats/cid'
 import {
-  ComAtprotoModerationCreateReport,
-  AppBskyFeedPost,
-  AppBskyRichtextFacet,
   AppBskyFeedLike,
+  AppBskyFeedPost,
   AppBskyGraphFollow,
   AppBskyGraphList,
+  AppBskyRichtextFacet,
   AtpAgent,
+  ComAtprotoModerationCreateReport,
 } from '@atproto/api'
-import { AtUri } from '@atproto/syntax'
 import { BlobRef } from '@atproto/lexicon'
+import { AtUri } from '@atproto/syntax'
 import { TestNetworkNoAppView } from '../network-no-appview'
 
 // Makes it simple to create data via the XRPC client,
diff --git a/packages/dev-env/src/seed/likes.ts b/packages/dev-env/src/seed/likes.ts
index 195da59e886..1747fb2fa59 100644
--- a/packages/dev-env/src/seed/likes.ts
+++ b/packages/dev-env/src/seed/likes.ts
@@ -1,5 +1,5 @@
-import { SeedClient } from './client'
 import basicSeed from './basic'
+import { SeedClient } from './client'
 
 export default async (sc: SeedClient) => {
   await basicSeed(sc)
diff --git a/packages/dev-env/src/seed/quotes.ts b/packages/dev-env/src/seed/quotes.ts
index 444960f7ba7..addd2ae597c 100644
--- a/packages/dev-env/src/seed/quotes.ts
+++ b/packages/dev-env/src/seed/quotes.ts
@@ -1,5 +1,5 @@
+import { default as basicSeed } from './basic'
 import { SeedClient } from './client'
-import { basicSeed } from './index'
 
 export default async (sc: SeedClient) => {
   await basicSeed(sc)
diff --git a/packages/dev-env/src/seed/reposts.ts b/packages/dev-env/src/seed/reposts.ts
index a7c724d1adf..8de9b8ec655 100644
--- a/packages/dev-env/src/seed/reposts.ts
+++ b/packages/dev-env/src/seed/reposts.ts
@@ -1,5 +1,5 @@
-import { SeedClient } from './client'
 import basicSeed from './basic'
+import { SeedClient } from './client'
 
 export default async (sc: SeedClient) => {
   await basicSeed(sc)
diff --git a/packages/dev-env/src/types.ts b/packages/dev-env/src/types.ts
index e02b97b20a9..d698180fae3 100644
--- a/packages/dev-env/src/types.ts
+++ b/packages/dev-env/src/types.ts
@@ -1,8 +1,8 @@
-import * as pds from '@atproto/pds'
 import * as bsky from '@atproto/bsky'
 import * as bsync from '@atproto/bsync'
-import * as ozone from '@atproto/ozone'
 import { ExportableKeypair, Keypair } from '@atproto/crypto'
+import * as ozone from '@atproto/ozone'
+import * as pds from '@atproto/pds'
 
 export type IntrospectConfig = {
   port?: number
diff --git a/packages/dev-env/src/util.ts b/packages/dev-env/src/util.ts
index b054010079a..4246bac36a5 100644
--- a/packages/dev-env/src/util.ts
+++ b/packages/dev-env/src/util.ts
@@ -1,9 +1,9 @@
-import { request } from 'undici'
 import * as plc from '@did-plc/lib'
-import { IdResolver } from '@atproto/identity'
+import { request } from 'undici'
 import { Secp256k1Keypair } from '@atproto/crypto'
-import { TestPds } from './pds'
+import { IdResolver } from '@atproto/identity'
 import { TestBsky } from './bsky'
+import { TestPds } from './pds'
 import { DidAndKey } from './types'
 
 export const mockNetworkUtilities = (pds: TestPds, bsky?: TestBsky) => {
diff --git a/packages/did/src/atproto.ts b/packages/did/src/atproto.ts
index 56b317cca45..edd5172f62b 100644
--- a/packages/did/src/atproto.ts
+++ b/packages/did/src/atproto.ts
@@ -1,12 +1,11 @@
 import { z } from 'zod'
-
 import { InvalidDidError } from './did-error.js'
 import { Did } from './did.js'
 import {
-  assertDidPlc,
-  assertDidWeb,
   DID_PLC_PREFIX,
   DID_WEB_PREFIX,
+  assertDidPlc,
+  assertDidWeb,
   isDidPlc,
 } from './methods.js'
 
diff --git a/packages/did/src/did-document.ts b/packages/did/src/did-document.ts
index fcd4f7b50cd..ac4a1f6b24a 100644
--- a/packages/did/src/did-document.ts
+++ b/packages/did/src/did-document.ts
@@ -1,5 +1,4 @@
 import { z } from 'zod'
-
 import { Did, didSchema } from './did.js'
 
 /**
diff --git a/packages/identity/package.json b/packages/identity/package.json
index 3e4eb3afc77..cfd1ed0fa27 100644
--- a/packages/identity/package.json
+++ b/packages/identity/package.json
@@ -21,6 +21,9 @@
     "test:log": "cat test.log | pino-pretty",
     "build": "tsc --build tsconfig.build.json"
   },
+  "engines": {
+    "node": ">=18.7.0"
+  },
   "dependencies": {
     "@atproto/common-web": "workspace:^",
     "@atproto/crypto": "workspace:^"
diff --git a/packages/identity/src/did/atproto-data.ts b/packages/identity/src/did/atproto-data.ts
index c0cd9829739..74639c60ee6 100644
--- a/packages/identity/src/did/atproto-data.ts
+++ b/packages/identity/src/did/atproto-data.ts
@@ -1,20 +1,20 @@
-import * as crypto from '@atproto/crypto'
-import { DidDocument, AtprotoData } from '../types'
 import {
   getDid,
-  getHandle,
-  getPdsEndpoint,
   getFeedGenEndpoint,
+  getHandle,
   getNotifEndpoint,
+  getPdsEndpoint,
   getSigningKey,
 } from '@atproto/common-web'
+import * as crypto from '@atproto/crypto'
+import { AtprotoData, DidDocument } from '../types'
 
 export {
   getDid,
-  getHandle,
-  getPdsEndpoint as getPds,
   getFeedGenEndpoint as getFeedGen,
+  getHandle,
   getNotifEndpoint as getNotif,
+  getPdsEndpoint as getPds,
 }
 
 export const getKey = (doc: DidDocument): string | undefined => {
diff --git a/packages/identity/src/did/base-resolver.ts b/packages/identity/src/did/base-resolver.ts
index 825dddac566..16336ea67b2 100644
--- a/packages/identity/src/did/base-resolver.ts
+++ b/packages/identity/src/did/base-resolver.ts
@@ -1,14 +1,14 @@
-import * as crypto from '@atproto/crypto'
 import { check } from '@atproto/common-web'
+import * as crypto from '@atproto/crypto'
+import { DidNotFoundError, PoorlyFormattedDidDocumentError } from '../errors'
 import {
-  DidCache,
   AtprotoData,
+  CacheResult,
+  DidCache,
   DidDocument,
   didDocument,
-  CacheResult,
 } from '../types'
 import * as atprotoData from './atproto-data'
-import { DidNotFoundError, PoorlyFormattedDidDocumentError } from '../errors'
 
 export abstract class BaseResolver {
   constructor(public cache?: DidCache) {}
@@ -98,5 +98,3 @@ export abstract class BaseResolver {
     return crypto.verifySignature(signingKey, data, sig)
   }
 }
-
-export default BaseResolver
diff --git a/packages/identity/src/did/did-resolver.ts b/packages/identity/src/did/did-resolver.ts
index 98d73995695..1dfcb0bfab2 100644
--- a/packages/identity/src/did/did-resolver.ts
+++ b/packages/identity/src/did/did-resolver.ts
@@ -1,8 +1,8 @@
-import { DidWebResolver } from './web-resolver'
-import { DidPlcResolver } from './plc-resolver'
-import { DidResolverOpts } from '../types'
-import BaseResolver from './base-resolver'
 import { PoorlyFormattedDidError, UnsupportedDidMethodError } from '../errors'
+import { DidResolverOpts } from '../types'
+import { BaseResolver } from './base-resolver'
+import { DidPlcResolver } from './plc-resolver'
+import { DidWebResolver } from './web-resolver'
 
 export class DidResolver extends BaseResolver {
   methods: Record<string, BaseResolver>
@@ -29,5 +29,3 @@ export class DidResolver extends BaseResolver {
     return method.resolveNoCheck(did)
   }
 }
-
-export default DidResolver
diff --git a/packages/identity/src/did/memory-cache.ts b/packages/identity/src/did/memory-cache.ts
index 42f01527529..bfc9ea9130f 100644
--- a/packages/identity/src/did/memory-cache.ts
+++ b/packages/identity/src/did/memory-cache.ts
@@ -1,5 +1,5 @@
 import { DAY, HOUR } from '@atproto/common-web'
-import { DidCache, CacheResult, DidDocument } from '../types'
+import { CacheResult, DidCache, DidDocument } from '../types'
 
 type CacheVal = {
   doc: DidDocument
diff --git a/packages/identity/src/did/plc-resolver.ts b/packages/identity/src/did/plc-resolver.ts
index de82f72ec6f..fe7a2832ad4 100644
--- a/packages/identity/src/did/plc-resolver.ts
+++ b/packages/identity/src/did/plc-resolver.ts
@@ -1,5 +1,5 @@
 import { DidCache } from '../types'
-import BaseResolver from './base-resolver'
+import { BaseResolver } from './base-resolver'
 import { timed } from './util'
 
 export class DidPlcResolver extends BaseResolver {
diff --git a/packages/identity/src/did/web-resolver.ts b/packages/identity/src/did/web-resolver.ts
index e09b3a572be..611e48d155a 100644
--- a/packages/identity/src/did/web-resolver.ts
+++ b/packages/identity/src/did/web-resolver.ts
@@ -1,6 +1,6 @@
 import { PoorlyFormattedDidError, UnsupportedDidWebPathError } from '../errors'
 import { DidCache } from '../types'
-import BaseResolver from './base-resolver'
+import { BaseResolver } from './base-resolver'
 import { timed } from './util'
 
 export const DOC_PATH = '/.well-known/did.json'
diff --git a/packages/identity/src/handle/index.ts b/packages/identity/src/handle/index.ts
index 4048f963cd5..1e7d1329c9d 100644
--- a/packages/identity/src/handle/index.ts
+++ b/packages/identity/src/handle/index.ts
@@ -1,4 +1,4 @@
-import dns from 'dns/promises'
+import dns from 'node:dns/promises'
 import { HandleResolverOpts } from '../types'
 
 const SUBDOMAIN = '_atproto'
diff --git a/packages/identity/src/id-resolver.ts b/packages/identity/src/id-resolver.ts
index ccf42ca9574..fbac1beb1ad 100644
--- a/packages/identity/src/id-resolver.ts
+++ b/packages/identity/src/id-resolver.ts
@@ -1,5 +1,5 @@
+import { DidResolver } from './did/did-resolver'
 import { HandleResolver } from './handle'
-import DidResolver from './did/did-resolver'
 import { IdentityResolverOpts } from './types'
 
 export class IdResolver {
diff --git a/packages/identity/tests/did-cache.test.ts b/packages/identity/tests/did-cache.test.ts
index f69f21ecf13..28d0f05a7a6 100644
--- a/packages/identity/tests/did-cache.test.ts
+++ b/packages/identity/tests/did-cache.test.ts
@@ -1,10 +1,10 @@
-import getPort from 'get-port'
 import * as plc from '@did-plc/lib'
 import { Database as DidPlcDb, PlcServer } from '@did-plc/server'
-import { MemoryCache } from '../src/did/memory-cache'
-import { DidResolver } from '../src'
-import { Secp256k1Keypair } from '@atproto/crypto'
+import getPort from 'get-port'
 import { wait } from '@atproto/common-web'
+import { Secp256k1Keypair } from '@atproto/crypto'
+import { DidResolver } from '../src'
+import { MemoryCache } from '../src/did/memory-cache'
 
 describe('did cache', () => {
   let close: () => Promise<void>
diff --git a/packages/identity/tests/did-resolver.test.ts b/packages/identity/tests/did-resolver.test.ts
index 89b85c2f7d5..b7d140fc148 100644
--- a/packages/identity/tests/did-resolver.test.ts
+++ b/packages/identity/tests/did-resolver.test.ts
@@ -1,10 +1,10 @@
-import getPort from 'get-port'
-import { Secp256k1Keypair } from '@atproto/crypto'
 import * as plc from '@did-plc/lib'
 import { Database as DidPlcDb, PlcServer } from '@did-plc/server'
-import { DidResolver, DidDocument } from '../src'
+import getPort from 'get-port'
+import { Secp256k1Keypair } from '@atproto/crypto'
+import { DidDocument, DidResolver } from '../src'
+import { DidWebDb } from './web/db'
 import { DidWebServer } from './web/server'
-import DidWebDb from './web/db'
 
 describe('did resolver', () => {
   let close: () => Promise<void>
diff --git a/packages/identity/tests/handle-resolver.test.ts b/packages/identity/tests/handle-resolver.test.ts
index 4b8b93552ed..c5f76b51164 100644
--- a/packages/identity/tests/handle-resolver.test.ts
+++ b/packages/identity/tests/handle-resolver.test.ts
@@ -1,6 +1,6 @@
 import { HandleResolver } from '../src'
 
-jest.mock('dns/promises', () => {
+jest.mock('node:dns/promises', () => {
   return {
     resolveTxt: (handle: string) => {
       if (handle === '_atproto.simple.test') {
diff --git a/packages/identity/tests/web/db.ts b/packages/identity/tests/web/db.ts
index 737a7be6929..7f703dc8736 100644
--- a/packages/identity/tests/web/db.ts
+++ b/packages/identity/tests/web/db.ts
@@ -61,5 +61,3 @@ export class DidWebDb {
     await this.store.del(didPath)
   }
 }
-
-export default DidWebDb
diff --git a/packages/identity/tests/web/server.ts b/packages/identity/tests/web/server.ts
index b070d073058..117729a654b 100644
--- a/packages/identity/tests/web/server.ts
+++ b/packages/identity/tests/web/server.ts
@@ -1,8 +1,8 @@
-import express from 'express'
+import http from 'node:http'
 import cors from 'cors'
-import http from 'http'
-import DidWebDb from './db'
+import express from 'express'
 import { DidDocument } from '../../src'
+import { DidWebDb } from './db'
 
 const DOC_PATH = '/.well-known/did.json'
 
diff --git a/packages/internal/did-resolver/src/did-cache-memory.ts b/packages/internal/did-resolver/src/did-cache-memory.ts
index 1c05bb9739d..c572e8b19fc 100644
--- a/packages/internal/did-resolver/src/did-cache-memory.ts
+++ b/packages/internal/did-resolver/src/did-cache-memory.ts
@@ -3,7 +3,6 @@ import {
   SimpleStoreMemory,
   SimpleStoreMemoryOptions,
 } from '@atproto-labs/simple-store-memory'
-
 import { DidCache } from './did-cache.js'
 
 const DEFAULT_TTL = 3600 * 1000 // 1 hour
diff --git a/packages/internal/did-resolver/src/did-cache.ts b/packages/internal/did-resolver/src/did-cache.ts
index 762e9c5b809..cfad1385651 100644
--- a/packages/internal/did-resolver/src/did-cache.ts
+++ b/packages/internal/did-resolver/src/did-cache.ts
@@ -1,11 +1,10 @@
-import { CachedGetter, SimpleStore } from '@atproto-labs/simple-store'
 import { Did, DidDocument } from '@atproto/did'
-
+import { CachedGetter, SimpleStore } from '@atproto-labs/simple-store'
 import { DidCacheMemory } from './did-cache-memory.js'
 import { DidMethod, ResolveDidOptions } from './did-method.js'
 import { DidResolver, ResolvedDocument } from './did-resolver.js'
 
-export type { DidMethod, ResolvedDocument, ResolveDidOptions }
+export type { DidMethod, ResolveDidOptions, ResolvedDocument }
 
 export type DidCache = SimpleStore<Did, DidDocument>
 
diff --git a/packages/internal/did-resolver/src/did-resolver-base.ts b/packages/internal/did-resolver/src/did-resolver-base.ts
index 5c31347e165..4ac98ec9c34 100644
--- a/packages/internal/did-resolver/src/did-resolver-base.ts
+++ b/packages/internal/did-resolver/src/did-resolver-base.ts
@@ -1,11 +1,10 @@
-import { FetchError, FetchResponseError } from '@atproto-labs/fetch'
-import { Did, DidError, extractDidMethod } from '@atproto/did'
 import { ZodError } from 'zod'
-
+import { Did, DidError, extractDidMethod } from '@atproto/did'
+import { FetchError, FetchResponseError } from '@atproto-labs/fetch'
 import { DidMethod, DidMethods, ResolveDidOptions } from './did-method.js'
 import { DidResolver, ResolvedDocument } from './did-resolver.js'
 
-export type { DidMethod, ResolvedDocument, ResolveDidOptions }
+export type { DidMethod, ResolveDidOptions, ResolvedDocument }
 
 export class DidResolverBase<M extends string = string>
   implements DidResolver<M>
diff --git a/packages/internal/did-resolver/src/did-resolver.ts b/packages/internal/did-resolver/src/did-resolver.ts
index 67f8a0ea1a3..cad33493810 100644
--- a/packages/internal/did-resolver/src/did-resolver.ts
+++ b/packages/internal/did-resolver/src/did-resolver.ts
@@ -1,5 +1,4 @@
 import { Did, DidDocument } from '@atproto/did'
-
 import { ResolveDidOptions } from './did-method.js'
 
 export type ResolvedDocument<D extends Did, M extends string = string> =
diff --git a/packages/internal/did-resolver/src/methods/plc.ts b/packages/internal/did-resolver/src/methods/plc.ts
index 5d930ecd462..a64c9bc2585 100644
--- a/packages/internal/did-resolver/src/methods/plc.ts
+++ b/packages/internal/did-resolver/src/methods/plc.ts
@@ -1,3 +1,4 @@
+import { Did, assertDidPlc, didDocumentValidator } from '@atproto/did'
 import {
   Fetch,
   bindFetch,
@@ -6,8 +7,6 @@ import {
   fetchOkProcessor,
 } from '@atproto-labs/fetch'
 import { pipe } from '@atproto-labs/pipe'
-import { Did, assertDidPlc, didDocumentValidator } from '@atproto/did'
-
 import { DidMethod, ResolveDidOptions } from '../did-method.js'
 
 const fetchSuccessHandler = pipe(
diff --git a/packages/internal/did-resolver/src/methods/web.ts b/packages/internal/did-resolver/src/methods/web.ts
index b366cde98ab..4e00c4b68a3 100644
--- a/packages/internal/did-resolver/src/methods/web.ts
+++ b/packages/internal/did-resolver/src/methods/web.ts
@@ -1,13 +1,12 @@
+import { Did, DidError, didDocumentValidator, didWebToUrl } from '@atproto/did'
 import {
-  bindFetch,
   Fetch,
+  bindFetch,
   fetchJsonProcessor,
   fetchJsonZodProcessor,
   fetchOkProcessor,
 } from '@atproto-labs/fetch'
 import { pipe } from '@atproto-labs/pipe'
-import { Did, didDocumentValidator, DidError, didWebToUrl } from '@atproto/did'
-
 import { DidMethod, ResolveDidOptions } from '../did-method.js'
 
 const fetchSuccessHandler = pipe(
diff --git a/packages/internal/fetch-node/package.json b/packages/internal/fetch-node/package.json
index b24a7aa8b86..5b612258b31 100644
--- a/packages/internal/fetch-node/package.json
+++ b/packages/internal/fetch-node/package.json
@@ -23,6 +23,9 @@
       "default": "./dist/index.js"
     }
   },
+  "engines": {
+    "node": ">=18.7.0"
+  },
   "dependencies": {
     "@atproto-labs/fetch": "workspace:*",
     "@atproto-labs/pipe": "workspace:*",
diff --git a/packages/internal/fetch-node/src/safe.ts b/packages/internal/fetch-node/src/safe.ts
index c5eea6335f4..906c3898cb9 100644
--- a/packages/internal/fetch-node/src/safe.ts
+++ b/packages/internal/fetch-node/src/safe.ts
@@ -1,7 +1,7 @@
 import {
-  asRequest,
   DEFAULT_FORBIDDEN_DOMAIN_NAMES,
   Fetch,
+  asRequest,
   fetchMaxSizeProcessor,
   forbiddenDomainNameRequestTransform,
   protocolCheckRequestTransform,
@@ -11,7 +11,6 @@ import {
   toRequestTransformer,
 } from '@atproto-labs/fetch'
 import { pipe } from '@atproto-labs/pipe'
-
 import { unicastFetchWrap } from './unicast.js'
 
 export type SafeFetchWrapOptions = NonNullable<
diff --git a/packages/internal/fetch-node/src/unicast.ts b/packages/internal/fetch-node/src/unicast.ts
index aae1f9ae33b..84378dabbe4 100644
--- a/packages/internal/fetch-node/src/unicast.ts
+++ b/packages/internal/fetch-node/src/unicast.ts
@@ -1,17 +1,15 @@
 import dns, { LookupAddress } from 'node:dns'
 import { LookupFunction } from 'node:net'
-
+import ipaddr from 'ipaddr.js'
+import { parse as pslParse } from 'psl'
+import { Agent, Client } from 'undici'
 import {
-  asRequest,
-  extractUrl,
   Fetch,
   FetchContext,
   FetchRequestError,
+  asRequest,
+  extractUrl,
 } from '@atproto-labs/fetch'
-import ipaddr from 'ipaddr.js'
-import { parse as pslParse } from 'psl'
-import { Agent, Client } from 'undici'
-
 import { isUnicastIp } from './util.js'
 
 const { IPv4, IPv6 } = ipaddr
diff --git a/packages/internal/fetch/src/fetch-response.ts b/packages/internal/fetch/src/fetch-response.ts
index c4830e1ce0e..09e903bfefd 100644
--- a/packages/internal/fetch/src/fetch-response.ts
+++ b/packages/internal/fetch/src/fetch-response.ts
@@ -1,8 +1,5 @@
+import type { ParseParams, TypeOf, ZodTypeAny } from 'zod'
 import { Transformer, pipe } from '@atproto-labs/pipe'
-
-// optional dependency for typing purposes
-import type { ZodTypeAny, ParseParams, TypeOf } from 'zod'
-
 import { FetchError } from './fetch-error.js'
 import { TransformedResponse } from './transformed-response.js'
 import {
diff --git a/packages/internal/handle-resolver-node/package.json b/packages/internal/handle-resolver-node/package.json
index 95436279198..ba667bae43c 100644
--- a/packages/internal/handle-resolver-node/package.json
+++ b/packages/internal/handle-resolver-node/package.json
@@ -25,6 +25,9 @@
       "default": "./dist/index.js"
     }
   },
+  "engines": {
+    "node": ">=18.7.0"
+  },
   "dependencies": {
     "@atproto-labs/fetch-node": "workspace:*",
     "@atproto-labs/handle-resolver": "workspace:*",
diff --git a/packages/internal/handle-resolver-node/src/atproto-handle-resolver-node.ts b/packages/internal/handle-resolver-node/src/atproto-handle-resolver-node.ts
index 626dca43886..ffe46c23275 100644
--- a/packages/internal/handle-resolver-node/src/atproto-handle-resolver-node.ts
+++ b/packages/internal/handle-resolver-node/src/atproto-handle-resolver-node.ts
@@ -3,7 +3,6 @@ import {
   AtprotoHandleResolver,
   HandleResolver,
 } from '@atproto-labs/handle-resolver'
-
 import {
   nodeResolveTxtDefault,
   nodeResolveTxtFactory,
diff --git a/packages/internal/handle-resolver-node/src/node-resolve-txt-factory.ts b/packages/internal/handle-resolver-node/src/node-resolve-txt-factory.ts
index 2429ea139f0..169cf910cbd 100644
--- a/packages/internal/handle-resolver-node/src/node-resolve-txt-factory.ts
+++ b/packages/internal/handle-resolver-node/src/node-resolve-txt-factory.ts
@@ -1,6 +1,5 @@
 import { Resolver, lookup, resolveTxt } from 'node:dns/promises'
 import { isIP } from 'node:net'
-
 import { ResolveTxt } from '@atproto-labs/handle-resolver'
 
 export const nodeResolveTxtDefault: ResolveTxt = (hostname) =>
diff --git a/packages/internal/handle-resolver/src/app-view-handle-resolver.ts b/packages/internal/handle-resolver/src/app-view-handle-resolver.ts
index 507d962becb..1152d6827a4 100644
--- a/packages/internal/handle-resolver/src/app-view-handle-resolver.ts
+++ b/packages/internal/handle-resolver/src/app-view-handle-resolver.ts
@@ -1,5 +1,4 @@
-import z from 'zod'
-
+import { z } from 'zod'
 import {
   HandleResolver,
   ResolveHandleOptions,
diff --git a/packages/internal/handle-resolver/src/atproto-doh-handle-resolver.ts b/packages/internal/handle-resolver/src/atproto-doh-handle-resolver.ts
index 3df7913bc07..65980db3bf3 100644
--- a/packages/internal/handle-resolver/src/atproto-doh-handle-resolver.ts
+++ b/packages/internal/handle-resolver/src/atproto-doh-handle-resolver.ts
@@ -2,8 +2,8 @@ import {
   AtprotoHandleResolver,
   AtprotoHandleResolverOptions,
 } from './atproto-handle-resolver.js'
-import { HandleResolver } from './types.js'
 import { ResolveTxt } from './internal-resolvers/dns-handle-resolver.js'
+import { HandleResolver } from './types.js'
 
 export type AtprotoDohHandleResolverOptions = Omit<
   AtprotoHandleResolverOptions,
diff --git a/packages/internal/handle-resolver/src/cached-handle-resolver.ts b/packages/internal/handle-resolver/src/cached-handle-resolver.ts
index 374632633c5..7d9471b0089 100644
--- a/packages/internal/handle-resolver/src/cached-handle-resolver.ts
+++ b/packages/internal/handle-resolver/src/cached-handle-resolver.ts
@@ -2,8 +2,8 @@ import { CachedGetter, SimpleStore } from '@atproto-labs/simple-store'
 import { SimpleStoreMemory } from '@atproto-labs/simple-store-memory'
 import {
   HandleResolver,
-  ResolvedHandle,
   ResolveHandleOptions,
+  ResolvedHandle,
 } from './types.js'
 
 export type HandleCache = SimpleStore<string, ResolvedHandle>
diff --git a/packages/internal/identity-resolver/src/identity-resolver.ts b/packages/internal/identity-resolver/src/identity-resolver.ts
index a0c4d8fa8f2..efbdc4f36a1 100644
--- a/packages/internal/identity-resolver/src/identity-resolver.ts
+++ b/packages/internal/identity-resolver/src/identity-resolver.ts
@@ -1,3 +1,4 @@
+import { normalizeAndEnsureValidHandle } from '@atproto/syntax'
 import {
   Did,
   DidDocument,
@@ -8,11 +9,10 @@ import {
 import {
   AtprotoIdentityDidMethods,
   HandleResolver,
-  isResolvedHandle,
-  ResolvedHandle,
   ResolveHandleOptions,
+  ResolvedHandle,
+  isResolvedHandle,
 } from '@atproto-labs/handle-resolver'
-import { normalizeAndEnsureValidHandle } from '@atproto/syntax'
 
 export type ResolvedIdentity = {
   did: NonNullable<ResolvedHandle>
diff --git a/packages/internal/rollup-plugin-bundle-manifest/package.json b/packages/internal/rollup-plugin-bundle-manifest/package.json
index 8578f0414a6..c935b2c5132 100644
--- a/packages/internal/rollup-plugin-bundle-manifest/package.json
+++ b/packages/internal/rollup-plugin-bundle-manifest/package.json
@@ -23,6 +23,12 @@
       "default": "./dist/index.js"
     }
   },
+  "engines": {
+    "node": ">=18.7.0"
+  },
+  "files": [
+    "dist"
+  ],
   "dependencies": {
     "mime": "^3.0.0"
   },
diff --git a/packages/internal/rollup-plugin-bundle-manifest/src/index.ts b/packages/internal/rollup-plugin-bundle-manifest/src/index.ts
index 83c4b0266cd..dae083970d2 100644
--- a/packages/internal/rollup-plugin-bundle-manifest/src/index.ts
+++ b/packages/internal/rollup-plugin-bundle-manifest/src/index.ts
@@ -1,6 +1,5 @@
 import { createHash } from 'node:crypto'
 import { extname } from 'node:path'
-
 import mime from 'mime'
 import { Plugin } from 'rollup'
 
diff --git a/packages/internal/simple-store-memory/src/index.ts b/packages/internal/simple-store-memory/src/index.ts
index b2150c969a8..c1ae5a5c19c 100644
--- a/packages/internal/simple-store-memory/src/index.ts
+++ b/packages/internal/simple-store-memory/src/index.ts
@@ -1,6 +1,5 @@
-import { SimpleStore, Key, Value } from '@atproto-labs/simple-store'
 import { LRUCache } from 'lru-cache'
-
+import { Key, SimpleStore, Value } from '@atproto-labs/simple-store'
 import { roughSizeOfObject } from './util.js'
 
 export type SimpleStoreMemoryOptions<K extends Key, V extends Value> = {
diff --git a/packages/internal/simple-store/src/cached-getter.ts b/packages/internal/simple-store/src/cached-getter.ts
index 8c2b2b20153..45d43247c4b 100644
--- a/packages/internal/simple-store/src/cached-getter.ts
+++ b/packages/internal/simple-store/src/cached-getter.ts
@@ -1,4 +1,4 @@
-import { Awaitable, SimpleStore, Key, Value } from './simple-store.js'
+import { Awaitable, Key, SimpleStore, Value } from './simple-store.js'
 
 export type GetCachedOptions = {
   signal?: AbortSignal
diff --git a/packages/lex-cli/package.json b/packages/lex-cli/package.json
index 1e291106425..e1c3843af63 100644
--- a/packages/lex-cli/package.json
+++ b/packages/lex-cli/package.json
@@ -21,6 +21,9 @@
   "scripts": {
     "build": "tsc --build tsconfig.build.json"
   },
+  "engines": {
+    "node": ">=18.7.0"
+  },
   "dependencies": {
     "@atproto/lexicon": "workspace:^",
     "@atproto/syntax": "workspace:^",
diff --git a/packages/lex-cli/src/codegen/client.ts b/packages/lex-cli/src/codegen/client.ts
index eee06071277..1ec1d6fa836 100644
--- a/packages/lex-cli/src/codegen/client.ts
+++ b/packages/lex-cli/src/codegen/client.ts
@@ -4,26 +4,26 @@ import {
   SourceFile,
   VariableDeclarationKind,
 } from 'ts-morph'
-import { Lexicons, LexiconDoc, LexRecord } from '@atproto/lexicon'
+import { LexRecord, LexiconDoc, Lexicons } from '@atproto/lexicon'
 import { NSID } from '@atproto/syntax'
-import { gen, utilTs, lexiconsTs } from './common'
 import { GeneratedAPI } from '../types'
+import { gen, lexiconsTs, utilTs } from './common'
 import {
   genImports,
-  genUserType,
+  genObjHelpers,
   genObject,
-  genXrpcParams,
+  genUserType,
   genXrpcInput,
   genXrpcOutput,
-  genObjHelpers,
+  genXrpcParams,
 } from './lex-gen'
 import {
-  lexiconsToDefTree,
   DefTreeNode,
+  lexiconsToDefTree,
   schemasToNsidTokens,
   toCamelCase,
-  toTitleCase,
   toScreamingSnakeCase,
+  toTitleCase,
 } from './util'
 
 const ATP_METHODS = {
diff --git a/packages/lex-cli/src/codegen/common.ts b/packages/lex-cli/src/codegen/common.ts
index caff2caf889..4ebaf748040 100644
--- a/packages/lex-cli/src/codegen/common.ts
+++ b/packages/lex-cli/src/codegen/common.ts
@@ -1,6 +1,6 @@
+import { format } from 'prettier'
 import { Project, SourceFile, VariableDeclarationKind } from 'ts-morph'
 import { LexiconDoc } from '@atproto/lexicon'
-import prettier from 'prettier'
 import { GeneratedFile } from '../types'
 
 const PRETTIER_OPTS = {
@@ -122,7 +122,7 @@ export async function gen(
   const src = project.getFileSystem().readFileSync(path)
   return {
     path: path,
-    content: `${banner()}${await prettier.format(src, PRETTIER_OPTS)}`,
+    content: `${banner()}${await format(src, PRETTIER_OPTS)}`,
   }
 }
 
diff --git a/packages/lex-cli/src/codegen/lex-gen.ts b/packages/lex-cli/src/codegen/lex-gen.ts
index a50eae9c2e5..ebc04fedbd7 100644
--- a/packages/lex-cli/src/codegen/lex-gen.ts
+++ b/packages/lex-cli/src/codegen/lex-gen.ts
@@ -1,18 +1,18 @@
+import { relative as getRelativePath } from 'node:path'
 import { SourceFile, VariableDeclarationKind } from 'ts-morph'
-import { relative as getRelativePath } from 'path'
 import {
-  Lexicons,
-  LexUserType,
-  LexObject,
   LexArray,
-  LexPrimitive,
   LexBlob,
-  LexToken,
-  LexCidLink,
   LexBytes,
+  LexCidLink,
   LexIpldType,
+  LexObject,
+  LexPrimitive,
+  LexToken,
+  LexUserType,
+  Lexicons,
 } from '@atproto/lexicon'
-import { toCamelCase, toTitleCase, toScreamingSnakeCase } from './util'
+import { toCamelCase, toScreamingSnakeCase, toTitleCase } from './util'
 
 interface Commentable<T> {
   addJsDoc: ({ description }: { description: string }) => T
diff --git a/packages/lex-cli/src/codegen/server.ts b/packages/lex-cli/src/codegen/server.ts
index 6b741b94d81..110e8a0b13e 100644
--- a/packages/lex-cli/src/codegen/server.ts
+++ b/packages/lex-cli/src/codegen/server.ts
@@ -4,26 +4,26 @@ import {
   SourceFile,
   VariableDeclarationKind,
 } from 'ts-morph'
-import { Lexicons, LexiconDoc } from '@atproto/lexicon'
+import { LexiconDoc, Lexicons } from '@atproto/lexicon'
 import { NSID } from '@atproto/syntax'
-import { gen, lexiconsTs, utilTs } from './common'
 import { GeneratedAPI } from '../types'
+import { gen, lexiconsTs, utilTs } from './common'
 import {
   genImports,
-  genUserType,
+  genObjHelpers,
   genObject,
-  genXrpcParams,
+  genUserType,
   genXrpcInput,
   genXrpcOutput,
-  genObjHelpers,
+  genXrpcParams,
 } from './lex-gen'
 import {
-  lexiconsToDefTree,
   DefTreeNode,
+  lexiconsToDefTree,
   schemasToNsidTokens,
   toCamelCase,
-  toTitleCase,
   toScreamingSnakeCase,
+  toTitleCase,
 } from './util'
 
 export async function genServerApi(
diff --git a/packages/lex-cli/src/codegen/util.ts b/packages/lex-cli/src/codegen/util.ts
index c3b7a7322d4..26cc1675c7f 100644
--- a/packages/lex-cli/src/codegen/util.ts
+++ b/packages/lex-cli/src/codegen/util.ts
@@ -1,4 +1,4 @@
-import { LexiconDoc, LexUserType } from '@atproto/lexicon'
+import { LexUserType, LexiconDoc } from '@atproto/lexicon'
 import { NSID } from '@atproto/syntax'
 
 export interface DefTreeNodeUserType {
diff --git a/packages/lex-cli/src/index.ts b/packages/lex-cli/src/index.ts
index 574a84e8b0a..5bb344e52e6 100644
--- a/packages/lex-cli/src/index.ts
+++ b/packages/lex-cli/src/index.ts
@@ -1,18 +1,18 @@
 #!/usr/bin/env node
 
-import path from 'path'
+import path from 'node:path'
 import { Command } from 'commander'
 import yesno from 'yesno'
+import { genClientApi } from './codegen/client'
+import { genServerApi } from './codegen/server'
+import * as mdGen from './mdgen'
 import {
-  readAllLexicons,
-  genTsObj,
+  applyFileDiff,
   genFileDiff,
+  genTsObj,
   printFileDiff,
-  applyFileDiff,
+  readAllLexicons,
 } from './util'
-import * as mdGen from './mdgen'
-import { genClientApi } from './codegen/client'
-import { genServerApi } from './codegen/server'
 
 const program = new Command()
 program.name('lex').description('Lexicon CLI').version('0.0.0')
diff --git a/packages/lex-cli/src/mdgen/index.ts b/packages/lex-cli/src/mdgen/index.ts
index ada79595897..d3b2bc8ee59 100644
--- a/packages/lex-cli/src/mdgen/index.ts
+++ b/packages/lex-cli/src/mdgen/index.ts
@@ -1,4 +1,4 @@
-import fs from 'fs'
+import fs from 'node:fs'
 import { LexiconDoc } from '@atproto/lexicon'
 
 const INSERT_START = [
diff --git a/packages/lex-cli/src/util.ts b/packages/lex-cli/src/util.ts
index b3fc5668a52..54ecad7e5bc 100644
--- a/packages/lex-cli/src/util.ts
+++ b/packages/lex-cli/src/util.ts
@@ -1,9 +1,9 @@
-import fs from 'fs'
-import { join } from 'path'
-import { parseLexiconDoc, LexiconDoc } from '@atproto/lexicon'
-import { ZodError, ZodFormattedError } from 'zod'
+import fs from 'node:fs'
+import { join } from 'node:path'
 import chalk from 'chalk'
-import { GeneratedAPI, FileDiff } from './types'
+import { ZodError, ZodFormattedError } from 'zod'
+import { LexiconDoc, parseLexiconDoc } from '@atproto/lexicon'
+import { FileDiff, GeneratedAPI } from './types'
 
 export function readAllLexicons(paths: string[]): LexiconDoc[] {
   const docs: LexiconDoc[] = []
diff --git a/packages/lexicon/src/blob-refs.ts b/packages/lexicon/src/blob-refs.ts
index 3b444b815b4..bda146f969d 100644
--- a/packages/lexicon/src/blob-refs.ts
+++ b/packages/lexicon/src/blob-refs.ts
@@ -1,6 +1,6 @@
-import { check, ipldToJson, schema } from '@atproto/common-web'
 import { CID } from 'multiformats/cid'
 import { z } from 'zod'
+import { check, ipldToJson, schema } from '@atproto/common-web'
 
 export const typedJsonBlobRef = z
   .object({
diff --git a/packages/lexicon/src/lexicons.ts b/packages/lexicon/src/lexicons.ts
index 382c8e898c7..cdd12b88fcd 100644
--- a/packages/lexicon/src/lexicons.ts
+++ b/packages/lexicon/src/lexicons.ts
@@ -1,22 +1,22 @@
 import {
-  LexiconDoc,
+  InvalidLexiconError,
   LexRecord,
   LexUserType,
   LexiconDefNotFoundError,
-  InvalidLexiconError,
-  ValidationResult,
+  LexiconDoc,
   ValidationError,
-  isObj,
+  ValidationResult,
   hasProp,
+  isObj,
 } from './types'
+import { toLexUri } from './util'
 import {
   assertValidRecord,
-  assertValidXrpcParams,
   assertValidXrpcInput,
-  assertValidXrpcOutput,
   assertValidXrpcMessage,
+  assertValidXrpcOutput,
+  assertValidXrpcParams,
 } from './validation'
-import { toLexUri } from './util'
 import * as ComplexValidators from './validators/complex'
 
 /**
diff --git a/packages/lexicon/src/serialize.ts b/packages/lexicon/src/serialize.ts
index 89c83171a85..31ee06683a1 100644
--- a/packages/lexicon/src/serialize.ts
+++ b/packages/lexicon/src/serialize.ts
@@ -1,11 +1,11 @@
+import { CID } from 'multiformats/cid'
 import {
-  check,
   IpldValue,
+  JsonValue,
+  check,
   ipldToJson,
   jsonToIpld,
-  JsonValue,
 } from '@atproto/common-web'
-import { CID } from 'multiformats/cid'
 import { BlobRef, jsonBlobRef } from './blob-refs'
 
 export type LexValue =
diff --git a/packages/lexicon/src/validation.ts b/packages/lexicon/src/validation.ts
index 715c37e530b..dc55f0935e9 100644
--- a/packages/lexicon/src/validation.ts
+++ b/packages/lexicon/src/validation.ts
@@ -7,7 +7,6 @@ import {
   LexXrpcQuery,
   LexXrpcSubscription,
 } from './types'
-
 import { object, validateOneOf } from './validators/complex'
 import { params } from './validators/xrpc'
 
diff --git a/packages/lexicon/src/validators/blob.ts b/packages/lexicon/src/validators/blob.ts
index 34aa64ac17f..e0684c05280 100644
--- a/packages/lexicon/src/validators/blob.ts
+++ b/packages/lexicon/src/validators/blob.ts
@@ -1,6 +1,6 @@
 import { BlobRef } from '../blob-refs'
 import { Lexicons } from '../lexicons'
-import { LexUserType, ValidationResult, ValidationError } from '../types'
+import { LexUserType, ValidationError, ValidationResult } from '../types'
 
 export function blob(
   lexicons: Lexicons,
diff --git a/packages/lexicon/src/validators/complex.ts b/packages/lexicon/src/validators/complex.ts
index 8e54eba66ac..6f066071883 100644
--- a/packages/lexicon/src/validators/complex.ts
+++ b/packages/lexicon/src/validators/complex.ts
@@ -9,9 +9,8 @@ import {
   isDiscriminatedObject,
 } from '../types'
 import { toConcreteTypes, toLexUri } from '../util'
-
 import { blob } from './blob'
-import { boolean, integer, string, bytes, cidLink, unknown } from './primitives'
+import { boolean, bytes, cidLink, integer, string, unknown } from './primitives'
 
 export function validate(
   lexicons: Lexicons,
diff --git a/packages/lexicon/src/validators/formats.ts b/packages/lexicon/src/validators/formats.ts
index 42dd2ee1a16..36a037ebfff 100644
--- a/packages/lexicon/src/validators/formats.ts
+++ b/packages/lexicon/src/validators/formats.ts
@@ -1,15 +1,15 @@
 import { isValidISODateString } from 'iso-datestring-validator'
 import { CID } from 'multiformats/cid'
-import { ValidationResult, ValidationError } from '../types'
+import { validateLanguage } from '@atproto/common-web'
 import {
+  ensureValidAtUri,
   ensureValidDid,
   ensureValidHandle,
   ensureValidNsid,
-  ensureValidAtUri,
-  ensureValidTid,
   ensureValidRecordKey,
+  ensureValidTid,
 } from '@atproto/syntax'
-import { validateLanguage } from '@atproto/common-web'
+import { ValidationError, ValidationResult } from '../types'
 
 export function datetime(path: string, value: string): ValidationResult {
   try {
diff --git a/packages/lexicon/src/validators/primitives.ts b/packages/lexicon/src/validators/primitives.ts
index 81728279e02..919173fe697 100644
--- a/packages/lexicon/src/validators/primitives.ts
+++ b/packages/lexicon/src/validators/primitives.ts
@@ -1,16 +1,16 @@
-import { utf8Len, graphemeLen } from '@atproto/common-web'
 import { CID } from 'multiformats/cid'
+import { graphemeLen, utf8Len } from '@atproto/common-web'
 import { Lexicons } from '../lexicons'
-import * as formats from './formats'
 import {
-  LexUserType,
   LexBoolean,
+  LexBytes,
   LexInteger,
   LexString,
-  ValidationResult,
+  LexUserType,
   ValidationError,
-  LexBytes,
+  ValidationResult,
 } from '../types'
+import * as formats from './formats'
 
 export function validate(
   lexicons: Lexicons,
diff --git a/packages/lexicon/src/validators/xrpc.ts b/packages/lexicon/src/validators/xrpc.ts
index ef43c52a79d..9384e489f83 100644
--- a/packages/lexicon/src/validators/xrpc.ts
+++ b/packages/lexicon/src/validators/xrpc.ts
@@ -1,8 +1,7 @@
 import { Lexicons } from '../lexicons'
-import { LexXrpcParameters, ValidationResult, ValidationError } from '../types'
-
-import * as PrimitiveValidators from './primitives'
+import { LexXrpcParameters, ValidationError, ValidationResult } from '../types'
 import { array } from './complex'
+import * as PrimitiveValidators from './primitives'
 
 export function params(
   lexicons: Lexicons,
diff --git a/packages/oauth/jwk-jose/src/jose-key.ts b/packages/oauth/jwk-jose/src/jose-key.ts
index e60687313dd..d19c0773bf3 100644
--- a/packages/oauth/jwk-jose/src/jose-key.ts
+++ b/packages/oauth/jwk-jose/src/jose-key.ts
@@ -1,3 +1,17 @@
+import {
+  type GenerateKeyPairOptions,
+  type GenerateKeyPairResult,
+  type JWK,
+  type JWTVerifyOptions,
+  type KeyLike,
+  SignJWT,
+  errors,
+  exportJWK,
+  generateKeyPair,
+  importJWK,
+  importPKCS8,
+  jwtVerify,
+} from 'jose'
 import {
   Jwk,
   JwkError,
@@ -14,21 +28,6 @@ import {
   jwtHeaderSchema,
   jwtPayloadSchema,
 } from '@atproto/jwk'
-import {
-  SignJWT,
-  errors,
-  exportJWK,
-  generateKeyPair,
-  importJWK,
-  importPKCS8,
-  jwtVerify,
-  type GenerateKeyPairOptions,
-  type GenerateKeyPairResult,
-  type JWK,
-  type JWTVerifyOptions,
-  type KeyLike,
-} from 'jose'
-
 import { either } from './util'
 
 const { JOSEError } = errors
diff --git a/packages/oauth/jwk-webcrypto/src/webcrypto-key.ts b/packages/oauth/jwk-webcrypto/src/webcrypto-key.ts
index 74dd24b379c..ee8a72edd8d 100644
--- a/packages/oauth/jwk-webcrypto/src/webcrypto-key.ts
+++ b/packages/oauth/jwk-webcrypto/src/webcrypto-key.ts
@@ -1,7 +1,6 @@
+import { z } from 'zod'
 import { JwkError, jwkSchema } from '@atproto/jwk'
 import { GenerateKeyPairOptions, JoseKey } from '@atproto/jwk-jose'
-import z from 'zod'
-
 import { fromSubtleAlgorithm, isCryptoKeyPair } from './util.js'
 
 // Webcrypto keys are bound to a single algorithm
diff --git a/packages/oauth/jwk/src/jwks.ts b/packages/oauth/jwk/src/jwks.ts
index 25d5af452cd..cdc998e2af2 100644
--- a/packages/oauth/jwk/src/jwks.ts
+++ b/packages/oauth/jwk/src/jwks.ts
@@ -1,5 +1,4 @@
 import { z } from 'zod'
-
 import { jwkPubSchema, jwkSchema } from './jwk.js'
 
 export const jwksSchema = z.object({
diff --git a/packages/oauth/jwk/src/jwt.ts b/packages/oauth/jwk/src/jwt.ts
index 69bab7a2e28..75a84557fc4 100644
--- a/packages/oauth/jwk/src/jwt.ts
+++ b/packages/oauth/jwk/src/jwt.ts
@@ -1,5 +1,4 @@
 import { z } from 'zod'
-
 import { jwkPubSchema } from './jwk.js'
 import { jwtCharsRefinement, segmentedStringRefinementFactory } from './util.js'
 
diff --git a/packages/oauth/oauth-client-browser-example/rollup.config.js b/packages/oauth/oauth-client-browser-example/rollup.config.js
index 91e0f741347..73f561c3d22 100644
--- a/packages/oauth/oauth-client-browser-example/rollup.config.js
+++ b/packages/oauth/oauth-client-browser-example/rollup.config.js
@@ -1,10 +1,5 @@
 /* eslint-env node */
 
-const { defineConfig } = require('rollup')
-
-const {
-  default: manifest,
-} = require('@atproto-labs/rollup-plugin-bundle-manifest')
 const { default: commonjs } = require('@rollup/plugin-commonjs')
 const { default: html, makeHtmlAttributes } = require('@rollup/plugin-html')
 const { default: json } = require('@rollup/plugin-json')
@@ -12,6 +7,10 @@ const { default: nodeResolve } = require('@rollup/plugin-node-resolve')
 const { default: replace } = require('@rollup/plugin-replace')
 const { default: terser } = require('@rollup/plugin-terser')
 const { default: typescript } = require('@rollup/plugin-typescript')
+const { defineConfig } = require('rollup')
+const {
+  default: manifest,
+} = require('@atproto-labs/rollup-plugin-bundle-manifest')
 const postcss = ((m) => m.default || m)(require('rollup-plugin-postcss'))
 const serve = ((m) => m.default || m)(require('rollup-plugin-serve'))
 
diff --git a/packages/oauth/oauth-client-browser-example/src/auth/credential/use-credential-auth.ts b/packages/oauth/oauth-client-browser-example/src/auth/credential/use-credential-auth.ts
index aa6ccd45da3..c65923c9d3b 100644
--- a/packages/oauth/oauth-client-browser-example/src/auth/credential/use-credential-auth.ts
+++ b/packages/oauth/oauth-client-browser-example/src/auth/credential/use-credential-auth.ts
@@ -1,5 +1,5 @@
-import { AtpSessionData, AtpAgent } from '@atproto/api'
 import { useCallback, useMemo, useState } from 'react'
+import { AtpAgent, AtpSessionData } from '@atproto/api'
 
 type Session = AtpSessionData & { service: string }
 
diff --git a/packages/oauth/oauth-client-browser-example/src/auth/oauth/use-oauth.ts b/packages/oauth/oauth-client-browser-example/src/auth/oauth/use-oauth.ts
index c13b3998acb..9bd414f969a 100644
--- a/packages/oauth/oauth-client-browser-example/src/auth/oauth/use-oauth.ts
+++ b/packages/oauth/oauth-client-browser-example/src/auth/oauth/use-oauth.ts
@@ -1,7 +1,6 @@
 'use client'
 
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-
 import { Agent } from '@atproto/api'
 import {
   BrowserOAuthClient,
diff --git a/packages/oauth/oauth-client-browser/src/browser-oauth-client.ts b/packages/oauth/oauth-client-browser/src/browser-oauth-client.ts
index f7bafb9b47f..adbe7f472a7 100644
--- a/packages/oauth/oauth-client-browser/src/browser-oauth-client.ts
+++ b/packages/oauth/oauth-client-browser/src/browser-oauth-client.ts
@@ -9,20 +9,19 @@ import {
   SessionEventMap,
 } from '@atproto/oauth-client'
 import {
+  OAuthClientMetadataInput,
+  OAuthResponseMode,
   assertOAuthDiscoverableClientId,
   atprotoLoopbackClientMetadata,
   isOAuthClientIdLoopback,
-  OAuthClientMetadataInput,
-  OAuthResponseMode,
 } from '@atproto/oauth-types'
-
 import { BrowserOAuthDatabase } from './browser-oauth-database.js'
 import { BrowserRuntimeImplementation } from './browser-runtime-implementation.js'
 import { LoginContinuedInParentWindowError } from './errors.js'
 import {
-  buildLoopbackClientId,
   Simplify,
   TypedBroadcastChannel,
+  buildLoopbackClientId,
 } from './util.js'
 
 export type BrowserOAuthClientOptions = Simplify<
diff --git a/packages/oauth/oauth-client-browser/src/browser-oauth-database.ts b/packages/oauth/oauth-client-browser/src/browser-oauth-database.ts
index b641649ebc5..6486cfe4ee1 100644
--- a/packages/oauth/oauth-client-browser/src/browser-oauth-database.ts
+++ b/packages/oauth/oauth-client-browser/src/browser-oauth-database.ts
@@ -1,5 +1,3 @@
-import { ResolvedHandle } from '@atproto-labs/handle-resolver'
-import { SimpleStore, Value } from '@atproto-labs/simple-store'
 import { DidDocument } from '@atproto/did'
 import { Key } from '@atproto/jwk'
 import { WebcryptoKey } from '@atproto/jwk-webcrypto'
@@ -8,7 +6,8 @@ import {
   OAuthAuthorizationServerMetadata,
   OAuthProtectedResourceMetadata,
 } from '@atproto/oauth-types'
-
+import { ResolvedHandle } from '@atproto-labs/handle-resolver'
+import { SimpleStore, Value } from '@atproto-labs/simple-store'
 import { DB, DBObjectStore } from './indexed-db/index.js'
 import { TupleUnion } from './util.js'
 
diff --git a/packages/oauth/oauth-client-browser/src/indexed-db-store.ts b/packages/oauth/oauth-client-browser/src/indexed-db-store.ts
index 53980b811e8..447a93557db 100644
--- a/packages/oauth/oauth-client-browser/src/indexed-db-store.ts
+++ b/packages/oauth/oauth-client-browser/src/indexed-db-store.ts
@@ -1,4 +1,4 @@
-import { SimpleStore, Key, Value } from '@atproto-labs/simple-store'
+import { Key, SimpleStore, Value } from '@atproto-labs/simple-store'
 import { DB, DBObjectStore } from './indexed-db/index.js'
 
 const storeName = 'store'
diff --git a/packages/oauth/oauth-client-browser/src/indexed-db/db.ts b/packages/oauth/oauth-client-browser/src/indexed-db/db.ts
index 03ffe61d8c2..c37075ef986 100644
--- a/packages/oauth/oauth-client-browser/src/indexed-db/db.ts
+++ b/packages/oauth/oauth-client-browser/src/indexed-db/db.ts
@@ -1,5 +1,5 @@
-import { DatabaseSchema } from './schema.js'
 import { DBTransaction } from './db-transaction.js'
+import { DatabaseSchema } from './schema.js'
 
 export class DB<Schema extends DatabaseSchema> implements Disposable {
   static async open<Schema extends DatabaseSchema = DatabaseSchema>(
diff --git a/packages/oauth/oauth-client-node/package.json b/packages/oauth/oauth-client-node/package.json
index eb5de30cc3a..ceed5b92b38 100644
--- a/packages/oauth/oauth-client-node/package.json
+++ b/packages/oauth/oauth-client-node/package.json
@@ -24,6 +24,9 @@
       "default": "./dist/index.js"
     }
   },
+  "engines": {
+    "node": ">=18.7.0"
+  },
   "files": [
     "dist"
   ],
diff --git a/packages/oauth/oauth-client-node/src/node-dpop-store.ts b/packages/oauth/oauth-client-node/src/node-dpop-store.ts
index 61e9a992739..e68ebed97f9 100644
--- a/packages/oauth/oauth-client-node/src/node-dpop-store.ts
+++ b/packages/oauth/oauth-client-node/src/node-dpop-store.ts
@@ -1,7 +1,7 @@
-import { SimpleStore } from '@atproto-labs/simple-store'
 import { Jwk, Key } from '@atproto/jwk'
 import { JoseKey } from '@atproto/jwk-jose'
 import { InternalStateData, Session } from '@atproto/oauth-client'
+import { SimpleStore } from '@atproto-labs/simple-store'
 
 type ToDpopJwkValue<V extends { dpopKey: Key }> = Omit<V, 'dpopKey'> & {
   dpopJwk: Jwk
diff --git a/packages/oauth/oauth-client-node/src/node-oauth-client.ts b/packages/oauth/oauth-client-node/src/node-oauth-client.ts
index 8a90d7ce547..551acac28f9 100644
--- a/packages/oauth/oauth-client-node/src/node-oauth-client.ts
+++ b/packages/oauth/oauth-client-node/src/node-oauth-client.ts
@@ -1,9 +1,4 @@
 import { createHash, randomBytes } from 'node:crypto'
-
-import {
-  AtprotoHandleResolverNode,
-  AtprotoHandleResolverNodeOptions,
-} from '@atproto-labs/handle-resolver-node'
 import { JoseKey } from '@atproto/jwk-jose'
 import {
   OAuthClient,
@@ -12,7 +7,10 @@ import {
   RuntimeLock,
 } from '@atproto/oauth-client'
 import { OAuthResponseMode } from '@atproto/oauth-types'
-
+import {
+  AtprotoHandleResolverNode,
+  AtprotoHandleResolverNodeOptions,
+} from '@atproto-labs/handle-resolver-node'
 import {
   NodeSavedSessionStore,
   NodeSavedStateStore,
diff --git a/packages/oauth/oauth-client/src/atproto-token-response.ts b/packages/oauth/oauth-client/src/atproto-token-response.ts
index 08c0c56ed01..af833a16eb6 100644
--- a/packages/oauth/oauth-client/src/atproto-token-response.ts
+++ b/packages/oauth/oauth-client/src/atproto-token-response.ts
@@ -1,8 +1,7 @@
+import { TypeOf, z } from 'zod'
 import { atprotoDidSchema } from '@atproto/did'
 import { oauthTokenResponseSchema } from '@atproto/oauth-types'
-import { z, TypeOf } from 'zod'
-
-import { includesSpaceSeparatedValue, SpaceSeparatedValue } from './util'
+import { SpaceSeparatedValue, includesSpaceSeparatedValue } from './util'
 
 export type AtprotoScope = SpaceSeparatedValue<'atproto'>
 export const isAtprotoScope = (input: string): input is AtprotoScope =>
diff --git a/packages/oauth/oauth-client/src/fetch-dpop.ts b/packages/oauth/oauth-client/src/fetch-dpop.ts
index 5b50007293e..9805312acca 100644
--- a/packages/oauth/oauth-client/src/fetch-dpop.ts
+++ b/packages/oauth/oauth-client/src/fetch-dpop.ts
@@ -1,7 +1,7 @@
+import { base64url } from 'multiformats/bases/base64'
+import { Key } from '@atproto/jwk'
 import { Fetch, FetchContext, cancelBody, peekJson } from '@atproto-labs/fetch'
 import { SimpleStore } from '@atproto-labs/simple-store'
-import { Key } from '@atproto/jwk'
-import { base64url } from 'multiformats/bases/base64'
 
 // "undefined" in non https environments or environments without crypto
 const subtle = globalThis.crypto?.subtle as SubtleCrypto | undefined
diff --git a/packages/oauth/oauth-client/src/oauth-authorization-server-metadata-resolver.ts b/packages/oauth/oauth-client/src/oauth-authorization-server-metadata-resolver.ts
index 58fadb3171d..c12f130b721 100644
--- a/packages/oauth/oauth-client/src/oauth-authorization-server-metadata-resolver.ts
+++ b/packages/oauth/oauth-client/src/oauth-authorization-server-metadata-resolver.ts
@@ -1,19 +1,19 @@
 import {
-  bindFetch,
-  cancelBody,
+  OAuthAuthorizationServerMetadata,
+  oauthAuthorizationServerMetadataValidator,
+  oauthIssuerIdentifierSchema,
+} from '@atproto/oauth-types'
+import {
   Fetch,
   FetchResponseError,
+  bindFetch,
+  cancelBody,
 } from '@atproto-labs/fetch'
 import {
   CachedGetter,
   GetCachedOptions,
   SimpleStore,
 } from '@atproto-labs/simple-store'
-import {
-  OAuthAuthorizationServerMetadata,
-  oauthAuthorizationServerMetadataValidator,
-  oauthIssuerIdentifierSchema,
-} from '@atproto/oauth-types'
 import { contentMime } from './util.js'
 
 export type { GetCachedOptions, OAuthAuthorizationServerMetadata }
diff --git a/packages/oauth/oauth-client/src/oauth-client.ts b/packages/oauth/oauth-client/src/oauth-client.ts
index 6d500674925..34af06088ff 100644
--- a/packages/oauth/oauth-client/src/oauth-client.ts
+++ b/packages/oauth/oauth-client/src/oauth-client.ts
@@ -1,11 +1,20 @@
+import { Key, Keyset } from '@atproto/jwk'
+import {
+  OAuthAuthorizationRequestParameters,
+  OAuthClientIdDiscoverable,
+  OAuthClientMetadata,
+  OAuthClientMetadataInput,
+  OAuthResponseMode,
+  oauthClientMetadataSchema,
+} from '@atproto/oauth-types'
 import {
-  assertAtprotoDid,
   AtprotoDid,
   DidCache,
   DidResolverCached,
   DidResolverCommon,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   type DidResolverCommonOptions,
+  assertAtprotoDid,
 } from '@atproto-labs/did-resolver'
 import { Fetch } from '@atproto-labs/fetch'
 import {
@@ -16,16 +25,6 @@ import {
 } from '@atproto-labs/handle-resolver'
 import { IdentityResolver } from '@atproto-labs/identity-resolver'
 import { SimpleStoreMemory } from '@atproto-labs/simple-store-memory'
-import { Key, Keyset } from '@atproto/jwk'
-import {
-  OAuthAuthorizationRequestParameters,
-  OAuthClientIdDiscoverable,
-  OAuthClientMetadata,
-  OAuthClientMetadataInput,
-  oauthClientMetadataSchema,
-  OAuthResponseMode,
-} from '@atproto/oauth-types'
-
 import { FALLBACK_ALG } from './constants.js'
 import { TokenRevokedError } from './errors/token-revoked-error.js'
 import {
diff --git a/packages/oauth/oauth-client/src/oauth-protected-resource-metadata-resolver.ts b/packages/oauth/oauth-client/src/oauth-protected-resource-metadata-resolver.ts
index 25663994306..db0e1d55881 100644
--- a/packages/oauth/oauth-client/src/oauth-protected-resource-metadata-resolver.ts
+++ b/packages/oauth/oauth-client/src/oauth-protected-resource-metadata-resolver.ts
@@ -1,3 +1,7 @@
+import {
+  OAuthProtectedResourceMetadata,
+  oauthProtectedResourceMetadataSchema,
+} from '@atproto/oauth-types'
 import {
   Fetch,
   FetchResponseError,
@@ -9,10 +13,6 @@ import {
   GetCachedOptions,
   SimpleStore,
 } from '@atproto-labs/simple-store'
-import {
-  OAuthProtectedResourceMetadata,
-  oauthProtectedResourceMetadataSchema,
-} from '@atproto/oauth-types'
 import { contentMime } from './util.js'
 
 export type { GetCachedOptions, OAuthProtectedResourceMetadata }
diff --git a/packages/oauth/oauth-client/src/oauth-resolver.ts b/packages/oauth/oauth-client/src/oauth-resolver.ts
index fdd73d83853..33fadd78aa1 100644
--- a/packages/oauth/oauth-client/src/oauth-resolver.ts
+++ b/packages/oauth/oauth-client/src/oauth-resolver.ts
@@ -1,13 +1,12 @@
-import {
-  IdentityResolver,
-  ResolvedIdentity,
-  ResolveIdentityOptions,
-} from '@atproto-labs/identity-resolver'
 import {
   OAuthAuthorizationServerMetadata,
   oauthIssuerIdentifierSchema,
 } from '@atproto/oauth-types'
-
+import {
+  IdentityResolver,
+  ResolveIdentityOptions,
+  ResolvedIdentity,
+} from '@atproto-labs/identity-resolver'
 import {
   GetCachedOptions,
   OAuthAuthorizationServerMetadataResolver,
diff --git a/packages/oauth/oauth-client/src/oauth-response-error.ts b/packages/oauth/oauth-client/src/oauth-response-error.ts
index b49c2f5c1d2..5c08a0f4d19 100644
--- a/packages/oauth/oauth-client/src/oauth-response-error.ts
+++ b/packages/oauth/oauth-client/src/oauth-response-error.ts
@@ -1,4 +1,4 @@
-import { Json, ifString, ifObject } from '@atproto-labs/fetch'
+import { Json, ifObject, ifString } from '@atproto-labs/fetch'
 
 export class OAuthResponseError extends Error {
   readonly error?: string
diff --git a/packages/oauth/oauth-client/src/oauth-server-agent.ts b/packages/oauth/oauth-client/src/oauth-server-agent.ts
index 48fdebf3128..990a058b947 100644
--- a/packages/oauth/oauth-client/src/oauth-server-agent.ts
+++ b/packages/oauth/oauth-client/src/oauth-server-agent.ts
@@ -1,5 +1,3 @@
-import { Fetch, Json, bindFetch, fetchJsonProcessor } from '@atproto-labs/fetch'
-import { SimpleStore } from '@atproto-labs/simple-store'
 import { AtprotoDid } from '@atproto/did'
 import { Key, Keyset } from '@atproto/jwk'
 import {
@@ -12,7 +10,8 @@ import {
   OAuthTokenRequest,
   oauthParResponseSchema,
 } from '@atproto/oauth-types'
-
+import { Fetch, Json, bindFetch, fetchJsonProcessor } from '@atproto-labs/fetch'
+import { SimpleStore } from '@atproto-labs/simple-store'
 import {
   AtprotoScope,
   AtprotoTokenResponse,
diff --git a/packages/oauth/oauth-client/src/oauth-server-factory.ts b/packages/oauth/oauth-client/src/oauth-server-factory.ts
index a4e1164eaa4..ee5ade7cfb5 100644
--- a/packages/oauth/oauth-client/src/oauth-server-factory.ts
+++ b/packages/oauth/oauth-client/src/oauth-server-factory.ts
@@ -1,7 +1,6 @@
-import { Fetch } from '@atproto-labs/fetch'
 import { Key, Keyset } from '@atproto/jwk'
 import { OAuthAuthorizationServerMetadata } from '@atproto/oauth-types'
-
+import { Fetch } from '@atproto-labs/fetch'
 import { GetCachedOptions } from './oauth-authorization-server-metadata-resolver.js'
 import { OAuthResolver } from './oauth-resolver.js'
 import { DpopNonceCache, OAuthServerAgent } from './oauth-server-agent.js'
diff --git a/packages/oauth/oauth-client/src/oauth-session.ts b/packages/oauth/oauth-client/src/oauth-session.ts
index 43bc8e63788..feb4df32505 100644
--- a/packages/oauth/oauth-client/src/oauth-session.ts
+++ b/packages/oauth/oauth-client/src/oauth-session.ts
@@ -1,7 +1,6 @@
-import { bindFetch, Fetch } from '@atproto-labs/fetch'
 import { AtprotoDid } from '@atproto/did'
 import { OAuthAuthorizationServerMetadata } from '@atproto/oauth-types'
-
+import { Fetch, bindFetch } from '@atproto-labs/fetch'
 import { AtprotoScope } from './atproto-token-response.js'
 import { TokenInvalidError } from './errors/token-invalid-error.js'
 import { TokenRevokedError } from './errors/token-revoked-error.js'
diff --git a/packages/oauth/oauth-client/src/runtime.ts b/packages/oauth/oauth-client/src/runtime.ts
index 497546b24eb..7205f4e2709 100644
--- a/packages/oauth/oauth-client/src/runtime.ts
+++ b/packages/oauth/oauth-client/src/runtime.ts
@@ -1,6 +1,5 @@
-import { Key } from '@atproto/jwk'
 import { base64url } from 'multiformats/bases/base64'
-
+import { Key } from '@atproto/jwk'
 import { requestLocalLock } from './lock.js'
 import { RuntimeImplementation, RuntimeLock } from './runtime-implementation.js'
 
diff --git a/packages/oauth/oauth-client/src/session-getter.ts b/packages/oauth/oauth-client/src/session-getter.ts
index c33d13923d4..f1454603d2a 100644
--- a/packages/oauth/oauth-client/src/session-getter.ts
+++ b/packages/oauth/oauth-client/src/session-getter.ts
@@ -1,11 +1,10 @@
+import { AtprotoDid } from '@atproto/did'
+import { Key } from '@atproto/jwk'
 import {
   CachedGetter,
   GetCachedOptions,
   SimpleStore,
 } from '@atproto-labs/simple-store'
-import { AtprotoDid } from '@atproto/did'
-import { Key } from '@atproto/jwk'
-
 import { TokenInvalidError } from './errors/token-invalid-error.js'
 import { TokenRefreshError } from './errors/token-refresh-error.js'
 import { TokenRevokedError } from './errors/token-revoked-error.js'
@@ -13,7 +12,7 @@ import { OAuthResponseError } from './oauth-response-error.js'
 import { TokenSet } from './oauth-server-agent.js'
 import { OAuthServerFactory } from './oauth-server-factory.js'
 import { Runtime } from './runtime.js'
-import { combineSignals, CustomEventTarget, timeoutSignal } from './util.js'
+import { CustomEventTarget, combineSignals, timeoutSignal } from './util.js'
 
 export type Session = {
   dpopKey: Key
diff --git a/packages/oauth/oauth-client/src/state-store.ts b/packages/oauth/oauth-client/src/state-store.ts
index f49c36dff3a..0cafecfdc58 100644
--- a/packages/oauth/oauth-client/src/state-store.ts
+++ b/packages/oauth/oauth-client/src/state-store.ts
@@ -1,5 +1,5 @@
-import { SimpleStore } from '@atproto-labs/simple-store'
 import { Key } from '@atproto/jwk'
+import { SimpleStore } from '@atproto-labs/simple-store'
 
 export type InternalStateData = {
   iss: string
diff --git a/packages/oauth/oauth-client/src/types.ts b/packages/oauth/oauth-client/src/types.ts
index 81b9ed8eafd..53f0560d501 100644
--- a/packages/oauth/oauth-client/src/types.ts
+++ b/packages/oauth/oauth-client/src/types.ts
@@ -1,11 +1,10 @@
+import { TypeOf, z } from 'zod'
 import {
-  oauthClientIdLoopbackSchema,
   OAuthAuthorizationRequestParameters,
   oauthClientIdDiscoverableSchema,
+  oauthClientIdLoopbackSchema,
   oauthClientMetadataSchema,
 } from '@atproto/oauth-types'
-import { TypeOf, z } from 'zod'
-
 import { Simplify } from './util.js'
 
 // Note: These types are not prefixed with `OAuth` because they are not specific
diff --git a/packages/oauth/oauth-client/src/validate-client-metadata.ts b/packages/oauth/oauth-client/src/validate-client-metadata.ts
index eb38c425414..1c370186fae 100644
--- a/packages/oauth/oauth-client/src/validate-client-metadata.ts
+++ b/packages/oauth/oauth-client/src/validate-client-metadata.ts
@@ -4,7 +4,6 @@ import {
   assertOAuthDiscoverableClientId,
   assertOAuthLoopbackClientId,
 } from '@atproto/oauth-types'
-
 import { ClientMetadata, clientMetadataSchema } from './types.js'
 
 const TOKEN_ENDPOINT_AUTH_METHOD = `token_endpoint_auth_method`
diff --git a/packages/oauth/oauth-provider/package.json b/packages/oauth/oauth-provider/package.json
index 21fb54b806e..66cc156f389 100644
--- a/packages/oauth/oauth-provider/package.json
+++ b/packages/oauth/oauth-provider/package.json
@@ -27,6 +27,9 @@
       "default": "./dist/index.js"
     }
   },
+  "engines": {
+    "node": ">=18.7.0"
+  },
   "dependencies": {
     "@atproto-labs/fetch": "workspace:*",
     "@atproto-labs/fetch-node": "workspace:*",
diff --git a/packages/oauth/oauth-provider/rollup.config.js b/packages/oauth/oauth-provider/rollup.config.js
index 54a754a6d6f..7ff599c3a65 100644
--- a/packages/oauth/oauth-provider/rollup.config.js
+++ b/packages/oauth/oauth-provider/rollup.config.js
@@ -1,15 +1,14 @@
 /* eslint-env node */
 
-const { defineConfig } = require('rollup')
-
-const {
-  default: manifest,
-} = require('@atproto-labs/rollup-plugin-bundle-manifest')
 const { default: commonjs } = require('@rollup/plugin-commonjs')
 const { default: nodeResolve } = require('@rollup/plugin-node-resolve')
 const { default: replace } = require('@rollup/plugin-replace')
 const { default: terser } = require('@rollup/plugin-terser')
 const { default: typescript } = require('@rollup/plugin-typescript')
+const { defineConfig } = require('rollup')
+const {
+  default: manifest,
+} = require('@atproto-labs/rollup-plugin-bundle-manifest')
 const postcss = ((m) => m.default || m)(require('rollup-plugin-postcss'))
 
 module.exports = defineConfig((commandLineArguments) => {
diff --git a/packages/oauth/oauth-provider/src/account/account-store.ts b/packages/oauth/oauth-provider/src/account/account-store.ts
index 9966190dbec..ad49f8d98eb 100644
--- a/packages/oauth/oauth-provider/src/account/account-store.ts
+++ b/packages/oauth/oauth-provider/src/account/account-store.ts
@@ -1,5 +1,4 @@
-import z from 'zod'
-
+import { z } from 'zod'
 import { ClientId } from '../client/client-id.js'
 import { DeviceId } from '../device/device-id.js'
 import { Awaitable } from '../lib/util/type.js'
diff --git a/packages/oauth/oauth-provider/src/account/account.ts b/packages/oauth/oauth-provider/src/account/account.ts
index 7a850f791ca..505da96d0b7 100644
--- a/packages/oauth/oauth-provider/src/account/account.ts
+++ b/packages/oauth/oauth-provider/src/account/account.ts
@@ -1,5 +1,5 @@
-import { Sub } from '../oidc/sub.js'
 import { Simplify } from '../lib/util/type.js'
+import { Sub } from '../oidc/sub.js'
 
 export type Account = Simplify<{
   sub: Sub // Account id
diff --git a/packages/oauth/oauth-provider/src/assets/app/hooks/use-api.ts b/packages/oauth/oauth-provider/src/assets/app/hooks/use-api.ts
index 5a70541ebe5..f943a16bde7 100644
--- a/packages/oauth/oauth-provider/src/assets/app/hooks/use-api.ts
+++ b/packages/oauth/oauth-provider/src/assets/app/hooks/use-api.ts
@@ -1,5 +1,4 @@
 import { useCallback, useMemo, useState } from 'react'
-
 import { Account, AuthorizeData, Session } from '../backend-data'
 import { Api } from '../lib/api'
 import { upsert } from '../lib/util'
@@ -76,7 +75,7 @@ export function useApi(
   )
 
   const doSignUp = useCallback(
-    (data: SignUpData) => {
+    (_data: SignUpData) => {
       //
       throw new Error('Not implemented')
     },
diff --git a/packages/oauth/oauth-provider/src/assets/app/lib/api.ts b/packages/oauth/oauth-provider/src/assets/app/lib/api.ts
index ecf95d71ab2..1237e9a22aa 100644
--- a/packages/oauth/oauth-provider/src/assets/app/lib/api.ts
+++ b/packages/oauth/oauth-provider/src/assets/app/lib/api.ts
@@ -1,5 +1,4 @@
 import { FetchResponseError, Json } from '@atproto-labs/fetch'
-
 import { Account, Session } from '../backend-data'
 
 export class Api {
diff --git a/packages/oauth/oauth-provider/src/assets/assets-middleware.ts b/packages/oauth/oauth-provider/src/assets/assets-middleware.ts
index 81985842fc6..af2e046d99e 100644
--- a/packages/oauth/oauth-provider/src/assets/assets-middleware.ts
+++ b/packages/oauth/oauth-provider/src/assets/assets-middleware.ts
@@ -4,7 +4,6 @@ import {
   validateFetchSite,
   writeStream,
 } from '../lib/http/index.js'
-
 import { ASSETS_URL_PREFIX, getAsset } from './index.js'
 
 export function authorizeAssetsMiddleware(): Middleware {
diff --git a/packages/oauth/oauth-provider/src/assets/index.ts b/packages/oauth/oauth-provider/src/assets/index.ts
index c7cf4d6098d..e6eff66bfc2 100644
--- a/packages/oauth/oauth-provider/src/assets/index.ts
+++ b/packages/oauth/oauth-provider/src/assets/index.ts
@@ -1,5 +1,3 @@
-import type { ManifestItem } from '@atproto-labs/rollup-plugin-bundle-manifest'
-
 // If this library is used as a regular dependency (e.g. from node_modules), the
 // assets will simply be referenced from the node_modules directory. However, if
 // this library is bundled (e.g. via rollup), the assets need to be copied to
@@ -17,8 +15,9 @@ import type { ManifestItem } from '@atproto-labs/rollup-plugin-bundle-manifest'
 import { createReadStream } from 'node:fs'
 import { join, posix } from 'node:path'
 import { Readable } from 'node:stream'
-
+import type { ManifestItem } from '@atproto-labs/rollup-plugin-bundle-manifest'
 // @ts-expect-error: This file is generated at build time
+// eslint-disable-next-line import/no-unresolved
 import appBundleManifestJson from './app/bundle-manifest.json'
 import { Asset } from './asset'
 
diff --git a/packages/oauth/oauth-provider/src/client/client-auth.ts b/packages/oauth/oauth-provider/src/client/client-auth.ts
index 9577a8d7334..b60e1537e38 100644
--- a/packages/oauth/oauth-provider/src/client/client-auth.ts
+++ b/packages/oauth/oauth-provider/src/client/client-auth.ts
@@ -1,6 +1,5 @@
-import { CLIENT_ASSERTION_TYPE_JWT_BEARER } from '@atproto/oauth-types'
 import { KeyLike, calculateJwkThumbprint, errors, exportJWK } from 'jose'
-
+import { CLIENT_ASSERTION_TYPE_JWT_BEARER } from '@atproto/oauth-types'
 import { InvalidClientError } from '../errors/invalid-client-error.js'
 
 const { JOSEError } = errors
diff --git a/packages/oauth/oauth-provider/src/client/client-manager.ts b/packages/oauth/oauth-provider/src/client/client-manager.ts
index 772e0f67162..677448642b9 100644
--- a/packages/oauth/oauth-provider/src/client/client-manager.ts
+++ b/packages/oauth/oauth-provider/src/client/client-manager.ts
@@ -1,6 +1,18 @@
+import { Jwks, Keyset, jwksSchema } from '@atproto/jwk'
+import {
+  OAuthAuthorizationServerMetadata,
+  OAuthClientIdDiscoverable,
+  OAuthClientIdLoopback,
+  OAuthClientMetadata,
+  OAuthClientMetadataInput,
+  isLoopbackHost,
+  isOAuthClientIdDiscoverable,
+  isOAuthClientIdLoopback,
+  oauthClientMetadataSchema,
+} from '@atproto/oauth-types'
 import {
-  bindFetch,
   Fetch,
+  bindFetch,
   fetchJsonProcessor,
   fetchJsonZodProcessor,
   fetchOkProcessor,
@@ -11,19 +23,6 @@ import {
   GetCachedOptions,
   SimpleStore,
 } from '@atproto-labs/simple-store'
-import { Jwks, jwksSchema, Keyset } from '@atproto/jwk'
-import {
-  isLoopbackHost,
-  isOAuthClientIdDiscoverable,
-  isOAuthClientIdLoopback,
-  OAuthAuthorizationServerMetadata,
-  OAuthClientIdDiscoverable,
-  OAuthClientIdLoopback,
-  OAuthClientMetadata,
-  OAuthClientMetadataInput,
-  oauthClientMetadataSchema,
-} from '@atproto/oauth-types'
-
 import { InvalidClientMetadataError } from '../errors/invalid-client-metadata-error.js'
 import { InvalidRedirectUriError } from '../errors/invalid-redirect-uri-error.js'
 import { callAsync } from '../lib/util/function.js'
diff --git a/packages/oauth/oauth-provider/src/client/client-store.ts b/packages/oauth/oauth-provider/src/client/client-store.ts
index fdf05d7d0ed..b02abe79674 100644
--- a/packages/oauth/oauth-provider/src/client/client-store.ts
+++ b/packages/oauth/oauth-provider/src/client/client-store.ts
@@ -1,5 +1,4 @@
 import { OAuthClientMetadata } from '@atproto/oauth-types'
-
 import { Awaitable } from '../lib/util/type.js'
 import { ClientId } from './client-id.js'
 
diff --git a/packages/oauth/oauth-provider/src/client/client-utils.ts b/packages/oauth/oauth-provider/src/client/client-utils.ts
index 7a17e0b29c7..6331a99a473 100644
--- a/packages/oauth/oauth-provider/src/client/client-utils.ts
+++ b/packages/oauth/oauth-provider/src/client/client-utils.ts
@@ -2,7 +2,6 @@ import {
   OAuthClientIdDiscoverable,
   parseOAuthDiscoverableClientId,
 } from '@atproto/oauth-types'
-
 import { InvalidClientIdError } from '../errors/invalid-client-id-error.js'
 import { InvalidRedirectUriError } from '../errors/invalid-redirect-uri-error.js'
 import { isInternetHost } from '../lib/util/hostname.js'
diff --git a/packages/oauth/oauth-provider/src/client/client.ts b/packages/oauth/oauth-provider/src/client/client.ts
index 4dd881c2af9..458de158ead 100644
--- a/packages/oauth/oauth-provider/src/client/client.ts
+++ b/packages/oauth/oauth-provider/src/client/client.ts
@@ -1,26 +1,25 @@
-import { Jwks } from '@atproto/jwk'
-import {
-  CLIENT_ASSERTION_TYPE_JWT_BEARER,
-  OAuthAuthorizationRequestParameters,
-  OAuthClientCredentials,
-  OAuthClientMetadata,
-  OAuthRedirectUri,
-} from '@atproto/oauth-types'
 import {
-  UnsecuredJWT,
-  createLocalJWKSet,
-  createRemoteJWKSet,
-  errors,
-  jwtVerify,
   type JWTPayload,
   type JWTVerifyGetKey,
   type JWTVerifyOptions,
   type JWTVerifyResult,
   type KeyLike,
   type ResolvedKey,
+  UnsecuredJWT,
   type UnsecuredResult,
+  createLocalJWKSet,
+  createRemoteJWKSet,
+  errors,
+  jwtVerify,
 } from 'jose'
-
+import { Jwks } from '@atproto/jwk'
+import {
+  CLIENT_ASSERTION_TYPE_JWT_BEARER,
+  OAuthAuthorizationRequestParameters,
+  OAuthClientCredentials,
+  OAuthClientMetadata,
+  OAuthRedirectUri,
+} from '@atproto/oauth-types'
 import { CLIENT_ASSERTION_MAX_AGE, JAR_MAX_AGE } from '../constants.js'
 import { InvalidAuthorizationDetailsError } from '../errors/invalid-authorization-details-error.js'
 import { InvalidClientError } from '../errors/invalid-client-error.js'
diff --git a/packages/oauth/oauth-provider/src/device/device-data.ts b/packages/oauth/oauth-provider/src/device/device-data.ts
index 864211f7ae1..c9ef01ab680 100644
--- a/packages/oauth/oauth-provider/src/device/device-data.ts
+++ b/packages/oauth/oauth-provider/src/device/device-data.ts
@@ -1,5 +1,4 @@
 import { z } from 'zod'
-
 import { deviceDetailsSchema } from './device-details.js'
 import { sessionIdSchema } from './session-id.js'
 
diff --git a/packages/oauth/oauth-provider/src/device/device-details.ts b/packages/oauth/oauth-provider/src/device/device-details.ts
index 8673736146b..21ae8dd55dc 100644
--- a/packages/oauth/oauth-provider/src/device/device-details.ts
+++ b/packages/oauth/oauth-provider/src/device/device-details.ts
@@ -1,5 +1,4 @@
 import { IncomingMessage } from 'node:http'
-
 import { z } from 'zod'
 
 export const deviceDetailsSchema = z.object({
diff --git a/packages/oauth/oauth-provider/src/device/device-id.ts b/packages/oauth/oauth-provider/src/device/device-id.ts
index ced0c1a416d..a2d6de8cd3d 100644
--- a/packages/oauth/oauth-provider/src/device/device-id.ts
+++ b/packages/oauth/oauth-provider/src/device/device-id.ts
@@ -1,5 +1,4 @@
 import { z } from 'zod'
-
 import { DEVICE_ID_BYTES_LENGTH, DEVICE_ID_PREFIX } from '../constants.js'
 import { randomHexId } from '../lib/util/crypto.js'
 
diff --git a/packages/oauth/oauth-provider/src/device/device-manager.ts b/packages/oauth/oauth-provider/src/device/device-manager.ts
index 62431b44df9..5a2c540f6f1 100644
--- a/packages/oauth/oauth-provider/src/device/device-manager.ts
+++ b/packages/oauth/oauth-provider/src/device/device-manager.ts
@@ -1,12 +1,9 @@
 import { IncomingMessage, ServerResponse } from 'node:http'
-
 import { serialize as serializeCookie } from 'cookie'
 import type Keygrip from 'keygrip'
 import { z } from 'zod'
-
-import { appendHeader, parseHttpCookies } from '../lib/http/index.js'
-
 import { SESSION_FIXATION_MAX_AGE } from '../constants.js'
+import { appendHeader, parseHttpCookies } from '../lib/http/index.js'
 import { DeviceData } from './device-data.js'
 import { extractDeviceDetails } from './device-details.js'
 import { DeviceId, deviceIdSchema, generateDeviceId } from './device-id.js'
diff --git a/packages/oauth/oauth-provider/src/device/session-id.ts b/packages/oauth/oauth-provider/src/device/session-id.ts
index e063ebdb50e..5bf3fc5904b 100644
--- a/packages/oauth/oauth-provider/src/device/session-id.ts
+++ b/packages/oauth/oauth-provider/src/device/session-id.ts
@@ -1,5 +1,4 @@
 import { z } from 'zod'
-
 import { SESSION_ID_BYTES_LENGTH, SESSION_ID_PREFIX } from '../constants.js'
 import { randomHexId } from '../lib/util/crypto.js'
 
diff --git a/packages/oauth/oauth-provider/src/dpop/dpop-manager.ts b/packages/oauth/oauth-provider/src/dpop/dpop-manager.ts
index d41813d741f..d8b5dad926c 100644
--- a/packages/oauth/oauth-provider/src/dpop/dpop-manager.ts
+++ b/packages/oauth/oauth-provider/src/dpop/dpop-manager.ts
@@ -1,7 +1,5 @@
 import { createHash } from 'node:crypto'
-
 import { EmbeddedJWK, calculateJwkThumbprint, errors, jwtVerify } from 'jose'
-
 import { DPOP_NONCE_MAX_AGE } from '../constants.js'
 import { InvalidDpopProofError } from '../errors/invalid-dpop-proof-error.js'
 import { UseDpopNonceError } from '../errors/use-dpop-nonce-error.js'
diff --git a/packages/oauth/oauth-provider/src/dpop/dpop-nonce.ts b/packages/oauth/oauth-provider/src/dpop/dpop-nonce.ts
index 4a74e8af294..a1fc7b89bce 100644
--- a/packages/oauth/oauth-provider/src/dpop/dpop-nonce.ts
+++ b/packages/oauth/oauth-provider/src/dpop/dpop-nonce.ts
@@ -1,5 +1,4 @@
 import { createHmac, randomBytes } from 'node:crypto'
-
 import { DPOP_NONCE_MAX_AGE } from '../constants.js'
 
 function numTo64bits(num: number) {
diff --git a/packages/oauth/oauth-provider/src/errors/invalid-client-metadata-error.ts b/packages/oauth/oauth-provider/src/errors/invalid-client-metadata-error.ts
index 68c046506f0..6c1297a9bf0 100644
--- a/packages/oauth/oauth-provider/src/errors/invalid-client-metadata-error.ts
+++ b/packages/oauth/oauth-provider/src/errors/invalid-client-metadata-error.ts
@@ -1,5 +1,5 @@
-import { FetchError } from '@atproto-labs/fetch'
 import { ZodError } from 'zod'
+import { FetchError } from '@atproto-labs/fetch'
 import { OAuthError } from './oauth-error.js'
 
 /**
diff --git a/packages/oauth/oauth-provider/src/errors/invalid-token-error.ts b/packages/oauth/oauth-provider/src/errors/invalid-token-error.ts
index c8771aaac11..b8c5c4a0ae7 100644
--- a/packages/oauth/oauth-provider/src/errors/invalid-token-error.ts
+++ b/packages/oauth/oauth-provider/src/errors/invalid-token-error.ts
@@ -1,7 +1,6 @@
-import { JwtVerifyError } from '@atproto/jwk'
 import { errors } from 'jose'
 import { ZodError } from 'zod'
-
+import { JwtVerifyError } from '@atproto/jwk'
 import { OAuthError } from './oauth-error.js'
 import { WWWAuthenticateError } from './www-authenticate-error.js'
 
diff --git a/packages/oauth/oauth-provider/src/errors/www-authenticate-error.ts b/packages/oauth/oauth-provider/src/errors/www-authenticate-error.ts
index c781d6212e2..12367b9639f 100644
--- a/packages/oauth/oauth-provider/src/errors/www-authenticate-error.ts
+++ b/packages/oauth/oauth-provider/src/errors/www-authenticate-error.ts
@@ -1,5 +1,4 @@
 import { VERIFY_ALGOS } from '../lib/util/crypto.js'
-
 import { OAuthError } from './oauth-error.js'
 
 export type WWWAuthenticateParams = Record<string, string | undefined>
diff --git a/packages/oauth/oauth-provider/src/lib/http/accept.ts b/packages/oauth/oauth-provider/src/lib/http/accept.ts
index 47792e8a969..b51641ecdb0 100644
--- a/packages/oauth/oauth-provider/src/lib/http/accept.ts
+++ b/packages/oauth/oauth-provider/src/lib/http/accept.ts
@@ -1,5 +1,4 @@
 import { mediaType } from '@hapi/accept'
-
 import { SubCtx, subCtx } from './context.js'
 import {
   IncomingMessage,
diff --git a/packages/oauth/oauth-provider/src/lib/http/middleware.ts b/packages/oauth/oauth-provider/src/lib/http/middleware.ts
index a959be9fcef..b052f0ef4eb 100644
--- a/packages/oauth/oauth-provider/src/lib/http/middleware.ts
+++ b/packages/oauth/oauth-provider/src/lib/http/middleware.ts
@@ -1,6 +1,6 @@
 import type { IncomingMessage, ServerResponse } from 'node:http'
 import { writeJson } from './response.js'
-import { Middleware, Handler, NextFunction } from './types.js'
+import { Handler, Middleware, NextFunction } from './types.js'
 
 export function combineMiddlewares<M extends Middleware<any, any, any>>(
   middlewares: Iterable<null | undefined | M>,
diff --git a/packages/oauth/oauth-provider/src/lib/http/request.ts b/packages/oauth/oauth-provider/src/lib/http/request.ts
index ad1bcd27de8..e9b0ef4e016 100644
--- a/packages/oauth/oauth-provider/src/lib/http/request.ts
+++ b/packages/oauth/oauth-provider/src/lib/http/request.ts
@@ -1,10 +1,9 @@
+import { randomBytes } from 'node:crypto'
 import { parse as parseCookie, serialize as serializeCookie } from 'cookie'
-import { randomBytes } from 'crypto'
 import createHttpError from 'http-errors'
-
 import { appendHeader } from './response.js'
 import { IncomingMessage, ServerResponse } from './types.js'
-import { urlMatch, UrlReference } from './url.js'
+import { UrlReference, urlMatch } from './url.js'
 
 export function validateHeaderValue(
   req: IncomingMessage,
diff --git a/packages/oauth/oauth-provider/src/lib/http/response.ts b/packages/oauth/oauth-provider/src/lib/http/response.ts
index 48b12c4b5f1..ba66df01116 100644
--- a/packages/oauth/oauth-provider/src/lib/http/response.ts
+++ b/packages/oauth/oauth-provider/src/lib/http/response.ts
@@ -1,5 +1,4 @@
 import { Readable, pipeline } from 'node:stream'
-
 import { Handler, ServerResponse } from './types.js'
 
 export function appendHeader(
diff --git a/packages/oauth/oauth-provider/src/lib/http/stream.ts b/packages/oauth/oauth-provider/src/lib/http/stream.ts
index 1d74991bd70..cd995531607 100644
--- a/packages/oauth/oauth-provider/src/lib/http/stream.ts
+++ b/packages/oauth/oauth-provider/src/lib/http/stream.ts
@@ -1,13 +1,12 @@
-import { decodeStream, streamToNodeBuffer } from '@atproto/common'
-import createHttpError from 'http-errors'
 import { IncomingMessage } from 'node:http'
 import { Readable } from 'node:stream'
-
+import createHttpError from 'http-errors'
+import { decodeStream, streamToNodeBuffer } from '@atproto/common'
 import {
   KnownNames,
   KnownParser,
-  parseContentType,
   ParserResult,
+  parseContentType,
   parsers,
 } from './parser.js'
 
diff --git a/packages/oauth/oauth-provider/src/lib/util/authorization-header.ts b/packages/oauth/oauth-provider/src/lib/util/authorization-header.ts
index b0f2037c7d2..3376be364c0 100644
--- a/packages/oauth/oauth-provider/src/lib/util/authorization-header.ts
+++ b/packages/oauth/oauth-provider/src/lib/util/authorization-header.ts
@@ -1,9 +1,8 @@
+import { z } from 'zod'
 import {
   oauthAccessTokenSchema,
   oauthTokenTypeSchema,
 } from '@atproto/oauth-types'
-import { z } from 'zod'
-
 import { InvalidRequestError } from '../../errors/invalid-request-error.js'
 import { WWWAuthenticateError } from '../../errors/www-authenticate-error.js'
 
diff --git a/packages/oauth/oauth-provider/src/lib/util/hostname.ts b/packages/oauth/oauth-provider/src/lib/util/hostname.ts
index 75e3756cd17..70f84138971 100644
--- a/packages/oauth/oauth-provider/src/lib/util/hostname.ts
+++ b/packages/oauth/oauth-provider/src/lib/util/hostname.ts
@@ -1,4 +1,4 @@
-import { parse, ParsedDomain } from 'psl'
+import { ParsedDomain, parse } from 'psl'
 
 export function isInternetUrl(url: URL): boolean {
   return parseUrlPublicSuffix(url) !== null
diff --git a/packages/oauth/oauth-provider/src/metadata/build-metadata.ts b/packages/oauth/oauth-provider/src/metadata/build-metadata.ts
index dece6e45af9..9a9172fd114 100644
--- a/packages/oauth/oauth-provider/src/metadata/build-metadata.ts
+++ b/packages/oauth/oauth-provider/src/metadata/build-metadata.ts
@@ -3,7 +3,6 @@ import {
   OAuthAuthorizationServerMetadata,
   oauthAuthorizationServerMetadataSchema,
 } from '@atproto/oauth-types'
-
 import { Client } from '../client/client.js'
 import { VERIFY_ALGOS } from '../lib/util/crypto.js'
 
diff --git a/packages/oauth/oauth-provider/src/oauth-hooks.ts b/packages/oauth/oauth-provider/src/oauth-hooks.ts
index b580ca28a4a..75e0f0bf7c3 100644
--- a/packages/oauth/oauth-provider/src/oauth-hooks.ts
+++ b/packages/oauth/oauth-provider/src/oauth-hooks.ts
@@ -5,7 +5,6 @@ import {
   OAuthClientMetadata,
   OAuthTokenResponse,
 } from '@atproto/oauth-types'
-
 import { Account } from './account/account.js'
 import { ClientAuth } from './client/client-auth.js'
 import { ClientId } from './client/client-id.js'
diff --git a/packages/oauth/oauth-provider/src/oauth-provider.ts b/packages/oauth/oauth-provider/src/oauth-provider.ts
index cbc804540ef..e2987a3a108 100644
--- a/packages/oauth/oauth-provider/src/oauth-provider.ts
+++ b/packages/oauth/oauth-provider/src/oauth-provider.ts
@@ -1,6 +1,7 @@
-import { safeFetchWrap } from '@atproto-labs/fetch-node'
-import { SimpleStore } from '@atproto-labs/simple-store'
-import { SimpleStoreMemory } from '@atproto-labs/simple-store-memory'
+import { mediaType } from '@hapi/accept'
+import createHttpError from 'http-errors'
+import type { Redis, RedisOptions } from 'ioredis'
+import { ZodError, z } from 'zod'
 import { Jwks, Keyset } from '@atproto/jwk'
 import {
   CLIENT_ASSERTION_TYPE_JWT_BEARER,
@@ -29,11 +30,9 @@ import {
   oauthTokenIdentificationSchema,
   oauthTokenRequestSchema,
 } from '@atproto/oauth-types'
-import { mediaType } from '@hapi/accept'
-import createHttpError from 'http-errors'
-import type { Redis, RedisOptions } from 'ioredis'
-import z, { ZodError } from 'zod'
-
+import { safeFetchWrap } from '@atproto-labs/fetch-node'
+import { SimpleStore } from '@atproto-labs/simple-store'
+import { SimpleStoreMemory } from '@atproto-labs/simple-store-memory'
 import { AccessTokenType } from './access-token/access-token-type.js'
 import { AccountManager } from './account/account-manager.js'
 import {
@@ -125,10 +124,10 @@ export type OAuthProviderStore = Partial<
 >
 
 export {
-  Keyset,
   type CustomMetadata,
   type Customization,
   type Handler,
+  Keyset,
   type OAuthAuthorizationServerMetadata,
 }
 
diff --git a/packages/oauth/oauth-provider/src/oauth-verifier.ts b/packages/oauth/oauth-provider/src/oauth-verifier.ts
index 2b152e02c1a..4c1b60b27dd 100644
--- a/packages/oauth/oauth-provider/src/oauth-verifier.ts
+++ b/packages/oauth/oauth-provider/src/oauth-verifier.ts
@@ -1,3 +1,4 @@
+import type { Redis, RedisOptions } from 'ioredis'
 import { Key, Keyset, isSignedJwt } from '@atproto/jwk'
 import {
   OAuthAccessToken,
@@ -5,8 +6,6 @@ import {
   OAuthTokenType,
   oauthIssuerIdentifierSchema,
 } from '@atproto/oauth-types'
-import type { Redis, RedisOptions } from 'ioredis'
-
 import { AccessTokenType } from './access-token/access-token-type.js'
 import { DpopManager, DpopManagerOptions } from './dpop/dpop-manager.js'
 import { DpopNonce } from './dpop/dpop-nonce.js'
diff --git a/packages/oauth/oauth-provider/src/output/build-authorize-data.ts b/packages/oauth/oauth-provider/src/output/build-authorize-data.ts
index 5bc4b8c064a..d86bf80b5c2 100644
--- a/packages/oauth/oauth-provider/src/output/build-authorize-data.ts
+++ b/packages/oauth/oauth-provider/src/output/build-authorize-data.ts
@@ -2,7 +2,6 @@ import {
   OAuthAuthorizationRequestParameters,
   OAuthClientMetadata,
 } from '@atproto/oauth-types'
-
 import { DeviceAccountInfo } from '../account/account-store.js'
 import { Account } from '../account/account.js'
 import { Client } from '../client/client.js'
diff --git a/packages/oauth/oauth-provider/src/output/build-error-payload.ts b/packages/oauth/oauth-provider/src/output/build-error-payload.ts
index c0c69a98ebd..e569a50d0d7 100644
--- a/packages/oauth/oauth-provider/src/output/build-error-payload.ts
+++ b/packages/oauth/oauth-provider/src/output/build-error-payload.ts
@@ -1,7 +1,6 @@
-import { JwtVerifyError } from '@atproto/jwk'
 import { errors } from 'jose'
 import { ZodError } from 'zod'
-
+import { JwtVerifyError } from '@atproto/jwk'
 import { OAuthError } from '../errors/oauth-error.js'
 
 const { JOSEError } = errors
diff --git a/packages/oauth/oauth-provider/src/output/output-manager.ts b/packages/oauth/oauth-provider/src/output/output-manager.ts
index d151dec364b..22a6c141bb2 100644
--- a/packages/oauth/oauth-provider/src/output/output-manager.ts
+++ b/packages/oauth/oauth-provider/src/output/output-manager.ts
@@ -1,17 +1,16 @@
 import { ServerResponse } from 'node:http'
-
 import { Asset } from '../assets/asset.js'
 import { getAsset } from '../assets/index.js'
-import { cssCode, Html, html } from '../lib/html/index.js'
+import { Html, cssCode, html } from '../lib/html/index.js'
 import {
   AuthorizationResultAuthorize,
   buildAuthorizeData,
 } from './build-authorize-data.js'
 import { buildErrorPayload, buildErrorStatus } from './build-error-payload.js'
 import {
+  Customization,
   buildCustomizationCss,
   buildCustomizationData,
-  Customization,
 } from './customization.js'
 import { declareBackendData, sendWebPage } from './send-web-page.js'
 
diff --git a/packages/oauth/oauth-provider/src/output/send-authorize-redirect.ts b/packages/oauth/oauth-provider/src/output/send-authorize-redirect.ts
index f5215b32c16..3220ebff690 100644
--- a/packages/oauth/oauth-provider/src/output/send-authorize-redirect.ts
+++ b/packages/oauth/oauth-provider/src/output/send-authorize-redirect.ts
@@ -1,9 +1,8 @@
+import { ServerResponse } from 'node:http'
 import {
   OAuthAuthorizationRequestParameters,
   OAuthTokenType,
 } from '@atproto/oauth-types'
-import { ServerResponse } from 'node:http'
-
 import { InvalidRequestError } from '../errors/invalid-request-error.js'
 import { html, js } from '../lib/html/index.js'
 import { Code } from '../request/code.js'
diff --git a/packages/oauth/oauth-provider/src/output/send-web-page.ts b/packages/oauth/oauth-provider/src/output/send-web-page.ts
index 35b5bae88a6..9c3eb1ebac0 100644
--- a/packages/oauth/oauth-provider/src/output/send-web-page.ts
+++ b/packages/oauth/oauth-provider/src/output/send-web-page.ts
@@ -1,14 +1,13 @@
 import { createHash } from 'node:crypto'
 import { ServerResponse } from 'node:http'
-
 import {
   AssetRef,
-  buildDocument,
   BuildDocumentOptions,
   Html,
+  buildDocument,
   js,
 } from '../lib/html/index.js'
-import { writeHtml, WriteResponseOptions } from '../lib/http/response.js'
+import { WriteResponseOptions, writeHtml } from '../lib/http/response.js'
 
 export function declareBackendData(name: string, data: unknown) {
   // The script tag is removed after the data is assigned to the global variable
diff --git a/packages/oauth/oauth-provider/src/replay/replay-manager.ts b/packages/oauth/oauth-provider/src/replay/replay-manager.ts
index 3d8f71cb4a6..80472b9c5af 100644
--- a/packages/oauth/oauth-provider/src/replay/replay-manager.ts
+++ b/packages/oauth/oauth-provider/src/replay/replay-manager.ts
@@ -1,8 +1,8 @@
 import { ClientId } from '../client/client-id.js'
 import {
   CLIENT_ASSERTION_MAX_AGE,
-  DPOP_NONCE_MAX_AGE,
   CODE_CHALLENGE_REPLAY_TIMEFRAME,
+  DPOP_NONCE_MAX_AGE,
   JAR_MAX_AGE,
 } from '../constants.js'
 import { ReplayStore } from './replay-store.js'
diff --git a/packages/oauth/oauth-provider/src/replay/replay-store-redis.ts b/packages/oauth/oauth-provider/src/replay/replay-store-redis.ts
index 445e2886e1c..c36ea787943 100644
--- a/packages/oauth/oauth-provider/src/replay/replay-store-redis.ts
+++ b/packages/oauth/oauth-provider/src/replay/replay-store-redis.ts
@@ -1,5 +1,4 @@
 import type { Redis } from 'ioredis'
-
 import { CreateRedisOptions, createRedis } from '../lib/redis.js'
 import type { ReplayStore } from './replay-store.js'
 
diff --git a/packages/oauth/oauth-provider/src/request/code.ts b/packages/oauth/oauth-provider/src/request/code.ts
index 9e81c6f4e40..5ce9c00d096 100644
--- a/packages/oauth/oauth-provider/src/request/code.ts
+++ b/packages/oauth/oauth-provider/src/request/code.ts
@@ -1,5 +1,4 @@
 import { z } from 'zod'
-
 import { CODE_BYTES_LENGTH, CODE_PREFIX } from '../constants.js'
 import { randomHexId } from '../lib/util/crypto.js'
 
diff --git a/packages/oauth/oauth-provider/src/request/request-data.ts b/packages/oauth/oauth-provider/src/request/request-data.ts
index 3021fe40d63..a76bf65ca9d 100644
--- a/packages/oauth/oauth-provider/src/request/request-data.ts
+++ b/packages/oauth/oauth-provider/src/request/request-data.ts
@@ -1,5 +1,4 @@
 import { OAuthAuthorizationRequestParameters } from '@atproto/oauth-types'
-
 import { ClientAuth } from '../client/client-auth.js'
 import { ClientId } from '../client/client-id.js'
 import { DeviceId } from '../device/device-id.js'
diff --git a/packages/oauth/oauth-provider/src/request/request-id.ts b/packages/oauth/oauth-provider/src/request/request-id.ts
index e0376aeb916..87126bb4260 100644
--- a/packages/oauth/oauth-provider/src/request/request-id.ts
+++ b/packages/oauth/oauth-provider/src/request/request-id.ts
@@ -1,5 +1,4 @@
 import { z } from 'zod'
-
 import { REQUEST_ID_BYTES_LENGTH, REQUEST_ID_PREFIX } from '../constants.js'
 import { randomHexId } from '../lib/util/crypto.js'
 
diff --git a/packages/oauth/oauth-provider/src/request/request-info.ts b/packages/oauth/oauth-provider/src/request/request-info.ts
index de68880dab1..327ea317b0d 100644
--- a/packages/oauth/oauth-provider/src/request/request-info.ts
+++ b/packages/oauth/oauth-provider/src/request/request-info.ts
@@ -1,6 +1,6 @@
 import { OAuthAuthorizationRequestParameters } from '@atproto/oauth-types'
-import { ClientId } from '../client/client-id.js'
 import { ClientAuth } from '../client/client-auth.js'
+import { ClientId } from '../client/client-id.js'
 import { RequestId } from './request-id.js'
 import { RequestUri } from './request-uri.js'
 
diff --git a/packages/oauth/oauth-provider/src/request/request-manager.ts b/packages/oauth/oauth-provider/src/request/request-manager.ts
index 3635bf3b727..58c7d911dec 100644
--- a/packages/oauth/oauth-provider/src/request/request-manager.ts
+++ b/packages/oauth/oauth-provider/src/request/request-manager.ts
@@ -3,7 +3,6 @@ import {
   OAuthAuthorizationRequestParameters,
   OAuthAuthorizationServerMetadata,
 } from '@atproto/oauth-types'
-
 import { Account } from '../account/account.js'
 import { ClientAuth } from '../client/client-auth.js'
 import { ClientId } from '../client/client-id.js'
@@ -20,22 +19,22 @@ import { InvalidAuthorizationDetailsError } from '../errors/invalid-authorizatio
 import { InvalidGrantError } from '../errors/invalid-grant-error.js'
 import { InvalidParametersError } from '../errors/invalid-parameters-error.js'
 import { InvalidRequestError } from '../errors/invalid-request-error.js'
+import { InvalidScopeError } from '../errors/invalid-scope-error.js'
 import { OAuthHooks } from '../oauth-hooks.js'
 import { Signer } from '../signer/signer.js'
 import { Code, generateCode } from './code.js'
 import {
-  isRequestDataAuthorized,
   RequestDataAuthorized,
+  isRequestDataAuthorized,
 } from './request-data.js'
 import { generateRequestId } from './request-id.js'
 import { RequestInfo } from './request-info.js'
 import { RequestStore, UpdateRequestData } from './request-store.js'
 import {
+  RequestUri,
   decodeRequestUri,
   encodeRequestUri,
-  RequestUri,
 } from './request-uri.js'
-import { InvalidScopeError } from '../errors/invalid-scope-error.js'
 
 export class RequestManager {
   constructor(
diff --git a/packages/oauth/oauth-provider/src/request/request-store-memory.ts b/packages/oauth/oauth-provider/src/request/request-store-memory.ts
index 243f42f23ed..c60c36fe1ee 100644
--- a/packages/oauth/oauth-provider/src/request/request-store-memory.ts
+++ b/packages/oauth/oauth-provider/src/request/request-store-memory.ts
@@ -1,6 +1,6 @@
 import { Code } from './code.js'
-import { RequestId } from './request-id.js'
 import { RequestData } from './request-data.js'
+import { RequestId } from './request-id.js'
 import { RequestStore } from './request-store.js'
 
 export class RequestStoreMemory implements RequestStore {
diff --git a/packages/oauth/oauth-provider/src/request/request-store-redis.ts b/packages/oauth/oauth-provider/src/request/request-store-redis.ts
index 35159312cf4..0e460e3f88b 100644
--- a/packages/oauth/oauth-provider/src/request/request-store-redis.ts
+++ b/packages/oauth/oauth-provider/src/request/request-store-redis.ts
@@ -1,12 +1,11 @@
 import type { Redis } from 'ioredis'
-
 import { CreateRedisOptions, createRedis } from '../lib/redis.js'
 import { Code } from './code.js'
 import { RequestData } from './request-data.js'
 import { RequestId, requestIdSchema } from './request-id.js'
 import { RequestStore } from './request-store.js'
 
-export type { Redis, CreateRedisOptions }
+export type { CreateRedisOptions, Redis }
 
 export type ReplayStoreRedisOptions = {
   redis: CreateRedisOptions
diff --git a/packages/oauth/oauth-provider/src/request/request-uri.ts b/packages/oauth/oauth-provider/src/request/request-uri.ts
index af2a5c41b22..33007f7e390 100644
--- a/packages/oauth/oauth-provider/src/request/request-uri.ts
+++ b/packages/oauth/oauth-provider/src/request/request-uri.ts
@@ -1,5 +1,4 @@
 import { z } from 'zod'
-
 import { RequestId, requestIdSchema } from './request-id.js'
 
 export const REQUEST_URI_PREFIX = 'urn:ietf:params:oauth:request_uri:'
diff --git a/packages/oauth/oauth-provider/src/signer/signed-token-payload.ts b/packages/oauth/oauth-provider/src/signer/signed-token-payload.ts
index 1b366b7a74d..0d74706b239 100644
--- a/packages/oauth/oauth-provider/src/signer/signed-token-payload.ts
+++ b/packages/oauth/oauth-provider/src/signer/signed-token-payload.ts
@@ -1,6 +1,5 @@
+import { z } from 'zod'
 import { jwtPayloadSchema } from '@atproto/jwk'
-import z from 'zod'
-
 import { clientIdSchema } from '../client/client-id.js'
 import { Simplify } from '../lib/util/type.js'
 import { subSchema } from '../oidc/sub.js'
diff --git a/packages/oauth/oauth-provider/src/signer/signer.ts b/packages/oauth/oauth-provider/src/signer/signer.ts
index ce864807818..9a959ff72a7 100644
--- a/packages/oauth/oauth-provider/src/signer/signer.ts
+++ b/packages/oauth/oauth-provider/src/signer/signer.ts
@@ -7,10 +7,9 @@ import {
   VerifyOptions,
 } from '@atproto/jwk'
 import {
-  OAuthAuthorizationRequestParameters,
   OAuthAuthorizationDetails,
+  OAuthAuthorizationRequestParameters,
 } from '@atproto/oauth-types'
-
 import { Client } from '../client/client.js'
 import { dateToEpoch } from '../lib/util/date.js'
 import { TokenId } from '../token/token-id.js'
diff --git a/packages/oauth/oauth-provider/src/token/refresh-token.ts b/packages/oauth/oauth-provider/src/token/refresh-token.ts
index 87720484526..27e4568a36b 100644
--- a/packages/oauth/oauth-provider/src/token/refresh-token.ts
+++ b/packages/oauth/oauth-provider/src/token/refresh-token.ts
@@ -1,5 +1,4 @@
 import { z } from 'zod'
-
 import {
   REFRESH_TOKEN_BYTES_LENGTH,
   REFRESH_TOKEN_PREFIX,
diff --git a/packages/oauth/oauth-provider/src/token/token-claims.ts b/packages/oauth/oauth-provider/src/token/token-claims.ts
index 5aba6ba4639..4cf6ceaca20 100644
--- a/packages/oauth/oauth-provider/src/token/token-claims.ts
+++ b/packages/oauth/oauth-provider/src/token/token-claims.ts
@@ -1,6 +1,5 @@
+import { z } from 'zod'
 import { jwtPayloadSchema } from '@atproto/jwk'
-import z from 'zod'
-
 import { clientIdSchema } from '../client/client-id.js'
 import { Simplify } from '../lib/util/type.js'
 import { subSchema } from '../oidc/sub.js'
diff --git a/packages/oauth/oauth-provider/src/token/token-data.ts b/packages/oauth/oauth-provider/src/token/token-data.ts
index 19703e710e6..5839b2c662d 100644
--- a/packages/oauth/oauth-provider/src/token/token-data.ts
+++ b/packages/oauth/oauth-provider/src/token/token-data.ts
@@ -2,7 +2,6 @@ import {
   OAuthAuthorizationDetails,
   OAuthAuthorizationRequestParameters,
 } from '@atproto/oauth-types'
-
 import { ClientAuth } from '../client/client-auth.js'
 import { ClientId } from '../client/client-id.js'
 import { DeviceId } from '../device/device-id.js'
diff --git a/packages/oauth/oauth-provider/src/token/token-id.ts b/packages/oauth/oauth-provider/src/token/token-id.ts
index 321158a8f13..641e066306f 100644
--- a/packages/oauth/oauth-provider/src/token/token-id.ts
+++ b/packages/oauth/oauth-provider/src/token/token-id.ts
@@ -1,5 +1,4 @@
 import { z } from 'zod'
-
 import { TOKEN_ID_BYTES_LENGTH, TOKEN_ID_PREFIX } from '../constants.js'
 import { randomHexId } from '../lib/util/crypto.js'
 
diff --git a/packages/oauth/oauth-provider/src/token/token-manager.ts b/packages/oauth/oauth-provider/src/token/token-manager.ts
index 81d8b4bcb2a..31946248c7e 100644
--- a/packages/oauth/oauth-provider/src/token/token-manager.ts
+++ b/packages/oauth/oauth-provider/src/token/token-manager.ts
@@ -1,3 +1,4 @@
+import { createHash } from 'node:crypto'
 import { isSignedJwt } from '@atproto/jwk'
 import {
   CLIENT_ASSERTION_TYPE_JWT_BEARER,
@@ -10,8 +11,6 @@ import {
   OAuthTokenResponse,
   OAuthTokenType,
 } from '@atproto/oauth-types'
-import { createHash } from 'node:crypto'
-
 import { AccessTokenType } from '../access-token/access-token-type.js'
 import { DeviceAccountInfo } from '../account/account-store.js'
 import { Account } from '../account/account.js'
diff --git a/packages/oauth/oauth-provider/src/token/verify-token-claims.ts b/packages/oauth/oauth-provider/src/token/verify-token-claims.ts
index caf51196f66..b0602190945 100644
--- a/packages/oauth/oauth-provider/src/token/verify-token-claims.ts
+++ b/packages/oauth/oauth-provider/src/token/verify-token-claims.ts
@@ -1,5 +1,4 @@
 import { OAuthAccessToken, OAuthTokenType } from '@atproto/oauth-types'
-
 import { InvalidDpopKeyBindingError } from '../errors/invalid-dpop-key-binding-error.js'
 import { InvalidDpopProofError } from '../errors/invalid-dpop-proof-error.js'
 import { asArray } from '../lib/util/cast.js'
diff --git a/packages/oauth/oauth-types/src/oauth-authorization-request-jar.ts b/packages/oauth/oauth-types/src/oauth-authorization-request-jar.ts
index faea76ab50c..a1467c13e13 100644
--- a/packages/oauth/oauth-types/src/oauth-authorization-request-jar.ts
+++ b/packages/oauth/oauth-types/src/oauth-authorization-request-jar.ts
@@ -1,5 +1,5 @@
-import { signedJwtSchema, unsignedJwtSchema } from '@atproto/jwk'
 import { z } from 'zod'
+import { signedJwtSchema, unsignedJwtSchema } from '@atproto/jwk'
 
 export const oauthAuthorizationRequestJarSchema = z.object({
   /**
diff --git a/packages/oauth/oauth-types/src/oauth-authorization-request-par.ts b/packages/oauth/oauth-types/src/oauth-authorization-request-par.ts
index aa0394a2ae7..e0435b51a4d 100644
--- a/packages/oauth/oauth-types/src/oauth-authorization-request-par.ts
+++ b/packages/oauth/oauth-types/src/oauth-authorization-request-par.ts
@@ -1,5 +1,4 @@
 import { z } from 'zod'
-
 import { oauthAuthorizationRequestJarSchema } from './oauth-authorization-request-jar.js'
 import { oauthAuthorizationRequestParametersSchema } from './oauth-authorization-request-parameters.js'
 
diff --git a/packages/oauth/oauth-types/src/oauth-authorization-request-parameters.ts b/packages/oauth/oauth-types/src/oauth-authorization-request-parameters.ts
index 965a2278b5f..13e4bf71f46 100644
--- a/packages/oauth/oauth-types/src/oauth-authorization-request-parameters.ts
+++ b/packages/oauth/oauth-types/src/oauth-authorization-request-parameters.ts
@@ -1,6 +1,5 @@
-import { signedJwtSchema } from '@atproto/jwk'
 import { z } from 'zod'
-
+import { signedJwtSchema } from '@atproto/jwk'
 import { oauthAuthorizationDetailsSchema } from './oauth-authorization-details.js'
 import { oauthClientIdSchema } from './oauth-client-id.js'
 import { oauthCodeChallengeMethodSchema } from './oauth-code-challenge-method.js'
diff --git a/packages/oauth/oauth-types/src/oauth-authorization-request-query.ts b/packages/oauth/oauth-types/src/oauth-authorization-request-query.ts
index e61bde60be2..fd94dfb3bb3 100644
--- a/packages/oauth/oauth-types/src/oauth-authorization-request-query.ts
+++ b/packages/oauth/oauth-types/src/oauth-authorization-request-query.ts
@@ -1,5 +1,4 @@
 import { z } from 'zod'
-
 import { oauthAuthorizationRequestJarSchema } from './oauth-authorization-request-jar.js'
 import { oauthAuthorizationRequestParametersSchema } from './oauth-authorization-request-parameters.js'
 import { oauthAuthorizationRequestUriSchema } from './oauth-authorization-request-uri.js'
diff --git a/packages/oauth/oauth-types/src/oauth-authorization-request-uri.ts b/packages/oauth/oauth-types/src/oauth-authorization-request-uri.ts
index 21010fcfafd..162a6a90145 100644
--- a/packages/oauth/oauth-types/src/oauth-authorization-request-uri.ts
+++ b/packages/oauth/oauth-types/src/oauth-authorization-request-uri.ts
@@ -1,5 +1,4 @@
 import { z } from 'zod'
-
 import { oauthRequestUriSchema } from './oauth-request-uri.js'
 
 export const oauthAuthorizationRequestUriSchema = z.object({
diff --git a/packages/oauth/oauth-types/src/oauth-authorization-server-metadata.ts b/packages/oauth/oauth-types/src/oauth-authorization-server-metadata.ts
index dfec6c3a435..a9298f6a757 100644
--- a/packages/oauth/oauth-types/src/oauth-authorization-server-metadata.ts
+++ b/packages/oauth/oauth-types/src/oauth-authorization-server-metadata.ts
@@ -1,5 +1,4 @@
 import { z } from 'zod'
-
 import { oauthCodeChallengeMethodSchema } from './oauth-code-challenge-method.js'
 import { oauthIssuerIdentifierSchema } from './oauth-issuer-identifier.js'
 import { webUriSchema } from './uri.js'
diff --git a/packages/oauth/oauth-types/src/oauth-client-credentials.ts b/packages/oauth/oauth-types/src/oauth-client-credentials.ts
index a1488e922f2..b1a560116c4 100644
--- a/packages/oauth/oauth-types/src/oauth-client-credentials.ts
+++ b/packages/oauth/oauth-types/src/oauth-client-credentials.ts
@@ -1,8 +1,7 @@
 import { z } from 'zod'
 import { signedJwtSchema } from '@atproto/jwk'
-
-import { oauthClientIdSchema } from './oauth-client-id.js'
 import { CLIENT_ASSERTION_TYPE_JWT_BEARER } from './constants.js'
+import { oauthClientIdSchema } from './oauth-client-id.js'
 
 export const oauthClientCredentialsJwtBearerSchema = z.object({
   client_id: oauthClientIdSchema,
diff --git a/packages/oauth/oauth-types/src/oauth-client-id-loopback.ts b/packages/oauth/oauth-types/src/oauth-client-id-loopback.ts
index 8226c1be637..0aee1572830 100644
--- a/packages/oauth/oauth-types/src/oauth-client-id-loopback.ts
+++ b/packages/oauth/oauth-types/src/oauth-client-id-loopback.ts
@@ -2,8 +2,8 @@ import { TypeOf, ZodIssueCode } from 'zod'
 import { oauthClientIdSchema } from './oauth-client-id.js'
 import {
   OAuthLoopbackRedirectURI,
-  oauthLoopbackRedirectURISchema,
   OAuthRedirectUri,
+  oauthLoopbackRedirectURISchema,
 } from './oauth-redirect-uri.js'
 import { OAuthScope, oauthScopeSchema } from './oauth-scope.js'
 
diff --git a/packages/oauth/oauth-types/src/oauth-client-metadata.ts b/packages/oauth/oauth-types/src/oauth-client-metadata.ts
index 1b005dbaadc..e535aa1746d 100644
--- a/packages/oauth/oauth-types/src/oauth-client-metadata.ts
+++ b/packages/oauth/oauth-types/src/oauth-client-metadata.ts
@@ -1,6 +1,5 @@
-import { jwksPubSchema } from '@atproto/jwk'
 import { z } from 'zod'
-
+import { jwksPubSchema } from '@atproto/jwk'
 import { oauthClientIdSchema } from './oauth-client-id.js'
 import { oauthEndpointAuthMethod } from './oauth-endpoint-auth-method.js'
 import { oauthGrantTypeSchema } from './oauth-grant-type.js'
diff --git a/packages/oauth/oauth-types/src/oauth-protected-resource-metadata.ts b/packages/oauth/oauth-types/src/oauth-protected-resource-metadata.ts
index b61ec794e8d..e44efa5c544 100644
--- a/packages/oauth/oauth-types/src/oauth-protected-resource-metadata.ts
+++ b/packages/oauth/oauth-types/src/oauth-protected-resource-metadata.ts
@@ -1,5 +1,4 @@
 import { z } from 'zod'
-
 import { oauthIssuerIdentifierSchema } from './oauth-issuer-identifier.js'
 import { webUriSchema } from './uri.js'
 
diff --git a/packages/oauth/oauth-types/src/oauth-redirect-uri.ts b/packages/oauth/oauth-types/src/oauth-redirect-uri.ts
index aaf37cf8405..25786a7cc26 100644
--- a/packages/oauth/oauth-types/src/oauth-redirect-uri.ts
+++ b/packages/oauth/oauth-types/src/oauth-redirect-uri.ts
@@ -1,7 +1,7 @@
-import { TypeOf, z, ZodIssueCode } from 'zod'
+import { TypeOf, ZodIssueCode, z } from 'zod'
 import {
-  httpsUriSchema,
   LoopbackUri,
+  httpsUriSchema,
   loopbackUriSchema,
   privateUseUriSchema,
 } from './uri.js'
diff --git a/packages/oauth/oauth-types/src/oauth-token-response.ts b/packages/oauth/oauth-types/src/oauth-token-response.ts
index c2c828cb13a..1e055d45c6b 100644
--- a/packages/oauth/oauth-types/src/oauth-token-response.ts
+++ b/packages/oauth/oauth-types/src/oauth-token-response.ts
@@ -1,6 +1,5 @@
-import { signedJwtSchema } from '@atproto/jwk'
 import { z } from 'zod'
-
+import { signedJwtSchema } from '@atproto/jwk'
 import { oauthAuthorizationDetailsSchema } from './oauth-authorization-details.js'
 import { oauthTokenTypeSchema } from './oauth-token-type.js'
 
diff --git a/packages/oauth/oauth-types/src/uri.ts b/packages/oauth/oauth-types/src/uri.ts
index d60918bf5d0..f613a4194f4 100644
--- a/packages/oauth/oauth-types/src/uri.ts
+++ b/packages/oauth/oauth-types/src/uri.ts
@@ -1,6 +1,19 @@
-import { TypeOf, z, ZodIssueCode } from 'zod'
+import { TypeOf, ZodIssueCode, z } from 'zod'
 import { isHostnameIP, isLoopbackHost } from './util.js'
 
+const canParseUrl =
+  // eslint-disable-next-line n/no-unsupported-features/node-builtins
+  URL.canParse ??
+  // URL.canParse is not available in Node.js < 18.7.0
+  ((urlStr: string): boolean => {
+    try {
+      new URL(urlStr)
+      return true
+    } catch {
+      return false
+    }
+  })
+
 /**
  * Valid, but potentially dangerous URL (`data:`, `file:`, `javascript:`, etc.).
  *
@@ -10,7 +23,7 @@ export const dangerousUriSchema = z
   .string()
   .refine(
     (data): data is `${string}:${string}` =>
-      data.includes(':') && URL.canParse(data),
+      data.includes(':') && canParseUrl(data),
     {
       message: 'Invalid URL',
     },
diff --git a/packages/ozone/bin/migration-create.ts b/packages/ozone/bin/migration-create.ts
index b51c536c4f2..8a483456bef 100644
--- a/packages/ozone/bin/migration-create.ts
+++ b/packages/ozone/bin/migration-create.ts
@@ -1,7 +1,7 @@
 #!/usr/bin/env ts-node
 
-import * as fs from 'fs/promises'
-import * as path from 'path'
+import * as fs from 'node:fs/promises'
+import * as path from 'node:path'
 
 export async function main() {
   const now = new Date()
diff --git a/packages/ozone/package.json b/packages/ozone/package.json
index 45ee74b391e..196e69ae7e3 100644
--- a/packages/ozone/package.json
+++ b/packages/ozone/package.json
@@ -25,6 +25,9 @@
     "test:updateSnapshot": "jest --updateSnapshot",
     "migration:create": "ts-node ./bin/migration-create.ts"
   },
+  "engines": {
+    "node": ">=18.7.0"
+  },
   "dependencies": {
     "@atproto/api": "workspace:^",
     "@atproto/common": "workspace:^",
diff --git a/packages/ozone/src/api/chat/getActorMetadata.ts b/packages/ozone/src/api/chat/getActorMetadata.ts
index 6bb7d86de6a..dbf75617006 100644
--- a/packages/ozone/src/api/chat/getActorMetadata.ts
+++ b/packages/ozone/src/api/chat/getActorMetadata.ts
@@ -1,6 +1,6 @@
-import { Server } from '../../lexicon'
-import AppContext from '../../context'
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
+import { Server } from '../../lexicon'
 import { ids } from '../../lexicon/lexicons'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/ozone/src/api/chat/getMessageContext.ts b/packages/ozone/src/api/chat/getMessageContext.ts
index d19e8ebfc3f..a0e70855215 100644
--- a/packages/ozone/src/api/chat/getMessageContext.ts
+++ b/packages/ozone/src/api/chat/getMessageContext.ts
@@ -1,6 +1,6 @@
-import { Server } from '../../lexicon'
-import AppContext from '../../context'
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
+import { Server } from '../../lexicon'
 import { ids } from '../../lexicon/lexicons'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/ozone/src/api/chat/index.ts b/packages/ozone/src/api/chat/index.ts
index 8c8bcc0a756..6520f631fbc 100644
--- a/packages/ozone/src/api/chat/index.ts
+++ b/packages/ozone/src/api/chat/index.ts
@@ -1,5 +1,5 @@
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 import getActorMetadata from './getActorMetadata'
 import getMessageContext from './getMessageContext'
 
diff --git a/packages/ozone/src/api/communication/createTemplate.ts b/packages/ozone/src/api/communication/createTemplate.ts
index 4eb4be4c925..e84dbdce2ad 100644
--- a/packages/ozone/src/api/communication/createTemplate.ts
+++ b/packages/ozone/src/api/communication/createTemplate.ts
@@ -1,7 +1,7 @@
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
-import { Server } from '../../lexicon'
-import AppContext from '../../context'
 import { isDuplicateTemplateNameError } from '../../communication-service/util'
+import { AppContext } from '../../context'
+import { Server } from '../../lexicon'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.communication.createTemplate({
diff --git a/packages/ozone/src/api/communication/deleteTemplate.ts b/packages/ozone/src/api/communication/deleteTemplate.ts
index 79a05c9a996..960ddf4c62e 100644
--- a/packages/ozone/src/api/communication/deleteTemplate.ts
+++ b/packages/ozone/src/api/communication/deleteTemplate.ts
@@ -1,6 +1,6 @@
 import { AuthRequiredError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.communication.deleteTemplate({
diff --git a/packages/ozone/src/api/communication/listTemplates.ts b/packages/ozone/src/api/communication/listTemplates.ts
index cb4cebdd919..22566be478e 100644
--- a/packages/ozone/src/api/communication/listTemplates.ts
+++ b/packages/ozone/src/api/communication/listTemplates.ts
@@ -1,6 +1,6 @@
 import { AuthRequiredError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.communication.listTemplates({
diff --git a/packages/ozone/src/api/communication/updateTemplate.ts b/packages/ozone/src/api/communication/updateTemplate.ts
index f1c1877a015..29557c49052 100644
--- a/packages/ozone/src/api/communication/updateTemplate.ts
+++ b/packages/ozone/src/api/communication/updateTemplate.ts
@@ -1,7 +1,7 @@
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
-import { Server } from '../../lexicon'
-import AppContext from '../../context'
 import { isDuplicateTemplateNameError } from '../../communication-service/util'
+import { AppContext } from '../../context'
+import { Server } from '../../lexicon'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.communication.updateTemplate({
diff --git a/packages/ozone/src/api/health.ts b/packages/ozone/src/api/health.ts
index e2294a07ec4..f58dfcf5eb3 100644
--- a/packages/ozone/src/api/health.ts
+++ b/packages/ozone/src/api/health.ts
@@ -1,9 +1,9 @@
-import express from 'express'
+import { Router } from 'express'
 import { sql } from 'kysely'
-import AppContext from '../context'
+import { AppContext } from '../context'
 
-export const createRouter = (ctx: AppContext): express.Router => {
-  const router = express.Router()
+export const createRouter = (ctx: AppContext): Router => {
+  const router = Router()
 
   router.get('/robots.txt', function (req, res) {
     res.type('text/plain')
diff --git a/packages/ozone/src/api/index.ts b/packages/ozone/src/api/index.ts
index a649f426c15..3ca6e6bf6ff 100644
--- a/packages/ozone/src/api/index.ts
+++ b/packages/ozone/src/api/index.ts
@@ -1,38 +1,38 @@
+import { AppContext } from '../context'
 import { Server } from '../lexicon'
-import AppContext from '../context'
-import createReport from './report/createReport'
+import chat from './chat'
+import createTemplate from './communication/createTemplate'
+import deleteTemplate from './communication/deleteTemplate'
+import listTemplates from './communication/listTemplates'
+import updateTemplate from './communication/updateTemplate'
+import fetchLabels from './label/fetchLabels'
+import queryLabels from './label/queryLabels'
+import subscribeLabels from './label/subscribeLabels'
 import emitEvent from './moderation/emitEvent'
-import searchRepos from './moderation/searchRepos'
+import getEvent from './moderation/getEvent'
 import adminGetRecord from './moderation/getRecord'
 import adminGetRecords from './moderation/getRecords'
 import getRepo from './moderation/getRepo'
-import queryStatuses from './moderation/queryStatuses'
+import getRepos from './moderation/getRepos'
 import queryEvents from './moderation/queryEvents'
-import getEvent from './moderation/getEvent'
-import queryLabels from './label/queryLabels'
-import subscribeLabels from './label/subscribeLabels'
-import fetchLabels from './label/fetchLabels'
-import createTemplate from './communication/createTemplate'
-import updateTemplate from './communication/updateTemplate'
-import deleteTemplate from './communication/deleteTemplate'
-import listTemplates from './communication/listTemplates'
-import addMember from './team/addMember'
-import updateMember from './team/updateMember'
-import deleteMember from './team/deleteMember'
-import listMembers from './team/listMembers'
-import getConfig from './server/getConfig'
-import chat from './chat'
+import queryStatuses from './moderation/queryStatuses'
+import searchRepos from './moderation/searchRepos'
 import proxied from './proxied'
+import createReport from './report/createReport'
+import getConfig from './server/getConfig'
 import setAddValues from './set/addValues'
+import deleteSet from './set/deleteSet'
+import setDeleteValues from './set/deleteValues'
 import setGetValues from './set/getValues'
 import querySets from './set/querySets'
 import upsertSet from './set/upsertSet'
-import setDeleteValues from './set/deleteValues'
-import deleteSet from './set/deleteSet'
-import getRepos from './moderation/getRepos'
 import listOptions from './setting/listOptions'
 import removeOptions from './setting/removeOptions'
 import upsertOption from './setting/upsertOption'
+import addMember from './team/addMember'
+import deleteMember from './team/deleteMember'
+import listMembers from './team/listMembers'
+import updateMember from './team/updateMember'
 
 export * as health from './health'
 
diff --git a/packages/ozone/src/api/label/fetchLabels.ts b/packages/ozone/src/api/label/fetchLabels.ts
index b9a6fa556eb..47b1f3eaf6b 100644
--- a/packages/ozone/src/api/label/fetchLabels.ts
+++ b/packages/ozone/src/api/label/fetchLabels.ts
@@ -1,5 +1,5 @@
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.temp.fetchLabels({
diff --git a/packages/ozone/src/api/label/queryLabels.ts b/packages/ozone/src/api/label/queryLabels.ts
index 38d83020fe5..4420fc21ee5 100644
--- a/packages/ozone/src/api/label/queryLabels.ts
+++ b/packages/ozone/src/api/label/queryLabels.ts
@@ -1,7 +1,7 @@
-import { Server } from '../../lexicon'
-import AppContext from '../../context'
-import { InvalidRequestError } from '@atproto/xrpc-server'
 import { sql } from 'kysely'
+import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
+import { Server } from '../../lexicon'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.label.queryLabels(async ({ params }) => {
diff --git a/packages/ozone/src/api/label/subscribeLabels.ts b/packages/ozone/src/api/label/subscribeLabels.ts
index 3ff196e3285..5d8f0d22713 100644
--- a/packages/ozone/src/api/label/subscribeLabels.ts
+++ b/packages/ozone/src/api/label/subscribeLabels.ts
@@ -1,7 +1,7 @@
-import { Server } from '../../lexicon'
-import AppContext from '../../context'
-import Outbox from '../../sequencer/outbox'
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
+import { Server } from '../../lexicon'
+import { Outbox } from '../../sequencer/outbox'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.label.subscribeLabels(async function* ({
diff --git a/packages/ozone/src/api/moderation/emitEvent.ts b/packages/ozone/src/api/moderation/emitEvent.ts
index 47b421ad53b..85a5fe3d3e1 100644
--- a/packages/ozone/src/api/moderation/emitEvent.ts
+++ b/packages/ozone/src/api/moderation/emitEvent.ts
@@ -1,7 +1,9 @@
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
+import { AdminTokenOutput, ModeratorOutput } from '../../auth-verifier'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 import {
+  ModEventTag,
   isModEventAcknowledge,
   isModEventDivert,
   isModEventEmail,
@@ -12,17 +14,15 @@ import {
   isModEventTag,
   isModEventTakedown,
   isModEventUnmuteReporter,
-  ModEventTag,
 } from '../../lexicon/types/tools/ozone/moderation/defs'
 import { HandlerInput } from '../../lexicon/types/tools/ozone/moderation/emitEvent'
 import { subjectFromInput } from '../../mod-service/subject'
-import { TagService } from '../../tag-service'
-import { retryHttp } from '../../util'
-import { ModeratorOutput, AdminTokenOutput } from '../../auth-verifier'
-import { SettingService } from '../../setting/service'
 import { ProtectedTagSettingKey } from '../../setting/constants'
+import { SettingService } from '../../setting/service'
 import { ProtectedTagSetting } from '../../setting/types'
+import { TagService } from '../../tag-service'
 import { getTagForReport } from '../../tag-service/util'
+import { retryHttp } from '../../util'
 
 const handleModerationEvent = async ({
   ctx,
diff --git a/packages/ozone/src/api/moderation/getEvent.ts b/packages/ozone/src/api/moderation/getEvent.ts
index 30a0095336e..70b8ecbd438 100644
--- a/packages/ozone/src/api/moderation/getEvent.ts
+++ b/packages/ozone/src/api/moderation/getEvent.ts
@@ -1,5 +1,5 @@
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.moderation.getEvent({
diff --git a/packages/ozone/src/api/moderation/getRecord.ts b/packages/ozone/src/api/moderation/getRecord.ts
index ffdb911021f..a2cec3a0d53 100644
--- a/packages/ozone/src/api/moderation/getRecord.ts
+++ b/packages/ozone/src/api/moderation/getRecord.ts
@@ -1,8 +1,8 @@
+import { AtUri } from '@atproto/syntax'
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 import { addAccountInfoToRepoView, getPdsAccountInfos } from '../util'
-import { AtUri } from '@atproto/syntax'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.moderation.getRecord({
diff --git a/packages/ozone/src/api/moderation/getRecords.ts b/packages/ozone/src/api/moderation/getRecords.ts
index 1596b5c9929..5f9d4b2cc7a 100644
--- a/packages/ozone/src/api/moderation/getRecords.ts
+++ b/packages/ozone/src/api/moderation/getRecords.ts
@@ -1,7 +1,7 @@
+import { AtUri } from '@atproto/syntax'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 import { addAccountInfoToRepoView, getPdsAccountInfos } from '../util'
-import { AtUri } from '@atproto/syntax'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.moderation.getRecords({
diff --git a/packages/ozone/src/api/moderation/getRepo.ts b/packages/ozone/src/api/moderation/getRepo.ts
index 8899eaa51f7..87d73be3154 100644
--- a/packages/ozone/src/api/moderation/getRepo.ts
+++ b/packages/ozone/src/api/moderation/getRepo.ts
@@ -1,6 +1,6 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 import { addAccountInfoToRepoViewDetail, getPdsAccountInfos } from '../util'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/ozone/src/api/moderation/getRepos.ts b/packages/ozone/src/api/moderation/getRepos.ts
index fb810e624fe..eb1fe9487ec 100644
--- a/packages/ozone/src/api/moderation/getRepos.ts
+++ b/packages/ozone/src/api/moderation/getRepos.ts
@@ -1,5 +1,5 @@
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 import { addAccountInfoToRepoViewDetail, getPdsAccountInfos } from '../util'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/ozone/src/api/moderation/queryEvents.ts b/packages/ozone/src/api/moderation/queryEvents.ts
index 9f8f58f3ede..387bcfe5a55 100644
--- a/packages/ozone/src/api/moderation/queryEvents.ts
+++ b/packages/ozone/src/api/moderation/queryEvents.ts
@@ -1,5 +1,5 @@
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 import { getEventType } from '../util'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/ozone/src/api/moderation/queryStatuses.ts b/packages/ozone/src/api/moderation/queryStatuses.ts
index a2f77560436..9053aa964a0 100644
--- a/packages/ozone/src/api/moderation/queryStatuses.ts
+++ b/packages/ozone/src/api/moderation/queryStatuses.ts
@@ -1,5 +1,5 @@
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.moderation.queryStatuses({
diff --git a/packages/ozone/src/api/moderation/searchRepos.ts b/packages/ozone/src/api/moderation/searchRepos.ts
index 50a6062db08..62636a4d83d 100644
--- a/packages/ozone/src/api/moderation/searchRepos.ts
+++ b/packages/ozone/src/api/moderation/searchRepos.ts
@@ -1,6 +1,6 @@
-import { Server } from '../../lexicon'
-import AppContext from '../../context'
 import { mapDefined } from '@atproto/common'
+import { AppContext } from '../../context'
+import { Server } from '../../lexicon'
 import { ids } from '../../lexicon/lexicons'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/ozone/src/api/proxied.ts b/packages/ozone/src/api/proxied.ts
index fdfe9135687..83c120b18bc 100644
--- a/packages/ozone/src/api/proxied.ts
+++ b/packages/ozone/src/api/proxied.ts
@@ -1,5 +1,5 @@
+import { AppContext } from '../context'
 import { Server } from '../lexicon'
-import AppContext from '../context'
 import { ids } from '../lexicon/lexicons'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/ozone/src/api/report/createReport.ts b/packages/ozone/src/api/report/createReport.ts
index ae40cf0b5b5..c4a3e17da1b 100644
--- a/packages/ozone/src/api/report/createReport.ts
+++ b/packages/ozone/src/api/report/createReport.ts
@@ -1,15 +1,15 @@
+import { ForbiddenError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
-import { getReasonType } from '../util'
-import { subjectFromInput } from '../../mod-service/subject'
 import {
   REASONAPPEAL,
   ReasonType,
 } from '../../lexicon/types/com/atproto/moderation/defs'
-import { ForbiddenError } from '@atproto/xrpc-server'
-import { TagService } from '../../tag-service'
 import { ModerationService } from '../../mod-service'
+import { subjectFromInput } from '../../mod-service/subject'
+import { TagService } from '../../tag-service'
 import { getTagForReport } from '../../tag-service/util'
+import { getReasonType } from '../util'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.moderation.createReport({
diff --git a/packages/ozone/src/api/server/getConfig.ts b/packages/ozone/src/api/server/getConfig.ts
index fd825f2f8da..12b1b7d137b 100644
--- a/packages/ozone/src/api/server/getConfig.ts
+++ b/packages/ozone/src/api/server/getConfig.ts
@@ -1,5 +1,5 @@
+import { AppContext } from '../../context'
 import { Server, TOOLS_OZONE_TEAM } from '../../lexicon'
-import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.server.getConfig({
diff --git a/packages/ozone/src/api/set/addValues.ts b/packages/ozone/src/api/set/addValues.ts
index 92f6580472c..1d71ec60f9f 100644
--- a/packages/ozone/src/api/set/addValues.ts
+++ b/packages/ozone/src/api/set/addValues.ts
@@ -1,6 +1,6 @@
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.set.addValues({
diff --git a/packages/ozone/src/api/set/deleteSet.ts b/packages/ozone/src/api/set/deleteSet.ts
index e6de898f047..8382ab13e5c 100644
--- a/packages/ozone/src/api/set/deleteSet.ts
+++ b/packages/ozone/src/api/set/deleteSet.ts
@@ -1,6 +1,6 @@
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.set.deleteSet({
diff --git a/packages/ozone/src/api/set/deleteValues.ts b/packages/ozone/src/api/set/deleteValues.ts
index d76eac05ecb..3c40cb484ea 100644
--- a/packages/ozone/src/api/set/deleteValues.ts
+++ b/packages/ozone/src/api/set/deleteValues.ts
@@ -1,6 +1,6 @@
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.set.deleteValues({
diff --git a/packages/ozone/src/api/set/getValues.ts b/packages/ozone/src/api/set/getValues.ts
index 4ca1878f101..13f096d46d0 100644
--- a/packages/ozone/src/api/set/getValues.ts
+++ b/packages/ozone/src/api/set/getValues.ts
@@ -1,6 +1,6 @@
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.set.getValues({
diff --git a/packages/ozone/src/api/set/querySets.ts b/packages/ozone/src/api/set/querySets.ts
index 303cea2066f..f2f44de635b 100644
--- a/packages/ozone/src/api/set/querySets.ts
+++ b/packages/ozone/src/api/set/querySets.ts
@@ -1,6 +1,6 @@
 import { AuthRequiredError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.set.querySets({
diff --git a/packages/ozone/src/api/set/upsertSet.ts b/packages/ozone/src/api/set/upsertSet.ts
index 572736f08b2..e57a06fafa0 100644
--- a/packages/ozone/src/api/set/upsertSet.ts
+++ b/packages/ozone/src/api/set/upsertSet.ts
@@ -1,6 +1,6 @@
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.set.upsertSet({
diff --git a/packages/ozone/src/api/setting/listOptions.ts b/packages/ozone/src/api/setting/listOptions.ts
index fbaaa0c0bec..0f14636a8fa 100644
--- a/packages/ozone/src/api/setting/listOptions.ts
+++ b/packages/ozone/src/api/setting/listOptions.ts
@@ -1,6 +1,6 @@
 import { AuthRequiredError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.setting.listOptions({
diff --git a/packages/ozone/src/api/setting/removeOptions.ts b/packages/ozone/src/api/setting/removeOptions.ts
index 65b15590b2e..df42c6af9e8 100644
--- a/packages/ozone/src/api/setting/removeOptions.ts
+++ b/packages/ozone/src/api/setting/removeOptions.ts
@@ -1,7 +1,7 @@
 import { AuthRequiredError } from '@atproto/xrpc-server'
-import { Server } from '../../lexicon'
-import AppContext from '../../context'
+import { AppContext } from '../../context'
 import { Member } from '../../db/schema/member'
+import { Server } from '../../lexicon'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.setting.removeOptions({
diff --git a/packages/ozone/src/api/setting/upsertOption.ts b/packages/ozone/src/api/setting/upsertOption.ts
index 408e9b32da9..1e43740acae 100644
--- a/packages/ozone/src/api/setting/upsertOption.ts
+++ b/packages/ozone/src/api/setting/upsertOption.ts
@@ -1,11 +1,11 @@
+import assert from 'node:assert'
+import { ToolsOzoneTeamDefs } from '@atproto/api'
 import { AuthRequiredError } from '@atproto/xrpc-server'
-import { Server } from '../../lexicon'
-import AppContext from '../../context'
 import { AdminTokenOutput, ModeratorOutput } from '../../auth-verifier'
-import { SettingService } from '../../setting/service'
+import { AppContext } from '../../context'
 import { Member } from '../../db/schema/member'
-import { ToolsOzoneTeamDefs } from '@atproto/api'
-import assert from 'node:assert'
+import { Server } from '../../lexicon'
+import { SettingService } from '../../setting/service'
 import { settingValidators } from '../../setting/validators'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/ozone/src/api/team/addMember.ts b/packages/ozone/src/api/team/addMember.ts
index aebe3e90a9d..1a5e6f7e9f1 100644
--- a/packages/ozone/src/api/team/addMember.ts
+++ b/packages/ozone/src/api/team/addMember.ts
@@ -1,6 +1,6 @@
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 import { getMemberRole } from '../util'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/ozone/src/api/team/deleteMember.ts b/packages/ozone/src/api/team/deleteMember.ts
index 9976ee88b4c..1064b2a5641 100644
--- a/packages/ozone/src/api/team/deleteMember.ts
+++ b/packages/ozone/src/api/team/deleteMember.ts
@@ -1,6 +1,6 @@
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.team.deleteMember({
diff --git a/packages/ozone/src/api/team/listMembers.ts b/packages/ozone/src/api/team/listMembers.ts
index 4c183a54156..5cc6f6b9a48 100644
--- a/packages/ozone/src/api/team/listMembers.ts
+++ b/packages/ozone/src/api/team/listMembers.ts
@@ -1,5 +1,5 @@
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.tools.ozone.team.listMembers({
diff --git a/packages/ozone/src/api/team/updateMember.ts b/packages/ozone/src/api/team/updateMember.ts
index 846b418fb67..e5a499afb25 100644
--- a/packages/ozone/src/api/team/updateMember.ts
+++ b/packages/ozone/src/api/team/updateMember.ts
@@ -1,6 +1,6 @@
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../context'
 import { Server } from '../../lexicon'
-import AppContext from '../../context'
 import { getMemberRole } from '../util'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/ozone/src/api/util.ts b/packages/ozone/src/api/util.ts
index 30cd23d1cd4..11aba4ad5bf 100644
--- a/packages/ozone/src/api/util.ts
+++ b/packages/ozone/src/api/util.ts
@@ -1,32 +1,32 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../context'
+import { Member } from '../db/schema/member'
+import { ModerationEvent } from '../db/schema/moderation_event'
+import { ids } from '../lexicon/lexicons'
+import { AccountView } from '../lexicon/types/com/atproto/admin/defs'
 import { InputSchema as ReportInput } from '../lexicon/types/com/atproto/moderation/createReport'
 import {
-  REASONOTHER,
-  REASONSPAM,
+  REASONAPPEAL,
   REASONMISLEADING,
+  REASONOTHER,
   REASONRUDE,
   REASONSEXUAL,
+  REASONSPAM,
   REASONVIOLATION,
-  REASONAPPEAL,
 } from '../lexicon/types/com/atproto/moderation/defs'
-import { AccountView } from '../lexicon/types/com/atproto/admin/defs'
 import {
-  RepoView,
-  RepoViewDetail,
   REVIEWCLOSED,
   REVIEWESCALATED,
   REVIEWOPEN,
+  RepoView,
+  RepoViewDetail,
 } from '../lexicon/types/tools/ozone/moderation/defs'
-import { ModerationEvent } from '../db/schema/moderation_event'
-import { ModerationSubjectStatusRow } from '../mod-service/types'
-import AppContext from '../context'
-import { Member } from '../db/schema/member'
 import {
   ROLEADMIN,
   ROLEMODERATOR,
   ROLETRIAGE,
 } from '../lexicon/types/tools/ozone/team/defs'
-import { ids } from '../lexicon/lexicons'
+import { ModerationSubjectStatusRow } from '../mod-service/types'
 
 export const getPdsAccountInfos = async (
   ctx: AppContext,
diff --git a/packages/ozone/src/api/well-known.ts b/packages/ozone/src/api/well-known.ts
index 17ee9ad3752..b3b9c94d466 100644
--- a/packages/ozone/src/api/well-known.ts
+++ b/packages/ozone/src/api/well-known.ts
@@ -1,8 +1,8 @@
-import express from 'express'
-import AppContext from '../context'
+import { Router } from 'express'
+import { AppContext } from '../context'
 
-export const createRouter = (ctx: AppContext): express.Router => {
-  const router = express.Router()
+export const createRouter = (ctx: AppContext): Router => {
+  const router = Router()
 
   router.get('/.well-known/did.json', (_req, res) => {
     const hostname =
diff --git a/packages/ozone/src/communication-service/template.ts b/packages/ozone/src/communication-service/template.ts
index f7ffd6c018e..7cf9b2734d3 100644
--- a/packages/ozone/src/communication-service/template.ts
+++ b/packages/ozone/src/communication-service/template.ts
@@ -1,5 +1,5 @@
-import Database from '../db'
 import { Selectable } from 'kysely'
+import { Database } from '../db'
 import { CommunicationTemplate } from '../db/schema/communication_template'
 import { TemplateView } from '../lexicon/types/tools/ozone/communication/defs'
 
diff --git a/packages/ozone/src/config/config.ts b/packages/ozone/src/config/config.ts
index 808163c15f1..1ce9b017291 100644
--- a/packages/ozone/src/config/config.ts
+++ b/packages/ozone/src/config/config.ts
@@ -1,6 +1,6 @@
 import assert from 'node:assert'
-import { OzoneEnvironment } from './env'
 import { DAY, HOUR } from '@atproto/common'
+import { OzoneEnvironment } from './env'
 
 // off-config but still from env:
 // logging: LOG_LEVEL, LOG_SYSTEMS, LOG_ENABLED, LOG_DESTINATION
diff --git a/packages/ozone/src/config/secrets.ts b/packages/ozone/src/config/secrets.ts
index 659e4506a03..70910477ec5 100644
--- a/packages/ozone/src/config/secrets.ts
+++ b/packages/ozone/src/config/secrets.ts
@@ -1,4 +1,4 @@
-import assert from 'assert'
+import assert from 'node:assert'
 import { OzoneEnvironment } from './env'
 
 export const envToSecrets = (env: OzoneEnvironment): OzoneSecrets => {
diff --git a/packages/ozone/src/context.ts b/packages/ozone/src/context.ts
index 71b8c5b8fd0..8cdf09a49fc 100644
--- a/packages/ozone/src/context.ts
+++ b/packages/ozone/src/context.ts
@@ -1,33 +1,33 @@
-import express from 'express'
+import assert from 'node:assert'
 import * as plc from '@did-plc/lib'
-import { DidCache, IdResolver, MemoryCache } from '@atproto/identity'
+import express from 'express'
 import { AtpAgent } from '@atproto/api'
 import { Keypair, Secp256k1Keypair } from '@atproto/crypto'
+import { DidCache, IdResolver, MemoryCache } from '@atproto/identity'
 import { createServiceAuthHeaders } from '@atproto/xrpc-server'
-import { Database } from './db'
-import { OzoneConfig, OzoneSecrets } from './config'
-import { ModerationService, ModerationServiceCreator } from './mod-service'
+import { AuthVerifier } from './auth-verifier'
 import { BackgroundQueue } from './background'
-import assert from 'assert'
-import { EventPusher } from './daemon'
-import Sequencer from './sequencer/sequencer'
 import {
   CommunicationTemplateService,
   CommunicationTemplateServiceCreator,
 } from './communication-service/template'
+import { OzoneConfig, OzoneSecrets } from './config'
+import { EventPusher } from './daemon'
 import { BlobDiverter } from './daemon/blob-diverter'
-import { AuthVerifier } from './auth-verifier'
+import { Database } from './db'
 import { ImageInvalidator } from './image-invalidator'
+import { ModerationService, ModerationServiceCreator } from './mod-service'
+import { Sequencer } from './sequencer/sequencer'
+import { SetService, SetServiceCreator } from './set/service'
+import { SettingService, SettingServiceCreator } from './setting/service'
 import { TeamService, TeamServiceCreator } from './team'
 import {
-  defaultLabelerHeader,
-  getSigningKeyId,
   LABELER_HEADER_NAME,
   ParsedLabelers,
+  defaultLabelerHeader,
+  getSigningKeyId,
   parseLabelerHeader,
 } from './util'
-import { SetService, SetServiceCreator } from './set/service'
-import { SettingService, SettingServiceCreator } from './setting/service'
 
 export type AppContextOptions = {
   db: Database
@@ -289,4 +289,3 @@ export class AppContext {
     return parsed
   }
 }
-export default AppContext
diff --git a/packages/ozone/src/daemon/blob-diverter.ts b/packages/ozone/src/daemon/blob-diverter.ts
index 42357dbaedf..87d1d14c9a2 100644
--- a/packages/ozone/src/daemon/blob-diverter.ts
+++ b/packages/ozone/src/daemon/blob-diverter.ts
@@ -1,18 +1,17 @@
+import { Readable } from 'node:stream'
+import { finished, pipeline } from 'node:stream/promises'
+import { CID } from 'multiformats/cid'
+import * as undici from 'undici'
 import {
-  createDecoders,
-  getPdsEndpoint,
   VerifyCidTransform,
   allFulfilled,
+  createDecoders,
+  getPdsEndpoint,
 } from '@atproto/common'
 import { IdResolver } from '@atproto/identity'
 import { ResponseType, XRPCError } from '@atproto/xrpc'
-import { CID } from 'multiformats/cid'
-import { Readable } from 'node:stream'
-import { finished, pipeline } from 'node:stream/promises'
-import * as undici from 'undici'
-
 import { BlobDivertConfig } from '../config'
-import Database from '../db'
+import { Database } from '../db'
 import { retryHttp } from '../util'
 
 export class BlobDiverter {
diff --git a/packages/ozone/src/daemon/context.ts b/packages/ozone/src/daemon/context.ts
index 722ffa4655e..86e5fad80b8 100644
--- a/packages/ozone/src/daemon/context.ts
+++ b/packages/ozone/src/daemon/context.ts
@@ -1,16 +1,16 @@
+import { AtpAgent } from '@atproto/api'
+import { allFulfilled } from '@atproto/common'
 import { Keypair, Secp256k1Keypair } from '@atproto/crypto'
-import { createServiceAuthHeaders } from '@atproto/xrpc-server'
 import { IdResolver } from '@atproto/identity'
-import { AtpAgent } from '@atproto/api'
+import { createServiceAuthHeaders } from '@atproto/xrpc-server'
+import { BackgroundQueue } from '../background'
 import { OzoneConfig, OzoneSecrets } from '../config'
 import { Database } from '../db'
-import { EventPusher } from './event-pusher'
-import { EventReverser } from './event-reverser'
 import { ModerationService } from '../mod-service'
-import { BackgroundQueue } from '../background'
 import { getSigningKeyId } from '../util'
+import { EventPusher } from './event-pusher'
+import { EventReverser } from './event-reverser'
 import { MaterializedViewRefresher } from './materialized-view-refresher'
-import { allFulfilled } from '@atproto/common'
 
 export type DaemonContextOptions = {
   db: Database
@@ -136,5 +136,3 @@ export class DaemonContext {
     }
   }
 }
-
-export default DaemonContext
diff --git a/packages/ozone/src/daemon/event-pusher.ts b/packages/ozone/src/daemon/event-pusher.ts
index c423eef9ac1..17508692b50 100644
--- a/packages/ozone/src/daemon/event-pusher.ts
+++ b/packages/ozone/src/daemon/event-pusher.ts
@@ -1,14 +1,14 @@
 import assert from 'node:assert'
+import { Insertable, Selectable } from 'kysely'
 import { AtpAgent } from '@atproto/api'
 import { SECOND } from '@atproto/common'
-import Database from '../db'
-import { RepoPushEventType } from '../db/schema/repo_push_event'
-import { retryHttp } from '../util'
-import { dbLogger } from '../logger'
-import { InputSchema } from '../lexicon/types/com/atproto/admin/updateSubjectStatus'
+import { Database } from '../db'
 import { BlobPushEvent } from '../db/schema/blob_push_event'
-import { Insertable, Selectable } from 'kysely'
+import { RepoPushEventType } from '../db/schema/repo_push_event'
 import { ids } from '../lexicon/lexicons'
+import { InputSchema } from '../lexicon/types/com/atproto/admin/updateSubjectStatus'
+import { dbLogger } from '../logger'
+import { retryHttp } from '../util'
 
 type EventSubject = InputSchema['subject']
 
diff --git a/packages/ozone/src/daemon/event-reverser.ts b/packages/ozone/src/daemon/event-reverser.ts
index 3146843acd7..e913b632ba1 100644
--- a/packages/ozone/src/daemon/event-reverser.ts
+++ b/packages/ozone/src/daemon/event-reverser.ts
@@ -1,7 +1,7 @@
 import { MINUTE } from '@atproto/common'
+import { Database } from '../db'
 import { dbLogger } from '../logger'
 import { ModerationServiceCreator, ReversalSubject } from '../mod-service'
-import Database from '../db'
 
 export class EventReverser {
   destroyed = false
diff --git a/packages/ozone/src/daemon/index.ts b/packages/ozone/src/daemon/index.ts
index e29305ba91f..86e038eef93 100644
--- a/packages/ozone/src/daemon/index.ts
+++ b/packages/ozone/src/daemon/index.ts
@@ -1,6 +1,6 @@
 import { OzoneConfig, OzoneSecrets } from '../config'
-import DaemonContext from './context'
 import { AppContextOptions } from '../context'
+import { DaemonContext } from './context'
 
 export { EventPusher } from './event-pusher'
 export { BlobDiverter } from './blob-diverter'
diff --git a/packages/ozone/src/daemon/materialized-view-refresher.ts b/packages/ozone/src/daemon/materialized-view-refresher.ts
index 22c84cd8b53..a4ef689b98d 100644
--- a/packages/ozone/src/daemon/materialized-view-refresher.ts
+++ b/packages/ozone/src/daemon/materialized-view-refresher.ts
@@ -1,5 +1,5 @@
-import { MINUTE } from '@atproto/common'
 import { sql } from 'kysely'
+import { MINUTE } from '@atproto/common'
 import { BackgroundQueue, PeriodicBackgroundTask } from '../background'
 
 export class MaterializedViewRefresher extends PeriodicBackgroundTask {
diff --git a/packages/ozone/src/db/index.ts b/packages/ozone/src/db/index.ts
index b5b66542583..780a6393327 100644
--- a/packages/ozone/src/db/index.ts
+++ b/packages/ozone/src/db/index.ts
@@ -1,23 +1,23 @@
-import assert from 'assert'
+import assert from 'node:assert'
+import { EventEmitter } from 'node:stream'
 import {
   Kysely,
-  PostgresDialect,
-  Migrator,
   KyselyPlugin,
+  Migrator,
   PluginTransformQueryArgs,
   PluginTransformResultArgs,
-  RootOperationNode,
+  PostgresDialect,
   QueryResult,
+  RootOperationNode,
   UnknownRow,
 } from 'kysely'
-import TypedEmitter from 'typed-emitter'
 import { Pool as PgPool, types as pgTypes } from 'pg'
-import DatabaseSchema, { DatabaseSchemaType } from './schema'
-import { PgOptions } from './types'
+import TypedEmitter from 'typed-emitter'
 import { dbLogger } from '../logger'
-import { EventEmitter } from 'stream'
 import * as migrations from './migrations'
 import { CtxMigrationProvider } from './migrations/provider'
+import { DatabaseSchema, DatabaseSchemaType } from './schema'
+import { PgOptions } from './types'
 
 export class Database {
   pool: PgPool
diff --git a/packages/ozone/src/db/migrations/20241220T144630860Z-stats-materialized-views.ts b/packages/ozone/src/db/migrations/20241220T144630860Z-stats-materialized-views.ts
index b961e61a7d0..9f31fa32b63 100644
--- a/packages/ozone/src/db/migrations/20241220T144630860Z-stats-materialized-views.ts
+++ b/packages/ozone/src/db/migrations/20241220T144630860Z-stats-materialized-views.ts
@@ -1,12 +1,10 @@
 import { Kysely, sql } from 'kysely'
-
 import { REASONAPPEAL } from '../../lexicon/types/com/atproto/moderation/defs'
-import { DatabaseSchemaType } from '../schema'
-
 import {
   REVIEWESCALATED,
   REVIEWOPEN,
 } from '../../lexicon/types/tools/ozone/moderation/defs'
+import { DatabaseSchemaType } from '../schema'
 import * as modEvent from '../schema/moderation_event'
 import * as modStatus from '../schema/moderation_subject_status'
 import * as recordEventsStats from '../schema/record_events_stats'
diff --git a/packages/ozone/src/db/pagination.ts b/packages/ozone/src/db/pagination.ts
index 9149a42f1c1..cba67db353c 100644
--- a/packages/ozone/src/db/pagination.ts
+++ b/packages/ozone/src/db/pagination.ts
@@ -1,4 +1,4 @@
-import { sql, DynamicModule } from 'kysely'
+import { DynamicModule, sql } from 'kysely'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { AnyQb, DbRef } from './types'
 
diff --git a/packages/ozone/src/db/schema/index.ts b/packages/ozone/src/db/schema/index.ts
index 36a1b3ae376..d1364c684cd 100644
--- a/packages/ozone/src/db/schema/index.ts
+++ b/packages/ozone/src/db/schema/index.ts
@@ -1,20 +1,19 @@
 import { Kysely } from 'kysely'
-import * as modEvent from './moderation_event'
-import * as modSubjectStatus from './moderation_subject_status'
-import * as repoPushEvent from './repo_push_event'
-import * as recordPushEvent from './record_push_event'
+import * as accountEventsStats from './account_events_stats'
+import * as accountRecordEventsStats from './account_record_events_stats'
+import * as accountRecordStatusStats from './account_record_status_stats'
 import * as blobPushEvent from './blob_push_event'
-import * as label from './label'
-import * as signingKey from './signing_key'
 import * as communicationTemplate from './communication_template'
-import * as set from './ozone_set'
+import * as label from './label'
 import * as member from './member'
-import * as setting from './setting'
-
+import * as modEvent from './moderation_event'
+import * as modSubjectStatus from './moderation_subject_status'
+import * as set from './ozone_set'
 import * as recordEventsStats from './record_events_stats'
-import * as accountEventsStats from './account_events_stats'
-import * as accountRecordEventsStats from './account_record_events_stats'
-import * as accountRecordStatusStats from './account_record_status_stats'
+import * as recordPushEvent from './record_push_event'
+import * as repoPushEvent from './repo_push_event'
+import * as setting from './setting'
+import * as signingKey from './signing_key'
 
 export type DatabaseSchemaType = modEvent.PartialDB &
   modSubjectStatus.PartialDB &
diff --git a/packages/ozone/src/db/schema/moderation_subject_status.ts b/packages/ozone/src/db/schema/moderation_subject_status.ts
index a4d7ad1a72c..5869d863028 100644
--- a/packages/ozone/src/db/schema/moderation_subject_status.ts
+++ b/packages/ozone/src/db/schema/moderation_subject_status.ts
@@ -1,9 +1,9 @@
 import { Generated } from 'kysely'
 import {
   REVIEWCLOSED,
-  REVIEWOPEN,
   REVIEWESCALATED,
   REVIEWNONE,
+  REVIEWOPEN,
 } from '../../lexicon/types/tools/ozone/moderation/defs'
 
 export const subjectStatusTableName = 'moderation_subject_status'
diff --git a/packages/ozone/src/db/types.ts b/packages/ozone/src/db/types.ts
index b7a2b9bb8ec..cc75dc638e9 100644
--- a/packages/ozone/src/db/types.ts
+++ b/packages/ozone/src/db/types.ts
@@ -1,5 +1,5 @@
-import { Pool as PgPool } from 'pg'
 import { DynamicModule, RawBuilder, SelectQueryBuilder, sql } from 'kysely'
+import { Pool as PgPool } from 'pg'
 
 export type DbRef = RawBuilder | ReturnType<DynamicModule['ref']>
 
diff --git a/packages/ozone/src/error.ts b/packages/ozone/src/error.ts
index a4de90f580e..65fbf17b2bd 100644
--- a/packages/ozone/src/error.ts
+++ b/packages/ozone/src/error.ts
@@ -1,5 +1,5 @@
-import { XRPCError } from '@atproto/xrpc-server'
 import { ErrorRequestHandler } from 'express'
+import { XRPCError } from '@atproto/xrpc-server'
 import { httpLogger as log } from './logger'
 
 export const handler: ErrorRequestHandler = (err, _req, res, next) => {
diff --git a/packages/ozone/src/index.ts b/packages/ozone/src/index.ts
index 743f181bdee..65871838751 100644
--- a/packages/ozone/src/index.ts
+++ b/packages/ozone/src/index.ts
@@ -1,23 +1,23 @@
-import express from 'express'
-import http from 'http'
-import { AddressInfo } from 'net'
-import events from 'events'
-import { createHttpTerminator, HttpTerminator } from 'http-terminator'
-import cors from 'cors'
+import events from 'node:events'
+import http from 'node:http'
+import { AddressInfo } from 'node:net'
 import compression from 'compression'
+import cors from 'cors'
+import express from 'express'
+import { HttpTerminator, createHttpTerminator } from 'http-terminator'
 import { DAY, SECOND } from '@atproto/common'
 import API, { health, wellKnown } from './api'
-import * as error from './error'
-import { dbLogger, loggerMiddleware } from './logger'
 import { OzoneConfig, OzoneSecrets } from './config'
-import { createServer } from './lexicon'
-import AppContext, { AppContextOptions } from './context'
+import { AppContext, AppContextOptions } from './context'
 import { Member } from './db/schema/member'
+import * as error from './error'
+import { createServer } from './lexicon'
+import { dbLogger, loggerMiddleware } from './logger'
 
 export * from './config'
 export { type ImageInvalidator } from './image-invalidator'
 export { Database } from './db'
-export { OzoneDaemon, EventPusher, EventReverser } from './daemon'
+export { EventPusher, EventReverser, OzoneDaemon } from './daemon'
 export { AppContext } from './context'
 export { httpLogger } from './logger'
 
diff --git a/packages/ozone/src/logger.ts b/packages/ozone/src/logger.ts
index 7451551a153..41b1a095993 100644
--- a/packages/ozone/src/logger.ts
+++ b/packages/ozone/src/logger.ts
@@ -1,5 +1,5 @@
 import { type IncomingMessage } from 'node:http'
-import pinoHttp, { stdSerializers } from 'pino-http'
+import { pinoHttp, stdSerializers } from 'pino-http'
 import { obfuscateHeaders, subsystemLogger } from '@atproto/common'
 
 export const dbLogger: ReturnType<typeof subsystemLogger> =
diff --git a/packages/ozone/src/mod-service/index.ts b/packages/ozone/src/mod-service/index.ts
index b298f28a43a..044e65e58d5 100644
--- a/packages/ozone/src/mod-service/index.ts
+++ b/packages/ozone/src/mod-service/index.ts
@@ -1,36 +1,56 @@
 import net from 'node:net'
 import { Insertable, sql } from 'kysely'
 import { CID } from 'multiformats/cid'
-import { AtUri, INVALID_HANDLE } from '@atproto/syntax'
-import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AtpAgent } from '@atproto/api'
 import { addHoursToDate, chunkArray } from '@atproto/common'
 import { Keypair } from '@atproto/crypto'
 import { IdResolver } from '@atproto/identity'
-import { AtpAgent } from '@atproto/api'
+import { AtUri, INVALID_HANDLE } from '@atproto/syntax'
+import { InvalidRequestError } from '@atproto/xrpc-server'
+import { getReviewState } from '../api/util'
+import { BackgroundQueue } from '../background'
+import { OzoneConfig } from '../config'
+import { EventPusher } from '../daemon'
 import { Database } from '../db'
-import { AuthHeaders, ModerationViews } from './views'
+import { StatusKeyset, TimeIdKeyset, paginate } from '../db/pagination'
+import { BlobPushEvent } from '../db/schema/blob_push_event'
+import { LabelChannel } from '../db/schema/label'
+import { ModerationEvent } from '../db/schema/moderation_event'
+import { jsonb } from '../db/types'
+import { ImageInvalidator } from '../image-invalidator'
+import { ids } from '../lexicon/lexicons'
+import { RepoBlobRef, RepoRef } from '../lexicon/types/com/atproto/admin/defs'
+import { Label } from '../lexicon/types/com/atproto/label/defs'
 import { Main as StrongRef } from '../lexicon/types/com/atproto/repo/strongRef'
 import {
+  REVIEWESCALATED,
+  REVIEWOPEN,
+  isAccountEvent,
+  isIdentityEvent,
+  isModEventAcknowledge,
   isModEventComment,
+  isModEventEmail,
   isModEventLabel,
   isModEventMute,
   isModEventReport,
-  isModEventTakedown,
-  isModEventEmail,
   isModEventTag,
-  isAccountEvent,
-  isIdentityEvent,
+  isModEventTakedown,
   isRecordEvent,
-  REVIEWESCALATED,
-  REVIEWOPEN,
-  isModEventAcknowledge,
 } from '../lexicon/types/tools/ozone/moderation/defs'
-import { RepoRef, RepoBlobRef } from '../lexicon/types/com/atproto/admin/defs'
+import { QueryParams as QueryStatusParams } from '../lexicon/types/tools/ozone/moderation/queryStatuses'
+import { httpLogger as log } from '../logger'
+import { LABELER_HEADER_NAME, ParsedLabelers } from '../util'
 import {
   adjustModerationSubjectStatus,
   getStatusIdentifierFromSubject,
   moderationSubjectStatusQueryBuilder,
 } from './status'
+import {
+  ModSubject,
+  RecordSubject,
+  RepoSubject,
+  subjectFromStatusRow,
+} from './subject'
 import {
   ModEventType,
   ModerationEventRow,
@@ -38,28 +58,8 @@ import {
   ModerationSubjectStatusRowWithHandle,
   ReversibleModerationEvent,
 } from './types'
-import { ModerationEvent } from '../db/schema/moderation_event'
-import { StatusKeyset, TimeIdKeyset, paginate } from '../db/pagination'
-import { Label } from '../lexicon/types/com/atproto/label/defs'
-import { QueryParams as QueryStatusParams } from '../lexicon/types/tools/ozone/moderation/queryStatuses'
-import {
-  ModSubject,
-  RecordSubject,
-  RepoSubject,
-  subjectFromStatusRow,
-} from './subject'
-import { jsonb } from '../db/types'
-import { LabelChannel } from '../db/schema/label'
-import { BlobPushEvent } from '../db/schema/blob_push_event'
-import { BackgroundQueue } from '../background'
-import { EventPusher } from '../daemon'
 import { formatLabel, formatLabelRow, signLabel } from './util'
-import { ImageInvalidator } from '../image-invalidator'
-import { httpLogger as log } from '../logger'
-import { OzoneConfig } from '../config'
-import { LABELER_HEADER_NAME, ParsedLabelers } from '../util'
-import { ids } from '../lexicon/lexicons'
-import { getReviewState } from '../api/util'
+import { AuthHeaders, ModerationViews } from './views'
 
 export type ModerationServiceCreator = (db: Database) => ModerationService
 
diff --git a/packages/ozone/src/mod-service/status.ts b/packages/ozone/src/mod-service/status.ts
index 76f2fb08948..2886a54659e 100644
--- a/packages/ozone/src/mod-service/status.ts
+++ b/packages/ozone/src/mod-service/status.ts
@@ -3,7 +3,7 @@
 import { HOUR } from '@atproto/common'
 import { AtUri } from '@atproto/syntax'
 import { Database } from '../db'
-import DatabaseSchema from '../db/schema'
+import { DatabaseSchema } from '../db/schema'
 import { jsonb } from '../db/types'
 import { REASONAPPEAL } from '../lexicon/types/com/atproto/moderation/defs'
 import {
diff --git a/packages/ozone/src/mod-service/subject.ts b/packages/ozone/src/mod-service/subject.ts
index 51c762a5288..5a46a567e9c 100644
--- a/packages/ozone/src/mod-service/subject.ts
+++ b/packages/ozone/src/mod-service/subject.ts
@@ -1,11 +1,11 @@
 import { AtUri } from '@atproto/syntax'
-import { InputSchema as ReportInput } from '../lexicon/types/com/atproto/moderation/createReport'
-import { InputSchema as ActionInput } from '../lexicon/types/tools/ozone/moderation/emitEvent'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { ModerationEventRow, ModerationSubjectStatusRow } from './types'
+import { MessageRef } from '../lexicon/types/chat/bsky/convo/defs'
 import { RepoRef } from '../lexicon/types/com/atproto/admin/defs'
+import { InputSchema as ReportInput } from '../lexicon/types/com/atproto/moderation/createReport'
 import { Main as StrongRef } from '../lexicon/types/com/atproto/repo/strongRef'
-import { MessageRef } from '../lexicon/types/chat/bsky/convo/defs'
+import { InputSchema as ActionInput } from '../lexicon/types/tools/ozone/moderation/emitEvent'
+import { ModerationEventRow, ModerationSubjectStatusRow } from './types'
 
 type SubjectInput = ReportInput['subject'] | ActionInput['subject']
 
diff --git a/packages/ozone/src/mod-service/types.ts b/packages/ozone/src/mod-service/types.ts
index 42d6c7115f3..76123bc7fe7 100644
--- a/packages/ozone/src/mod-service/types.ts
+++ b/packages/ozone/src/mod-service/types.ts
@@ -1,7 +1,7 @@
-import { Selectable } from 'kysely'
+import { type Selectable } from 'kysely'
+import { ToolsOzoneModerationDefs } from '@atproto/api'
 import { ModerationEvent } from '../db/schema/moderation_event'
 import { ModerationSubjectStatus } from '../db/schema/moderation_subject_status'
-import { ToolsOzoneModerationDefs } from '@atproto/api'
 import { ModSubject } from './subject'
 
 export type ModerationEventRow = Selectable<ModerationEvent>
diff --git a/packages/ozone/src/mod-service/views.ts b/packages/ozone/src/mod-service/views.ts
index b4183f0a4d3..5c28d5bfd4e 100644
--- a/packages/ozone/src/mod-service/views.ts
+++ b/packages/ozone/src/mod-service/views.ts
@@ -1,35 +1,34 @@
 import { sql } from 'kysely'
-import { AtUri, INVALID_HANDLE, normalizeDatetimeAlways } from '@atproto/syntax'
-import { AtpAgent, AppBskyFeedDefs } from '@atproto/api'
+import { AppBskyFeedDefs, AtpAgent } from '@atproto/api'
 import { dedupeStrs } from '@atproto/common'
-import { BlobRef } from '@atproto/lexicon'
 import { Keypair } from '@atproto/crypto'
+import { BlobRef } from '@atproto/lexicon'
+import { AtUri, INVALID_HANDLE, normalizeDatetimeAlways } from '@atproto/syntax'
 import { Database } from '../db'
+import { LabelRow } from '../db/schema/label'
+import { ids } from '../lexicon/lexicons'
+import { AccountView } from '../lexicon/types/com/atproto/admin/defs'
+import { Label, isSelfLabels } from '../lexicon/types/com/atproto/label/defs'
+import { OutputSchema as ReportOutput } from '../lexicon/types/com/atproto/moderation/createReport'
+import { REASONOTHER } from '../lexicon/types/com/atproto/moderation/defs'
 import {
+  BlobView,
   ModEventView,
-  RepoView,
+  ModEventViewDetail,
   RecordView,
   RecordViewDetail,
-  BlobView,
+  RepoView,
   SubjectStatusView,
-  ModEventViewDetail,
 } from '../lexicon/types/tools/ozone/moderation/defs'
-import { AccountView } from '../lexicon/types/com/atproto/admin/defs'
-import { OutputSchema as ReportOutput } from '../lexicon/types/com/atproto/moderation/createReport'
-import { Label, isSelfLabels } from '../lexicon/types/com/atproto/label/defs'
+import { dbLogger, httpLogger } from '../logger'
+import { ParsedLabelers } from '../util'
+import { moderationSubjectStatusQueryBuilder } from './status'
+import { subjectFromEventRow, subjectFromStatusRow } from './subject'
 import {
   ModerationEventRowWithHandle,
   ModerationSubjectStatusRowWithHandle,
 } from './types'
-import { REASONOTHER } from '../lexicon/types/com/atproto/moderation/defs'
-import { subjectFromEventRow, subjectFromStatusRow } from './subject'
 import { formatLabel, signLabel } from './util'
-import { LabelRow } from '../db/schema/label'
-import { dbLogger } from '../logger'
-import { httpLogger } from '../logger'
-import { ParsedLabelers } from '../util'
-import { ids } from '../lexicon/lexicons'
-import { moderationSubjectStatusQueryBuilder } from './status'
 
 export type AuthHeaders = {
   headers: {
diff --git a/packages/ozone/src/sequencer/outbox.ts b/packages/ozone/src/sequencer/outbox.ts
index c7069fee273..2f87c9924f5 100644
--- a/packages/ozone/src/sequencer/outbox.ts
+++ b/packages/ozone/src/sequencer/outbox.ts
@@ -1,6 +1,6 @@
 import { AsyncBuffer, AsyncBufferFullError } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { Sequencer, LabelsEvt } from './sequencer'
+import { LabelsEvt, Sequencer } from './sequencer'
 
 export type OutboxOpts = {
   maxBufferSize: number
@@ -121,5 +121,3 @@ export class Outbox {
     }
   }
 }
-
-export default Outbox
diff --git a/packages/ozone/src/sequencer/sequencer.ts b/packages/ozone/src/sequencer/sequencer.ts
index aa430acd53c..88514b27cc7 100644
--- a/packages/ozone/src/sequencer/sequencer.ts
+++ b/packages/ozone/src/sequencer/sequencer.ts
@@ -1,11 +1,11 @@
-import EventEmitter from 'events'
-import TypedEmitter from 'typed-emitter'
+import EventEmitter from 'node:events'
 import { Selectable } from 'kysely'
 import { PoolClient } from 'pg'
-import { seqLogger as log } from '../logger'
-import Database from '../db'
+import TypedEmitter from 'typed-emitter'
+import { Database } from '../db'
+import { Label as LabelTable, LabelChannel } from '../db/schema/label'
 import { Labels as LabelsEvt } from '../lexicon/types/com/atproto/label/subscribeLabels'
-import { LabelChannel, Label as LabelTable } from '../db/schema/label'
+import { seqLogger as log } from '../logger'
 import { ModerationService } from '../mod-service'
 
 export type { Labels as LabelsEvt } from '../lexicon/types/com/atproto/label/subscribeLabels'
@@ -143,5 +143,3 @@ type SequencerEvents = {
 }
 
 export type SequencerEmitter = TypedEmitter<SequencerEvents>
-
-export default Sequencer
diff --git a/packages/ozone/src/set/service.ts b/packages/ozone/src/set/service.ts
index 6d58a4775e9..16ac274c8e3 100644
--- a/packages/ozone/src/set/service.ts
+++ b/packages/ozone/src/set/service.ts
@@ -1,8 +1,8 @@
-import Database from '../db'
 import { Selectable } from 'kysely'
+import { Database } from '../db'
+import { TimeIdKeyset, paginate } from '../db/pagination'
 import { SetDetail } from '../db/schema/ozone_set'
 import { SetView } from '../lexicon/types/tools/ozone/set/defs'
-import { paginate, TimeIdKeyset } from '../db/pagination'
 
 export type SetServiceCreator = (db: Database) => SetService
 
diff --git a/packages/ozone/src/setting/service.ts b/packages/ozone/src/setting/service.ts
index 353d61442e5..ec8b2994b22 100644
--- a/packages/ozone/src/setting/service.ts
+++ b/packages/ozone/src/setting/service.ts
@@ -1,10 +1,10 @@
-import Database from '../db'
-import { Selectable } from 'kysely'
-import { Option } from '../lexicon/types/tools/ozone/setting/defs'
-import { Setting, SettingScope } from '../db/schema/setting'
-import { Member } from '../db/schema/member'
 import assert from 'node:assert'
+import { Selectable } from 'kysely'
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { Database } from '../db'
+import { Member } from '../db/schema/member'
+import { Setting, SettingScope } from '../db/schema/setting'
+import { Option } from '../lexicon/types/tools/ozone/setting/defs'
 
 export type SettingServiceCreator = (db: Database) => SettingService
 
diff --git a/packages/ozone/src/setting/validators.ts b/packages/ozone/src/setting/validators.ts
index 124728ec43b..0c2a78d3bd0 100644
--- a/packages/ozone/src/setting/validators.ts
+++ b/packages/ozone/src/setting/validators.ts
@@ -1,7 +1,7 @@
 import { Selectable } from 'kysely'
+import { InvalidRequestError } from '@atproto/xrpc-server'
 import { Setting } from '../db/schema/setting'
 import { PolicyListSettingKey, ProtectedTagSettingKey } from './constants'
-import { InvalidRequestError } from '@atproto/xrpc-server'
 
 export const settingValidators = new Map<
   string,
diff --git a/packages/ozone/src/tag-service/embed-tagger.ts b/packages/ozone/src/tag-service/embed-tagger.ts
index 11c4e07af21..5f8161f295e 100644
--- a/packages/ozone/src/tag-service/embed-tagger.ts
+++ b/packages/ozone/src/tag-service/embed-tagger.ts
@@ -1,13 +1,13 @@
 import {
+  AppBskyEmbedExternal,
   AppBskyEmbedImages,
   AppBskyEmbedRecordWithMedia,
-  AppBskyFeedPost,
   AppBskyEmbedVideo,
-  AppBskyEmbedExternal,
+  AppBskyFeedPost,
 } from '@atproto/api'
+import { ids } from '../lexicon/lexicons'
 import { langLogger as log } from '../logger'
 import { ContentTagger } from './content-tagger'
-import { ids } from '../lexicon/lexicons'
 
 export class EmbedTagger extends ContentTagger {
   tagPrefix = 'embed:'
diff --git a/packages/ozone/src/tag-service/index.ts b/packages/ozone/src/tag-service/index.ts
index 90dc83524d7..11d33d5f36c 100644
--- a/packages/ozone/src/tag-service/index.ts
+++ b/packages/ozone/src/tag-service/index.ts
@@ -1,10 +1,10 @@
+import { langLogger as log } from '../logger'
 import { ModerationService } from '../mod-service'
 import { ModSubject } from '../mod-service/subject'
-import { langLogger as log } from '../logger'
+import { ModerationSubjectStatusRow } from '../mod-service/types'
 import { ContentTagger } from './content-tagger'
-import { LanguageTagger } from './language-tagger'
 import { EmbedTagger } from './embed-tagger'
-import { ModerationSubjectStatusRow } from '../mod-service/types'
+import { LanguageTagger } from './language-tagger'
 
 export class TagService {
   private taggers: ContentTagger[]
diff --git a/packages/ozone/src/tag-service/language-tagger.ts b/packages/ozone/src/tag-service/language-tagger.ts
index e11ea3ec93e..9d461d3f35c 100644
--- a/packages/ozone/src/tag-service/language-tagger.ts
+++ b/packages/ozone/src/tag-service/language-tagger.ts
@@ -4,10 +4,9 @@ import {
   AppBskyFeedPost,
   AppBskyGraphList,
 } from '@atproto/api'
-
 import { langLogger as log } from '../logger'
-import { code3ToCode2 } from './language-data'
 import { ContentTagger } from './content-tagger'
+import { code3ToCode2 } from './language-data'
 
 export class LanguageTagger extends ContentTagger {
   tagPrefix = 'lang:'
diff --git a/packages/ozone/src/team/index.ts b/packages/ozone/src/team/index.ts
index 9629d165022..1a220b489b7 100644
--- a/packages/ozone/src/team/index.ts
+++ b/packages/ozone/src/team/index.ts
@@ -1,13 +1,13 @@
-import Database from '../db'
 import { Selectable } from 'kysely'
+import { chunkArray } from '@atproto/common'
+import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../context'
+import { Database } from '../db'
 import { Member } from '../db/schema/member'
-import { Member as TeamMember } from '../lexicon/types/tools/ozone/team/defs'
+import { ids } from '../lexicon/lexicons'
 import { ProfileViewDetailed } from '../lexicon/types/app/bsky/actor/defs'
-import { InvalidRequestError } from '@atproto/xrpc-server'
-import { chunkArray } from '@atproto/common'
-import AppContext from '../context'
+import { Member as TeamMember } from '../lexicon/types/tools/ozone/team/defs'
 import { httpLogger } from '../logger'
-import { ids } from '../lexicon/lexicons'
 
 export type TeamServiceCreator = (db: Database) => TeamService
 
diff --git a/packages/ozone/src/util.ts b/packages/ozone/src/util.ts
index 3a87eaa934f..76e59c8fb0e 100644
--- a/packages/ozone/src/util.ts
+++ b/packages/ozone/src/util.ts
@@ -1,8 +1,8 @@
 import assert from 'node:assert'
+import { parseList } from 'structured-headers'
 import { createRetryable } from '@atproto/common'
 import { ResponseType, XRPCError } from '@atproto/xrpc'
-import { parseList } from 'structured-headers'
-import Database from './db'
+import { Database } from './db'
 
 export const getSigningKeyId = async (
   db: Database,
diff --git a/packages/ozone/tests/3p-labeler.test.ts b/packages/ozone/tests/3p-labeler.test.ts
index dc3167eeab4..6a0b921f3b9 100644
--- a/packages/ozone/tests/3p-labeler.test.ts
+++ b/packages/ozone/tests/3p-labeler.test.ts
@@ -1,15 +1,15 @@
+import { AtpAgent } from '@atproto/api'
+import { Secp256k1Keypair } from '@atproto/crypto'
 import {
+  ModeratorClient,
   SeedClient,
   TestNetwork,
-  basicSeed,
   TestOzone,
-  ModeratorClient,
+  basicSeed,
   createOzoneDid,
 } from '@atproto/dev-env'
-import { AtpAgent } from '@atproto/api'
-import { Secp256k1Keypair } from '@atproto/crypto'
-import { LABELER_HEADER_NAME } from '../src/util'
 import { ids } from '../src/lexicon/lexicons'
+import { LABELER_HEADER_NAME } from '../src/util'
 
 describe('labels from 3p labelers', () => {
   let network: TestNetwork
diff --git a/packages/ozone/tests/_util.ts b/packages/ozone/tests/_util.ts
index be1b855cc40..144d26940a5 100644
--- a/packages/ozone/tests/_util.ts
+++ b/packages/ozone/tests/_util.ts
@@ -1,16 +1,16 @@
-import { type Express } from 'express'
 import { Server } from 'node:http'
 import { AddressInfo } from 'node:net'
-import { AtUri } from '@atproto/syntax'
-import { lexToJson } from '@atproto/lexicon'
+import { type Express } from 'express'
 import { CID } from 'multiformats/cid'
+import { lexToJson } from '@atproto/lexicon'
+import { AtUri } from '@atproto/syntax'
+import { isViewRecord } from '../src/lexicon/types/app/bsky/embed/record'
 import {
   FeedViewPost,
   PostView,
   isPostView,
   isThreadViewPost,
 } from '../src/lexicon/types/app/bsky/feed/defs'
-import { isViewRecord } from '../src/lexicon/types/app/bsky/embed/record'
 
 // Swap out identifiers and dates with stable
 // values for the purpose of snapshot testing
diff --git a/packages/ozone/tests/ack-all-subjects-of-account.test.ts b/packages/ozone/tests/ack-all-subjects-of-account.test.ts
index d4dfefc5840..5aa13e8a8ce 100644
--- a/packages/ozone/tests/ack-all-subjects-of-account.test.ts
+++ b/packages/ozone/tests/ack-all-subjects-of-account.test.ts
@@ -1,10 +1,12 @@
+import { ComAtprotoRepoStrongRef } from '@atproto/api'
 import {
-  TestNetwork,
+  ModeratorClient,
   RecordRef,
   SeedClient,
+  TestNetwork,
   basicSeed,
-  ModeratorClient,
 } from '@atproto/dev-env'
+import { isRepoRef } from '../src/lexicon/types/com/atproto/admin/defs'
 import {
   REASONAPPEAL,
   REASONOTHER,
@@ -16,8 +18,6 @@ import {
   REVIEWOPEN,
   SubjectStatusView,
 } from '../src/lexicon/types/tools/ozone/moderation/defs'
-import { isRepoRef } from '../src/lexicon/types/com/atproto/admin/defs'
-import { ComAtprotoRepoStrongRef } from '@atproto/api'
 
 describe('acknowledge all subjects of account', () => {
   let network: TestNetwork
diff --git a/packages/ozone/tests/blob-divert.test.ts b/packages/ozone/tests/blob-divert.test.ts
index 117c59d8044..4637f3bc420 100644
--- a/packages/ozone/tests/blob-divert.test.ts
+++ b/packages/ozone/tests/blob-divert.test.ts
@@ -1,3 +1,4 @@
+import assert from 'node:assert'
 import {
   ModeratorClient,
   SeedClient,
@@ -5,7 +6,6 @@ import {
   basicSeed,
 } from '@atproto/dev-env'
 import { ResponseType, XRPCError } from '@atproto/xrpc'
-import assert from 'node:assert'
 import { forSnapshot } from './_util'
 
 describe('blob divert', () => {
diff --git a/packages/ozone/tests/communication-templates.test.ts b/packages/ozone/tests/communication-templates.test.ts
index 39fe12259b7..e507b879eb7 100644
--- a/packages/ozone/tests/communication-templates.test.ts
+++ b/packages/ozone/tests/communication-templates.test.ts
@@ -1,5 +1,5 @@
-import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
 import { AtpAgent } from '@atproto/api'
+import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { ids } from '../src/lexicon/lexicons'
 
 describe('communication-templates', () => {
diff --git a/packages/ozone/tests/content-tagger.test.ts b/packages/ozone/tests/content-tagger.test.ts
index 9b5d375afd1..44029b468ef 100644
--- a/packages/ozone/tests/content-tagger.test.ts
+++ b/packages/ozone/tests/content-tagger.test.ts
@@ -4,8 +4,8 @@ import {
   TestNetwork,
   basicSeed,
 } from '@atproto/dev-env'
-import { REASONSPAM } from '../src/lexicon/types/com/atproto/moderation/defs'
 import { REASONMISLEADING } from '../dist/lexicon/types/com/atproto/moderation/defs'
+import { REASONSPAM } from '../src/lexicon/types/com/atproto/moderation/defs'
 
 describe('moderation subject content tagging', () => {
   let network: TestNetwork
diff --git a/packages/ozone/tests/get-config.test.ts b/packages/ozone/tests/get-config.test.ts
index 51648e2d213..899c0aa91bf 100644
--- a/packages/ozone/tests/get-config.test.ts
+++ b/packages/ozone/tests/get-config.test.ts
@@ -1,5 +1,5 @@
-import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
 import { AtpAgent } from '@atproto/api'
+import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { TOOLS_OZONE_TEAM } from '../src/lexicon'
 import { ids } from '../src/lexicon/lexicons'
 
diff --git a/packages/ozone/tests/get-lists.test.ts b/packages/ozone/tests/get-lists.test.ts
index c717c82a119..68a9a0bab79 100644
--- a/packages/ozone/tests/get-lists.test.ts
+++ b/packages/ozone/tests/get-lists.test.ts
@@ -1,14 +1,14 @@
+import { AtpAgent, BSKY_LABELER_DID } from '@atproto/api'
 import {
+  ModeratorClient,
+  RecordRef,
   SeedClient,
   TestNetwork,
   TestOzone,
   basicSeed,
-  ModeratorClient,
-  RecordRef,
 } from '@atproto/dev-env'
-import { AtpAgent, BSKY_LABELER_DID } from '@atproto/api'
-import { TAKEDOWN_LABEL } from '../src/mod-service'
 import { ids } from '../src/lexicon/lexicons'
+import { TAKEDOWN_LABEL } from '../src/mod-service'
 
 describe('admin get lists', () => {
   let network: TestNetwork
diff --git a/packages/ozone/tests/get-profiles.test.ts b/packages/ozone/tests/get-profiles.test.ts
index f9c1d911442..4dd12e15d91 100644
--- a/packages/ozone/tests/get-profiles.test.ts
+++ b/packages/ozone/tests/get-profiles.test.ts
@@ -1,10 +1,9 @@
 import {
-  TestNetwork,
+  ModeratorClient,
   SeedClient,
+  TestNetwork,
   basicSeed,
-  ModeratorClient,
 } from '@atproto/dev-env'
-import { ids } from '../src/lexicon/lexicons'
 
 describe('get profiles through ozone', () => {
   let network: TestNetwork
diff --git a/packages/ozone/tests/get-record.test.ts b/packages/ozone/tests/get-record.test.ts
index 0e289b550fb..9d7b235238b 100644
--- a/packages/ozone/tests/get-record.test.ts
+++ b/packages/ozone/tests/get-record.test.ts
@@ -1,18 +1,18 @@
+import { AtpAgent } from '@atproto/api'
 import {
+  ModeratorClient,
   SeedClient,
   TestNetwork,
-  basicSeed,
   TestOzone,
-  ModeratorClient,
+  basicSeed,
 } from '@atproto/dev-env'
-import { AtpAgent } from '@atproto/api'
 import { AtUri } from '@atproto/syntax'
+import { ids } from '../src/lexicon/lexicons'
 import {
   REASONOTHER,
   REASONSPAM,
 } from '../src/lexicon/types/com/atproto/moderation/defs'
 import { forSnapshot } from './_util'
-import { ids } from '../src/lexicon/lexicons'
 
 describe('admin get record view', () => {
   let network: TestNetwork
diff --git a/packages/ozone/tests/get-records.test.ts b/packages/ozone/tests/get-records.test.ts
index 3b3e63e1bd2..e15493e2238 100644
--- a/packages/ozone/tests/get-records.test.ts
+++ b/packages/ozone/tests/get-records.test.ts
@@ -1,17 +1,17 @@
+import { AtpAgent } from '@atproto/api'
 import {
+  ModeratorClient,
   SeedClient,
   TestNetwork,
-  basicSeed,
   TestOzone,
-  ModeratorClient,
+  basicSeed,
 } from '@atproto/dev-env'
-import { AtpAgent } from '@atproto/api'
+import { ids } from '../src/lexicon/lexicons'
 import {
   REASONOTHER,
   REASONSPAM,
 } from '../src/lexicon/types/com/atproto/moderation/defs'
 import { forSnapshot } from './_util'
-import { ids } from '../src/lexicon/lexicons'
 
 describe('admin get records view', () => {
   let network: TestNetwork
diff --git a/packages/ozone/tests/get-repo.test.ts b/packages/ozone/tests/get-repo.test.ts
index 6ededcbe00e..ab5293dd720 100644
--- a/packages/ozone/tests/get-repo.test.ts
+++ b/packages/ozone/tests/get-repo.test.ts
@@ -1,17 +1,17 @@
+import { AtpAgent } from '@atproto/api'
 import {
+  ModeratorClient,
   SeedClient,
   TestNetwork,
   TestOzone,
   basicSeed,
-  ModeratorClient,
 } from '@atproto/dev-env'
-import { AtpAgent } from '@atproto/api'
+import { ids } from '../src/lexicon/lexicons'
 import {
   REASONOTHER,
   REASONSPAM,
 } from '../src/lexicon/types/com/atproto/moderation/defs'
 import { forSnapshot } from './_util'
-import { ids } from '../src/lexicon/lexicons'
 
 describe('admin get repo view', () => {
   let network: TestNetwork
diff --git a/packages/ozone/tests/get-repos.test.ts b/packages/ozone/tests/get-repos.test.ts
index a56c7b54426..1f9d8ef1c7a 100644
--- a/packages/ozone/tests/get-repos.test.ts
+++ b/packages/ozone/tests/get-repos.test.ts
@@ -1,17 +1,17 @@
+import { AtpAgent } from '@atproto/api'
 import {
+  ModeratorClient,
   SeedClient,
   TestNetwork,
   TestOzone,
   basicSeed,
-  ModeratorClient,
 } from '@atproto/dev-env'
-import { AtpAgent } from '@atproto/api'
+import { ids } from '../src/lexicon/lexicons'
 import {
   REASONOTHER,
   REASONSPAM,
 } from '../src/lexicon/types/com/atproto/moderation/defs'
 import { forSnapshot } from './_util'
-import { ids } from '../src/lexicon/lexicons'
 
 describe('admin get multiple repos', () => {
   let network: TestNetwork
diff --git a/packages/ozone/tests/get-starter-pack.test.ts b/packages/ozone/tests/get-starter-pack.test.ts
index b506f21e292..1649d308c41 100644
--- a/packages/ozone/tests/get-starter-pack.test.ts
+++ b/packages/ozone/tests/get-starter-pack.test.ts
@@ -1,14 +1,14 @@
+import { AtpAgent } from '@atproto/api'
 import {
+  RecordRef,
   SeedClient,
   TestNetwork,
-  basicSeed,
   TestOzone,
-  RecordRef,
+  basicSeed,
 } from '@atproto/dev-env'
-import { AtpAgent } from '@atproto/api'
-import { forSnapshot } from './_util'
-import { TAKEDOWN_LABEL } from '../src/mod-service'
 import { ids } from '../src/lexicon/lexicons'
+import { TAKEDOWN_LABEL } from '../src/mod-service'
+import { forSnapshot } from './_util'
 
 describe('admin get starter pack view', () => {
   let network: TestNetwork
diff --git a/packages/ozone/tests/moderation-appeals.test.ts b/packages/ozone/tests/moderation-appeals.test.ts
index 0c95ead78ca..e1b8731598b 100644
--- a/packages/ozone/tests/moderation-appeals.test.ts
+++ b/packages/ozone/tests/moderation-appeals.test.ts
@@ -1,13 +1,13 @@
-import {
-  TestNetwork,
-  SeedClient,
-  basicSeed,
-  ModeratorClient,
-} from '@atproto/dev-env'
 import {
   ComAtprotoModerationDefs,
   ToolsOzoneModerationDefs,
 } from '@atproto/api'
+import {
+  ModeratorClient,
+  SeedClient,
+  TestNetwork,
+  basicSeed,
+} from '@atproto/dev-env'
 import {
   REASONMISLEADING,
   REASONSPAM,
diff --git a/packages/ozone/tests/moderation-events.test.ts b/packages/ozone/tests/moderation-events.test.ts
index 9758f7c0759..af671e4e70a 100644
--- a/packages/ozone/tests/moderation-events.test.ts
+++ b/packages/ozone/tests/moderation-events.test.ts
@@ -1,18 +1,18 @@
 import assert from 'node:assert'
 import EventEmitter, { once } from 'node:events'
+import { ToolsOzoneModerationDefs } from '@atproto/api'
 import {
-  TestNetwork,
+  ModeratorClient,
   SeedClient,
+  TestNetwork,
   basicSeed,
-  ModeratorClient,
 } from '@atproto/dev-env'
-import { ToolsOzoneModerationDefs } from '@atproto/api'
-import { forSnapshot } from './_util'
 import {
   REASONAPPEAL,
   REASONMISLEADING,
   REASONSPAM,
 } from '../src/lexicon/types/com/atproto/moderation/defs'
+import { forSnapshot } from './_util'
 
 describe('moderation-events', () => {
   let network: TestNetwork
diff --git a/packages/ozone/tests/moderation-status-tags.test.ts b/packages/ozone/tests/moderation-status-tags.test.ts
index 51ebc3186e3..532a87a77c2 100644
--- a/packages/ozone/tests/moderation-status-tags.test.ts
+++ b/packages/ozone/tests/moderation-status-tags.test.ts
@@ -1,8 +1,8 @@
 import {
-  TestNetwork,
+  ModeratorClient,
   SeedClient,
+  TestNetwork,
   basicSeed,
-  ModeratorClient,
 } from '@atproto/dev-env'
 import { REASONSPAM } from '../src/lexicon/types/com/atproto/moderation/defs'
 
diff --git a/packages/ozone/tests/moderation-statuses.test.ts b/packages/ozone/tests/moderation-statuses.test.ts
index dfe3cd9add3..b50f68606da 100644
--- a/packages/ozone/tests/moderation-statuses.test.ts
+++ b/packages/ozone/tests/moderation-statuses.test.ts
@@ -1,23 +1,23 @@
 import assert from 'node:assert'
-import {
-  TestNetwork,
-  SeedClient,
-  basicSeed,
-  ModeratorClient,
-} from '@atproto/dev-env'
 import {
   ToolsOzoneModerationDefs,
   ToolsOzoneModerationQueryStatuses,
 } from '@atproto/api'
-import { forSnapshot } from './_util'
+import {
+  ModeratorClient,
+  SeedClient,
+  TestNetwork,
+  basicSeed,
+} from '@atproto/dev-env'
 import {
   REASONMISLEADING,
   REASONSPAM,
 } from '../src/lexicon/types/com/atproto/moderation/defs'
 import {
-  REVIEWOPEN,
   REVIEWNONE,
+  REVIEWOPEN,
 } from '../src/lexicon/types/tools/ozone/moderation/defs'
+import { forSnapshot } from './_util'
 
 describe('moderation-statuses', () => {
   let network: TestNetwork
diff --git a/packages/ozone/tests/moderation.test.ts b/packages/ozone/tests/moderation.test.ts
index 9b9bfb17c3c..e029017e83d 100644
--- a/packages/ozone/tests/moderation.test.ts
+++ b/packages/ozone/tests/moderation.test.ts
@@ -1,15 +1,18 @@
+import { AtpAgent, ToolsOzoneModerationEmitEvent } from '@atproto/api'
+import { HOUR } from '@atproto/common'
 import {
-  TestNetwork,
-  TestOzone,
   ImageRef,
+  ModeratorClient,
   RecordRef,
   SeedClient,
+  TestNetwork,
+  TestOzone,
   basicSeed,
-  ModeratorClient,
 } from '@atproto/dev-env'
-import { AtpAgent, ToolsOzoneModerationEmitEvent } from '@atproto/api'
 import { AtUri } from '@atproto/syntax'
-import { forSnapshot } from './_util'
+import { EventReverser } from '../src'
+import { ImageInvalidator } from '../src/image-invalidator'
+import { ids } from '../src/lexicon/lexicons'
 import {
   REASONMISLEADING,
   REASONOTHER,
@@ -20,11 +23,8 @@ import {
   REVIEWCLOSED,
   REVIEWESCALATED,
 } from '../src/lexicon/types/tools/ozone/moderation/defs'
-import { EventReverser } from '../src'
-import { ImageInvalidator } from '../src/image-invalidator'
 import { TAKEDOWN_LABEL } from '../src/mod-service'
-import { ids } from '../src/lexicon/lexicons'
-import { HOUR } from '@atproto/common'
+import { forSnapshot } from './_util'
 
 describe('moderation', () => {
   let network: TestNetwork
diff --git a/packages/ozone/tests/protected-tags.test.ts b/packages/ozone/tests/protected-tags.test.ts
index 84778e89e22..dfdb3279e3a 100644
--- a/packages/ozone/tests/protected-tags.test.ts
+++ b/packages/ozone/tests/protected-tags.test.ts
@@ -1,14 +1,14 @@
 import {
-  TestNetwork,
+  ModeratorClient,
   SeedClient,
+  TestNetwork,
   basicSeed,
-  ModeratorClient,
 } from '@atproto/dev-env'
-import { ProtectedTagSettingKey } from '../src/setting/constants'
 import {
   ROLEADMIN,
   ROLEMODERATOR,
 } from '../dist/lexicon/types/tools/ozone/team/defs'
+import { ProtectedTagSettingKey } from '../src/setting/constants'
 
 describe('protected-tags', () => {
   let network: TestNetwork
diff --git a/packages/ozone/tests/query-labels.test.ts b/packages/ozone/tests/query-labels.test.ts
index 66157fb9ba7..6f0505c60e5 100644
--- a/packages/ozone/tests/query-labels.test.ts
+++ b/packages/ozone/tests/query-labels.test.ts
@@ -1,15 +1,15 @@
 import { AtpAgent } from '@atproto/api'
+import { cborEncode } from '@atproto/common'
+import { Secp256k1Keypair, verifySignature } from '@atproto/crypto'
 import { EXAMPLE_LABELER, TestNetwork } from '@atproto/dev-env'
 import { DisconnectError, Subscription } from '@atproto/xrpc-server'
 import { ids, lexicons } from '../src/lexicon/lexicons'
 import { Label } from '../src/lexicon/types/com/atproto/label/defs'
-import { Secp256k1Keypair, verifySignature } from '@atproto/crypto'
-import { cborEncode } from '@atproto/common'
-import { ModerationService } from '../src/mod-service'
 import {
   OutputSchema as LabelMessage,
   isLabels,
 } from '../src/lexicon/types/com/atproto/label/subscribeLabels'
+import { ModerationService } from '../src/mod-service'
 import { getSigningKeyId } from '../src/util'
 
 describe('ozone query labels', () => {
diff --git a/packages/ozone/tests/record-and-account-events.test.ts b/packages/ozone/tests/record-and-account-events.test.ts
index 1c8d8b5d224..669031bb2ac 100644
--- a/packages/ozone/tests/record-and-account-events.test.ts
+++ b/packages/ozone/tests/record-and-account-events.test.ts
@@ -1,15 +1,16 @@
-import {
-  TestNetwork,
-  SeedClient,
-  basicSeed,
-  ModeratorClient,
-} from '@atproto/dev-env'
 import {
   ComAtprotoModerationDefs,
   ToolsOzoneModerationDefs,
+  ToolsOzoneModerationEmitEvent as EmitModerationEvent,
 } from '@atproto/api'
+import {
+  ModeratorClient,
+  SeedClient,
+  TestNetwork,
+  basicSeed,
+} from '@atproto/dev-env'
 import { REVIEWOPEN } from '../src/lexicon/types/tools/ozone/moderation/defs'
-import { ToolsOzoneModerationEmitEvent as EmitModerationEvent } from '@atproto/api'
+
 describe('record and account events on moderation subjects', () => {
   let network: TestNetwork
   let sc: SeedClient
diff --git a/packages/ozone/tests/repo-search.test.ts b/packages/ozone/tests/repo-search.test.ts
index 26aa3e45344..08afbe9714b 100644
--- a/packages/ozone/tests/repo-search.test.ts
+++ b/packages/ozone/tests/repo-search.test.ts
@@ -1,12 +1,12 @@
+import { AtpAgent } from '@atproto/api'
 import {
   ModeratorClient,
   SeedClient,
   TestNetwork,
   usersBulkSeed,
 } from '@atproto/dev-env'
-import { AtpAgent } from '@atproto/api'
-import { paginateAll } from './_util'
 import { ids } from '../src/lexicon/lexicons'
+import { paginateAll } from './_util'
 
 describe('admin repo search view', () => {
   let network: TestNetwork
diff --git a/packages/ozone/tests/report-muting.test.ts b/packages/ozone/tests/report-muting.test.ts
index 1cf195ce101..4cf15e70468 100644
--- a/packages/ozone/tests/report-muting.test.ts
+++ b/packages/ozone/tests/report-muting.test.ts
@@ -1,13 +1,13 @@
-import {
-  TestNetwork,
-  SeedClient,
-  basicSeed,
-  ModeratorClient,
-} from '@atproto/dev-env'
 import {
   ComAtprotoModerationDefs,
   ToolsOzoneModerationDefs,
 } from '@atproto/api'
+import {
+  ModeratorClient,
+  SeedClient,
+  TestNetwork,
+  basicSeed,
+} from '@atproto/dev-env'
 import {
   REVIEWNONE,
   REVIEWOPEN,
diff --git a/packages/ozone/tests/sequencer.test.ts b/packages/ozone/tests/sequencer.test.ts
index 840e78ff243..8153217ead9 100644
--- a/packages/ozone/tests/sequencer.test.ts
+++ b/packages/ozone/tests/sequencer.test.ts
@@ -1,9 +1,9 @@
-import { EXAMPLE_LABELER, TestNetwork } from '@atproto/dev-env'
 import { readFromGenerator, wait } from '@atproto/common'
-import { LabelsEvt, Sequencer } from '../src/sequencer'
-import Outbox from '../src/sequencer/outbox'
 import { randomStr } from '@atproto/crypto'
+import { EXAMPLE_LABELER, TestNetwork } from '@atproto/dev-env'
 import { Label } from '../src/lexicon/types/com/atproto/label/defs'
+import { LabelsEvt, Sequencer } from '../src/sequencer'
+import { Outbox } from '../src/sequencer/outbox'
 
 describe('sequencer', () => {
   let network: TestNetwork
diff --git a/packages/ozone/tests/server.test.ts b/packages/ozone/tests/server.test.ts
index 7899b5ff2ef..8b407055ebd 100644
--- a/packages/ozone/tests/server.test.ts
+++ b/packages/ozone/tests/server.test.ts
@@ -1,5 +1,5 @@
-import { TestNetwork, TestOzone } from '@atproto/dev-env'
 import express from 'express'
+import { TestNetwork, TestOzone } from '@atproto/dev-env'
 import { handler as errorHandler } from '../src/error'
 import { startServer } from './_util'
 
diff --git a/packages/ozone/tests/sets.test.ts b/packages/ozone/tests/sets.test.ts
index 90bf810357b..0bc7b8a4078 100644
--- a/packages/ozone/tests/sets.test.ts
+++ b/packages/ozone/tests/sets.test.ts
@@ -1,10 +1,10 @@
-import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
 import AtpAgent, {
   ToolsOzoneSetDefs,
   ToolsOzoneSetQuerySets,
 } from '@atproto/api'
-import { forSnapshot } from './_util'
+import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { ids } from '../src/lexicon/lexicons'
+import { forSnapshot } from './_util'
 
 describe('ozone-sets', () => {
   let network: TestNetwork
diff --git a/packages/ozone/tests/settings.test.ts b/packages/ozone/tests/settings.test.ts
index 41afd23a274..2446d04958c 100644
--- a/packages/ozone/tests/settings.test.ts
+++ b/packages/ozone/tests/settings.test.ts
@@ -1,10 +1,10 @@
-import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
 import AtpAgent, {
   ToolsOzoneSettingListOptions,
   ToolsOzoneSettingUpsertOption,
 } from '@atproto/api'
-import { ids } from '../src/lexicon/lexicons'
+import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { SettingScope } from '../dist/db/schema/setting'
+import { ids } from '../src/lexicon/lexicons'
 import { forSnapshot } from './_util'
 
 describe('ozone-settings', () => {
diff --git a/packages/ozone/tests/takedown.test.ts b/packages/ozone/tests/takedown.test.ts
index 8cb7ed5763b..fa5c4f2dc84 100644
--- a/packages/ozone/tests/takedown.test.ts
+++ b/packages/ozone/tests/takedown.test.ts
@@ -1,18 +1,13 @@
 import {
-  TestNetwork,
-  TestOzone,
+  ModeratorClient,
   SeedClient,
+  TestNetwork,
   basicSeed,
-  ModeratorClient,
 } from '@atproto/dev-env'
-import { AtpAgent } from '@atproto/api'
 
 describe('moderation', () => {
   let network: TestNetwork
-  let ozone: TestOzone
-  let agent: AtpAgent
-  let bskyAgent: AtpAgent
-  let pdsAgent: AtpAgent
+
   let sc: SeedClient
   let modClient: ModeratorClient
 
@@ -25,10 +20,6 @@ describe('moderation', () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'ozone_takedown',
     })
-    ozone = network.ozone
-    agent = network.ozone.getClient()
-    bskyAgent = network.bsky.getClient()
-    pdsAgent = network.pds.getClient()
     sc = network.getSeedClient()
     modClient = network.ozone.getModClient()
     await basicSeed(sc)
diff --git a/packages/ozone/tests/team.test.ts b/packages/ozone/tests/team.test.ts
index 4a3487127c6..d7532d6952a 100644
--- a/packages/ozone/tests/team.test.ts
+++ b/packages/ozone/tests/team.test.ts
@@ -1,5 +1,5 @@
-import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { AtpAgent } from '@atproto/api'
+import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { forSnapshot } from './_util'
 
 describe('team management', () => {
diff --git a/packages/pds/bin/migration-create.ts b/packages/pds/bin/migration-create.ts
index b51c536c4f2..8a483456bef 100644
--- a/packages/pds/bin/migration-create.ts
+++ b/packages/pds/bin/migration-create.ts
@@ -1,7 +1,7 @@
 #!/usr/bin/env ts-node
 
-import * as fs from 'fs/promises'
-import * as path from 'path'
+import * as fs from 'node:fs/promises'
+import * as path from 'node:path'
 
 export async function main() {
   const now = new Date()
diff --git a/packages/pds/package.json b/packages/pds/package.json
index 06668d2ee54..3939e453f07 100644
--- a/packages/pds/package.json
+++ b/packages/pds/package.json
@@ -16,6 +16,9 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "bin": "dist/bin.js",
+  "engines": {
+    "node": ">=18.7.0"
+  },
   "scripts": {
     "prepare": "[ \"$npm_config_production\" = true ] || puppeteer browsers install chrome",
     "codegen": "lex gen-server --yes ./src/lexicon ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/* ../../lexicons/chat/bsky/*/* ../../lexicons/tools/ozone/*/*",
diff --git a/packages/pds/src/account-manager/db/index.ts b/packages/pds/src/account-manager/db/index.ts
index 30c22b16aa7..95440c4183b 100644
--- a/packages/pds/src/account-manager/db/index.ts
+++ b/packages/pds/src/account-manager/db/index.ts
@@ -1,6 +1,6 @@
 import { Database, Migrator } from '../../db'
-import { DatabaseSchema } from './schema'
 import migrations from './migrations'
+import { DatabaseSchema } from './schema'
 
 export * from './schema'
 
diff --git a/packages/pds/src/account-manager/db/schema/authorization-request.ts b/packages/pds/src/account-manager/db/schema/authorization-request.ts
index aa7f4339562..bace24cf78a 100644
--- a/packages/pds/src/account-manager/db/schema/authorization-request.ts
+++ b/packages/pds/src/account-manager/db/schema/authorization-request.ts
@@ -1,10 +1,10 @@
+import { Selectable } from 'kysely'
 import {
   Code,
   DeviceId,
   OAuthClientId,
   RequestId,
 } from '@atproto/oauth-provider'
-import { Selectable } from 'kysely'
 import { DateISO, JsonObject } from '../../../db'
 
 export interface AuthorizationRequest {
diff --git a/packages/pds/src/account-manager/db/schema/device.ts b/packages/pds/src/account-manager/db/schema/device.ts
index 23b98acb0ba..8ea95823d3e 100644
--- a/packages/pds/src/account-manager/db/schema/device.ts
+++ b/packages/pds/src/account-manager/db/schema/device.ts
@@ -1,5 +1,5 @@
-import { DeviceId, SessionId } from '@atproto/oauth-provider'
 import { Selectable } from 'kysely'
+import { DeviceId, SessionId } from '@atproto/oauth-provider'
 import { DateISO } from '../../../db'
 
 export interface Device {
diff --git a/packages/pds/src/account-manager/db/schema/index.ts b/packages/pds/src/account-manager/db/schema/index.ts
index d4872f9f0c9..183ee769294 100644
--- a/packages/pds/src/account-manager/db/schema/index.ts
+++ b/packages/pds/src/account-manager/db/schema/index.ts
@@ -1,15 +1,15 @@
-import * as actor from './actor'
 import * as account from './account'
+import * as actor from './actor'
+import * as appPassword from './app-password'
+import * as oauthRequest from './authorization-request'
 import * as device from './device'
 import * as deviceAccount from './device-account'
-import * as oauthRequest from './authorization-request'
+import * as emailToken from './email-token'
+import * as inviteCode from './invite-code'
+import * as refreshToken from './refresh-token'
+import * as repoRoot from './repo-root'
 import * as token from './token'
 import * as usedRefreshToken from './used-refresh-token'
-import * as repoRoot from './repo-root'
-import * as refreshToken from './refresh-token'
-import * as appPassword from './app-password'
-import * as inviteCode from './invite-code'
-import * as emailToken from './email-token'
 
 export type DatabaseSchema = actor.PartialDB &
   account.PartialDB &
diff --git a/packages/pds/src/account-manager/db/schema/token.ts b/packages/pds/src/account-manager/db/schema/token.ts
index 7abba13baea..fe36268394d 100644
--- a/packages/pds/src/account-manager/db/schema/token.ts
+++ b/packages/pds/src/account-manager/db/schema/token.ts
@@ -1,3 +1,4 @@
+import { Generated, Selectable } from 'kysely'
 import {
   Code,
   DeviceId,
@@ -6,8 +7,6 @@ import {
   Sub,
   TokenId,
 } from '@atproto/oauth-provider'
-import { Generated, Selectable } from 'kysely'
-
 import { DateISO, JsonArray, JsonObject } from '../../../db/cast'
 
 export interface Token {
diff --git a/packages/pds/src/account-manager/db/schema/used-refresh-token.ts b/packages/pds/src/account-manager/db/schema/used-refresh-token.ts
index a424bfcd5c1..30a21117bf3 100644
--- a/packages/pds/src/account-manager/db/schema/used-refresh-token.ts
+++ b/packages/pds/src/account-manager/db/schema/used-refresh-token.ts
@@ -1,5 +1,5 @@
-import { RefreshToken } from '@atproto/oauth-provider'
 import { Selectable } from 'kysely'
+import { RefreshToken } from '@atproto/oauth-provider'
 
 export interface UsedRefreshToken {
   tokenId: number
diff --git a/packages/pds/src/account-manager/helpers/account.ts b/packages/pds/src/account-manager/helpers/account.ts
index 307d65e12a4..9dcab8ec053 100644
--- a/packages/pds/src/account-manager/helpers/account.ts
+++ b/packages/pds/src/account-manager/helpers/account.ts
@@ -1,7 +1,7 @@
+import { DAY } from '@atproto/common'
 import { isErrUniqueViolation, notSoftDeletedClause } from '../../db'
-import { AccountDb, ActorEntry } from '../db'
 import { StatusAttr } from '../../lexicon/types/com/atproto/admin/defs'
-import { DAY } from '@atproto/common'
+import { AccountDb, ActorEntry } from '../db'
 
 export class UserAlreadyExistsError extends Error {}
 
diff --git a/packages/pds/src/account-manager/helpers/authorization-request.ts b/packages/pds/src/account-manager/helpers/authorization-request.ts
index a80540d5f50..596b6dfe7ab 100644
--- a/packages/pds/src/account-manager/helpers/authorization-request.ts
+++ b/packages/pds/src/account-manager/helpers/authorization-request.ts
@@ -1,3 +1,4 @@
+import { Insertable, Selectable } from 'kysely'
 import {
   Code,
   FoundRequestResult,
@@ -5,9 +6,8 @@ import {
   RequestId,
   UpdateRequestData,
 } from '@atproto/oauth-provider'
-import { AccountDb, AuthorizationRequest } from '../db'
 import { fromDateISO, fromJsonObject, toDateISO, toJsonObject } from '../../db'
-import { Insertable, Selectable } from 'kysely'
+import { AccountDb, AuthorizationRequest } from '../db'
 
 export const rowToRequestData = (
   row: Selectable<AuthorizationRequest>,
diff --git a/packages/pds/src/account-manager/helpers/device-account.ts b/packages/pds/src/account-manager/helpers/device-account.ts
index 2b22c6b29c8..2c8a5a21875 100644
--- a/packages/pds/src/account-manager/helpers/device-account.ts
+++ b/packages/pds/src/account-manager/helpers/device-account.ts
@@ -1,11 +1,10 @@
+import { Insertable, Selectable } from 'kysely'
 import {
   Account,
   DeviceAccountInfo,
   DeviceId,
   OAuthClientId,
 } from '@atproto/oauth-provider'
-import { Insertable, Selectable } from 'kysely'
-
 import { fromDateISO, fromJsonArray, toDateISO, toJsonArray } from '../../db'
 import { AccountDb } from '../db'
 import { DeviceAccount } from '../db/schema/device-account'
diff --git a/packages/pds/src/account-manager/helpers/device.ts b/packages/pds/src/account-manager/helpers/device.ts
index 08c59c064c1..1447e926a51 100644
--- a/packages/pds/src/account-manager/helpers/device.ts
+++ b/packages/pds/src/account-manager/helpers/device.ts
@@ -1,7 +1,7 @@
-import { DeviceId, DeviceData } from '@atproto/oauth-provider'
-import { AccountDb, Device } from '../db'
-import { fromDateISO, toDateISO } from '../../db'
 import { Selectable } from 'kysely'
+import { DeviceData, DeviceId } from '@atproto/oauth-provider'
+import { fromDateISO, toDateISO } from '../../db'
+import { AccountDb, Device } from '../db'
 
 export const rowToDeviceData = (row: Selectable<Device>): DeviceData => ({
   sessionId: row.sessionId,
diff --git a/packages/pds/src/account-manager/helpers/email-token.ts b/packages/pds/src/account-manager/helpers/email-token.ts
index 7d3690ad0e9..f7a7a83fb8f 100644
--- a/packages/pds/src/account-manager/helpers/email-token.ts
+++ b/packages/pds/src/account-manager/helpers/email-token.ts
@@ -1,5 +1,5 @@
-import { InvalidRequestError } from '@atproto/xrpc-server'
 import { MINUTE, lessThanAgoMs } from '@atproto/common'
+import { InvalidRequestError } from '@atproto/xrpc-server'
 import { getRandomToken } from '../../api/com/atproto/server/util'
 import { AccountDb, EmailTokenPurpose } from '../db'
 
diff --git a/packages/pds/src/account-manager/helpers/invite.ts b/packages/pds/src/account-manager/helpers/invite.ts
index b9cad8bdef9..de4e629245d 100644
--- a/packages/pds/src/account-manager/helpers/invite.ts
+++ b/packages/pds/src/account-manager/helpers/invite.ts
@@ -1,7 +1,7 @@
 import { chunkArray } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { AccountDb, InviteCode } from '../db'
 import { countAll } from '../../db'
+import { AccountDb, InviteCode } from '../db'
 
 export const createInviteCodes = async (
   db: AccountDb,
diff --git a/packages/pds/src/account-manager/helpers/password.ts b/packages/pds/src/account-manager/helpers/password.ts
index 7f75090145c..768e017a342 100644
--- a/packages/pds/src/account-manager/helpers/password.ts
+++ b/packages/pds/src/account-manager/helpers/password.ts
@@ -1,8 +1,8 @@
 import { randomStr } from '@atproto/crypto'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import * as scrypt from './scrypt'
-import { AccountDb } from '../db'
 import { AppPassword } from '../../lexicon/types/com/atproto/server/createAppPassword'
+import { AccountDb } from '../db'
+import * as scrypt from './scrypt'
 
 export type AppPassDescript = {
   name: string
diff --git a/packages/pds/src/account-manager/helpers/scrypt.ts b/packages/pds/src/account-manager/helpers/scrypt.ts
index f0b61e3fca2..bbbecbe29ea 100644
--- a/packages/pds/src/account-manager/helpers/scrypt.ts
+++ b/packages/pds/src/account-manager/helpers/scrypt.ts
@@ -1,6 +1,6 @@
-import crypto from 'crypto'
-import { sha256 } from '@atproto/crypto'
+import crypto from 'node:crypto'
 import * as ui8 from 'uint8arrays'
+import { sha256 } from '@atproto/crypto'
 
 export const genSaltAndHash = (password: string): Promise<string> => {
   const salt = crypto.randomBytes(16).toString('hex')
diff --git a/packages/pds/src/account-manager/helpers/token.ts b/packages/pds/src/account-manager/helpers/token.ts
index 30da1f18bde..80063ec0985 100644
--- a/packages/pds/src/account-manager/helpers/token.ts
+++ b/packages/pds/src/account-manager/helpers/token.ts
@@ -1,3 +1,4 @@
+import { Selectable } from 'kysely'
 import {
   Code,
   NewTokenData,
@@ -7,7 +8,6 @@ import {
   TokenId,
   TokenInfo,
 } from '@atproto/oauth-provider'
-import { Selectable } from 'kysely'
 import {
   fromDateISO,
   fromJsonArray,
diff --git a/packages/pds/src/account-manager/index.ts b/packages/pds/src/account-manager/index.ts
index 848aaab04b8..12d744c40d6 100644
--- a/packages/pds/src/account-manager/index.ts
+++ b/packages/pds/src/account-manager/index.ts
@@ -1,3 +1,6 @@
+import { KeyObject } from 'node:crypto'
+import { Selectable } from 'kysely'
+import { CID } from 'multiformats/cid'
 import { HOUR, wait } from '@atproto/common'
 import {
   Account,
@@ -21,10 +24,6 @@ import {
   UpdateRequestData,
 } from '@atproto/oauth-provider'
 import { AuthRequiredError } from '@atproto/xrpc-server'
-import { Selectable } from 'kysely'
-import { CID } from 'multiformats/cid'
-import { KeyObject } from 'node:crypto'
-
 import { ActorStore } from '../actor-store/actor-store'
 import { AuthScope } from '../auth-verifier'
 import { BackgroundQueue } from '../background'
diff --git a/packages/pds/src/actor-store/actor-store-reader.ts b/packages/pds/src/actor-store/actor-store-reader.ts
index ad5abab7ef1..7d4769c97b7 100644
--- a/packages/pds/src/actor-store/actor-store-reader.ts
+++ b/packages/pds/src/actor-store/actor-store-reader.ts
@@ -1,10 +1,10 @@
 import { Keypair } from '@atproto/crypto'
 import { ActorStoreResources } from './actor-store-resources'
+import { ActorStoreTransactor } from './actor-store-transactor'
 import { ActorDb } from './db'
 import { PreferenceReader } from './preference/reader'
 import { RecordReader } from './record/reader'
 import { RepoReader } from './repo/reader'
-import { ActorStoreTransactor } from './actor-store-transactor'
 
 export class ActorStoreReader {
   public readonly repo: RepoReader
diff --git a/packages/pds/src/actor-store/actor-store.ts b/packages/pds/src/actor-store/actor-store.ts
index 414c52455da..78f02549155 100644
--- a/packages/pds/src/actor-store/actor-store.ts
+++ b/packages/pds/src/actor-store/actor-store.ts
@@ -1,3 +1,6 @@
+import assert from 'node:assert'
+import fs, { mkdir } from 'node:fs/promises'
+import path from 'node:path'
 import {
   chunkArray,
   fileExists,
@@ -7,12 +10,9 @@ import {
 import * as crypto from '@atproto/crypto'
 import { ExportableKeypair, Keypair } from '@atproto/crypto'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import assert from 'node:assert'
-import fs, { mkdir } from 'node:fs/promises'
-import path from 'node:path'
 import { ActorStoreConfig } from '../config'
 import { retrySqlite } from '../db'
-import DiskBlobStore from '../disk-blobstore'
+import { DiskBlobStore } from '../disk-blobstore'
 import { ActorStoreReader } from './actor-store-reader'
 import { ActorStoreResources } from './actor-store-resources'
 import { ActorStoreTransactor } from './actor-store-transactor'
diff --git a/packages/pds/src/actor-store/blob/reader.ts b/packages/pds/src/actor-store/blob/reader.ts
index 6ab87d1ad84..232f5add943 100644
--- a/packages/pds/src/actor-store/blob/reader.ts
+++ b/packages/pds/src/actor-store/blob/reader.ts
@@ -1,7 +1,7 @@
+import stream from 'node:stream'
+import { CID } from 'multiformats/cid'
 import { BlobNotFoundError, BlobStore } from '@atproto/repo'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { CID } from 'multiformats/cid'
-import stream from 'stream'
 import { countAll, countDistinct, notSoftDeletedClause } from '../../db/util'
 import { StatusAttr } from '../../lexicon/types/com/atproto/admin/defs'
 import { ActorDb } from '../db'
diff --git a/packages/pds/src/actor-store/blob/transactor.ts b/packages/pds/src/actor-store/blob/transactor.ts
index 08674e17b95..c8101463dc8 100644
--- a/packages/pds/src/actor-store/blob/transactor.ts
+++ b/packages/pds/src/actor-store/blob/transactor.ts
@@ -1,24 +1,24 @@
-import stream from 'stream'
-import crypto from 'crypto'
-import { CID } from 'multiformats/cid'
+import crypto from 'node:crypto'
+import stream from 'node:stream'
 import bytes from 'bytes'
 import { fromStream as fileTypeFromStream } from 'file-type'
+import { CID } from 'multiformats/cid'
+import { cloneStream, sha256RawToCid, streamSize } from '@atproto/common'
+import { BlobRef } from '@atproto/lexicon'
 import { BlobNotFoundError, BlobStore, WriteOpAction } from '@atproto/repo'
 import { AtUri } from '@atproto/syntax'
-import { cloneStream, sha256RawToCid, streamSize } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { BlobRef } from '@atproto/lexicon'
-import { ActorDb, Blob as BlobTable } from '../db'
+import { BackgroundQueue } from '../../background'
+import * as img from '../../image'
+import { StatusAttr } from '../../lexicon/types/com/atproto/admin/defs'
 import {
   PreparedBlobRef,
-  PreparedWrite,
   PreparedDelete,
   PreparedUpdate,
+  PreparedWrite,
 } from '../../repo/types'
-import * as img from '../../image'
-import { BackgroundQueue } from '../../background'
+import { ActorDb, Blob as BlobTable } from '../db'
 import { BlobReader } from './reader'
-import { StatusAttr } from '../../lexicon/types/com/atproto/admin/defs'
 
 export type BlobMetadata = {
   tempKey: string
diff --git a/packages/pds/src/actor-store/db/index.ts b/packages/pds/src/actor-store/db/index.ts
index 0f12b949d82..f5cda5d569c 100644
--- a/packages/pds/src/actor-store/db/index.ts
+++ b/packages/pds/src/actor-store/db/index.ts
@@ -1,6 +1,6 @@
-import { DatabaseSchema } from './schema'
 import { Database, Migrator } from '../../db'
 import migrations from './migrations'
+import { DatabaseSchema } from './schema'
 export * from './schema'
 
 export type ActorDb = Database<DatabaseSchema>
diff --git a/packages/pds/src/actor-store/db/schema/index.ts b/packages/pds/src/actor-store/db/schema/index.ts
index 4d0199b5e30..7be3c0d0ac7 100644
--- a/packages/pds/src/actor-store/db/schema/index.ts
+++ b/packages/pds/src/actor-store/db/schema/index.ts
@@ -1,10 +1,10 @@
 import * as accountPref from './account-pref'
-import * as repoRoot from './repo-root'
-import * as record from './record'
 import * as backlink from './backlink'
-import * as repoBlock from './repo-block'
 import * as blob from './blob'
+import * as record from './record'
 import * as recordBlob from './record-blob'
+import * as repoBlock from './repo-block'
+import * as repoRoot from './repo-root'
 
 export type DatabaseSchema = accountPref.PartialDB &
   repoRoot.PartialDB &
diff --git a/packages/pds/src/actor-store/migrate.ts b/packages/pds/src/actor-store/migrate.ts
index a54fabfea3e..201092cea4c 100644
--- a/packages/pds/src/actor-store/migrate.ts
+++ b/packages/pds/src/actor-store/migrate.ts
@@ -1,6 +1,6 @@
 import { sql } from 'kysely'
-import AppContext from '../context'
 import PQueue from 'p-queue'
+import { AppContext } from '../context'
 
 export const forEachActorStore = async (
   ctx: AppContext,
diff --git a/packages/pds/src/actor-store/preference/transactor.ts b/packages/pds/src/actor-store/preference/transactor.ts
index 152082dff2f..d61a8c06873 100644
--- a/packages/pds/src/actor-store/preference/transactor.ts
+++ b/packages/pds/src/actor-store/preference/transactor.ts
@@ -1,10 +1,10 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AuthScope } from '../../auth-verifier'
 import {
-  PreferenceReader,
   AccountPreference,
+  PreferenceReader,
   prefMatchNamespace,
 } from './reader'
-import { AuthScope } from '../../auth-verifier'
 import { prefInScope } from './util'
 
 export class PreferenceTransactor extends PreferenceReader {
diff --git a/packages/pds/src/actor-store/record/reader.ts b/packages/pds/src/actor-store/record/reader.ts
index 10cd139a589..c9b36c31cad 100644
--- a/packages/pds/src/actor-store/record/reader.ts
+++ b/packages/pds/src/actor-store/record/reader.ts
@@ -1,8 +1,8 @@
+import { CID } from 'multiformats/cid'
 import { RepoRecord } from '@atproto/lexicon'
-import { cborToLexRecord, CidSet, formatDataKey } from '@atproto/repo'
+import { CidSet, cborToLexRecord, formatDataKey } from '@atproto/repo'
 import * as syntax from '@atproto/syntax'
 import { AtUri, ensureValidAtUri } from '@atproto/syntax'
-import { CID } from 'multiformats/cid'
 import { countAll, notSoftDeletedClause } from '../../db/util'
 import { ids } from '../../lexicon/lexicons'
 import { Record as ProfileRecord } from '../../lexicon/types/app/bsky/actor/profile'
diff --git a/packages/pds/src/actor-store/record/transactor.ts b/packages/pds/src/actor-store/record/transactor.ts
index 9145c86e337..7914dbc4d0a 100644
--- a/packages/pds/src/actor-store/record/transactor.ts
+++ b/packages/pds/src/actor-store/record/transactor.ts
@@ -1,11 +1,11 @@
 import { CID } from 'multiformats/cid'
-import { AtUri } from '@atproto/syntax'
+import { RepoRecord } from '@atproto/lexicon'
 import { BlobStore, WriteOpAction } from '@atproto/repo'
+import { AtUri } from '@atproto/syntax'
+import { StatusAttr } from '../../lexicon/types/com/atproto/admin/defs'
 import { dbLogger as log } from '../../logger'
 import { ActorDb, Backlink } from '../db'
 import { RecordReader, getBacklinks } from './reader'
-import { StatusAttr } from '../../lexicon/types/com/atproto/admin/defs'
-import { RepoRecord } from '@atproto/lexicon'
 
 export class RecordTransactor extends RecordReader {
   constructor(
diff --git a/packages/pds/src/actor-store/repo/reader.ts b/packages/pds/src/actor-store/repo/reader.ts
index 5429615efe3..6a327a62629 100644
--- a/packages/pds/src/actor-store/repo/reader.ts
+++ b/packages/pds/src/actor-store/repo/reader.ts
@@ -1,6 +1,4 @@
 import { BlobStore } from '@atproto/repo'
-import { CID } from 'multiformats/cid'
-
 import { BlobReader } from '../blob/reader'
 import { ActorDb } from '../db'
 import { RecordReader } from '../record/reader'
diff --git a/packages/pds/src/actor-store/repo/sql-repo-reader.ts b/packages/pds/src/actor-store/repo/sql-repo-reader.ts
index 241a8512907..7b51d6758f7 100644
--- a/packages/pds/src/actor-store/repo/sql-repo-reader.ts
+++ b/packages/pds/src/actor-store/repo/sql-repo-reader.ts
@@ -1,14 +1,14 @@
+import { sql } from 'kysely'
+import { CID } from 'multiformats/cid'
+import { chunkArray, wait } from '@atproto/common'
 import {
   BlockMap,
   CidSet,
   ReadableBlockstore,
   writeCarStream,
 } from '@atproto/repo'
-import { chunkArray, wait } from '@atproto/common'
-import { CID } from 'multiformats/cid'
-import { ActorDb } from '../db'
-import { sql } from 'kysely'
 import { countAll } from '../../db'
+import { ActorDb } from '../db'
 
 export class SqlRepoReader extends ReadableBlockstore {
   cache: BlockMap = new BlockMap()
diff --git a/packages/pds/src/actor-store/repo/sql-repo-transactor.ts b/packages/pds/src/actor-store/repo/sql-repo-transactor.ts
index effc182a3f7..89cd44cd6cf 100644
--- a/packages/pds/src/actor-store/repo/sql-repo-transactor.ts
+++ b/packages/pds/src/actor-store/repo/sql-repo-transactor.ts
@@ -1,6 +1,6 @@
-import { CommitData, RepoStorage, BlockMap } from '@atproto/repo'
-import { chunkArray } from '@atproto/common'
 import { CID } from 'multiformats/cid'
+import { chunkArray } from '@atproto/common'
+import { BlockMap, CommitData, RepoStorage } from '@atproto/repo'
 import { ActorDb, RepoBlock } from '../db'
 import { SqlRepoReader } from './sql-repo-reader'
 
diff --git a/packages/pds/src/actor-store/repo/transactor.ts b/packages/pds/src/actor-store/repo/transactor.ts
index a9477543779..b64eaca6081 100644
--- a/packages/pds/src/actor-store/repo/transactor.ts
+++ b/packages/pds/src/actor-store/repo/transactor.ts
@@ -1,9 +1,10 @@
 import { CID } from 'multiformats/cid'
 import * as crypto from '@atproto/crypto'
 import { BlobStore, CommitData, Repo, WriteOpAction } from '@atproto/repo'
-import { InvalidRequestError } from '@atproto/xrpc-server'
 import { AtUri } from '@atproto/syntax'
-import { SqlRepoTransactor } from './sql-repo-transactor'
+import { InvalidRequestError } from '@atproto/xrpc-server'
+import { BackgroundQueue } from '../../background'
+import { createWriteToOp, writeToOp } from '../../repo'
 import {
   BadCommitSwapError,
   BadRecordSwapError,
@@ -11,11 +12,10 @@ import {
   PreparedWrite,
 } from '../../repo/types'
 import { BlobTransactor } from '../blob/transactor'
-import { createWriteToOp, writeToOp } from '../../repo'
-import { BackgroundQueue } from '../../background'
 import { ActorDb } from '../db'
 import { RecordTransactor } from '../record/transactor'
 import { RepoReader } from './reader'
+import { SqlRepoTransactor } from './sql-repo-transactor'
 
 export class RepoTransactor extends RepoReader {
   blob: BlobTransactor
diff --git a/packages/pds/src/api/app/bsky/actor/getPreferences.ts b/packages/pds/src/api/app/bsky/actor/getPreferences.ts
index 4a4e7a6943b..3a5b20c10d1 100644
--- a/packages/pds/src/api/app/bsky/actor/getPreferences.ts
+++ b/packages/pds/src/api/app/bsky/actor/getPreferences.ts
@@ -1,6 +1,6 @@
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { AuthScope } from '../../../../auth-verifier'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
 
 export default function (server: Server, ctx: AppContext) {
   if (!ctx.bskyAppView) return
diff --git a/packages/pds/src/api/app/bsky/actor/getProfile.ts b/packages/pds/src/api/app/bsky/actor/getProfile.ts
index fda6ad6fde5..354b2d70fcf 100644
--- a/packages/pds/src/api/app/bsky/actor/getProfile.ts
+++ b/packages/pds/src/api/app/bsky/actor/getProfile.ts
@@ -1,9 +1,9 @@
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { OutputSchema } from '../../../../lexicon/types/app/bsky/actor/getProfile'
 import {
-  LocalViewer,
   LocalRecords,
+  LocalViewer,
   pipethroughReadAfterWrite,
 } from '../../../../read-after-write'
 
diff --git a/packages/pds/src/api/app/bsky/actor/getProfiles.ts b/packages/pds/src/api/app/bsky/actor/getProfiles.ts
index 104635bf8e6..576d376eaea 100644
--- a/packages/pds/src/api/app/bsky/actor/getProfiles.ts
+++ b/packages/pds/src/api/app/bsky/actor/getProfiles.ts
@@ -1,10 +1,10 @@
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import { OutputSchema } from '../../../../lexicon/types/app/bsky/actor/getProfiles'
 import {
+  LocalRecords,
   LocalViewer,
   pipethroughReadAfterWrite,
-  LocalRecords,
 } from '../../../../read-after-write'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/pds/src/api/app/bsky/actor/index.ts b/packages/pds/src/api/app/bsky/actor/index.ts
index a8a6fe31d5f..a9f8cc4a7ee 100644
--- a/packages/pds/src/api/app/bsky/actor/index.ts
+++ b/packages/pds/src/api/app/bsky/actor/index.ts
@@ -1,6 +1,5 @@
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
-
 import getPreferences from './getPreferences'
 import getProfile from './getProfile'
 import getProfiles from './getProfiles'
diff --git a/packages/pds/src/api/app/bsky/actor/putPreferences.ts b/packages/pds/src/api/app/bsky/actor/putPreferences.ts
index ea559282835..4813c13379e 100644
--- a/packages/pds/src/api/app/bsky/actor/putPreferences.ts
+++ b/packages/pds/src/api/app/bsky/actor/putPreferences.ts
@@ -1,7 +1,7 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { AccountPreference } from '../../../../actor-store/preference/reader'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
 
 export default function (server: Server, ctx: AppContext) {
   if (!ctx.bskyAppView) return
diff --git a/packages/pds/src/api/app/bsky/feed/getActorLikes.ts b/packages/pds/src/api/app/bsky/feed/getActorLikes.ts
index 02547bc240c..f5133c92428 100644
--- a/packages/pds/src/api/app/bsky/feed/getActorLikes.ts
+++ b/packages/pds/src/api/app/bsky/feed/getActorLikes.ts
@@ -1,10 +1,10 @@
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { OutputSchema } from '../../../../lexicon/types/app/bsky/feed/getAuthorFeed'
 import {
+  LocalRecords,
   LocalViewer,
   pipethroughReadAfterWrite,
-  LocalRecords,
 } from '../../../../read-after-write'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/pds/src/api/app/bsky/feed/getAuthorFeed.ts b/packages/pds/src/api/app/bsky/feed/getAuthorFeed.ts
index 942ff8dce50..7256eeb18eb 100644
--- a/packages/pds/src/api/app/bsky/feed/getAuthorFeed.ts
+++ b/packages/pds/src/api/app/bsky/feed/getAuthorFeed.ts
@@ -1,11 +1,11 @@
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
-import { OutputSchema } from '../../../../lexicon/types/app/bsky/feed/getAuthorFeed'
 import { isReasonRepost } from '../../../../lexicon/types/app/bsky/feed/defs'
+import { OutputSchema } from '../../../../lexicon/types/app/bsky/feed/getAuthorFeed'
 import {
+  LocalRecords,
   LocalViewer,
   pipethroughReadAfterWrite,
-  LocalRecords,
 } from '../../../../read-after-write'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/pds/src/api/app/bsky/feed/getFeed.ts b/packages/pds/src/api/app/bsky/feed/getFeed.ts
index e4634a7e1ed..eb7cd9abe25 100644
--- a/packages/pds/src/api/app/bsky/feed/getFeed.ts
+++ b/packages/pds/src/api/app/bsky/feed/getFeed.ts
@@ -1,9 +1,9 @@
+import { InvalidRequestError } from '@atproto/oauth-provider'
+import { AtUri } from '@atproto/syntax'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
-import { pipethrough } from '../../../../pipethrough'
 import { ids } from '../../../../lexicon/lexicons'
-import { AtUri } from '@atproto/syntax'
-import { InvalidRequestError } from '@atproto/oauth-provider'
+import { pipethrough } from '../../../../pipethrough'
 
 export default function (server: Server, ctx: AppContext) {
   const { bskyAppView } = ctx
diff --git a/packages/pds/src/api/app/bsky/feed/getPostThread.ts b/packages/pds/src/api/app/bsky/feed/getPostThread.ts
index 9518a4c4db4..07da7194f31 100644
--- a/packages/pds/src/api/app/bsky/feed/getPostThread.ts
+++ b/packages/pds/src/api/app/bsky/feed/getPostThread.ts
@@ -1,28 +1,27 @@
 import assert from 'node:assert'
 import { AtUri } from '@atproto/syntax'
 import { XRPCError } from '@atproto/xrpc'
-
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
+import { ids } from '../../../../lexicon/lexicons'
 import {
   ThreadViewPost,
   isThreadViewPost,
 } from '../../../../lexicon/types/app/bsky/feed/defs'
-import { Record as PostRecord } from '../../../../lexicon/types/app/bsky/feed/post'
 import {
   OutputSchema,
   QueryParams,
 } from '../../../../lexicon/types/app/bsky/feed/getPostThread'
+import { Record as PostRecord } from '../../../../lexicon/types/app/bsky/feed/post'
 import {
+  LocalRecords,
   LocalViewer,
+  RecordDescript,
+  formatMungedResponse,
   getLocalLag,
   getRepoRev,
-  LocalRecords,
-  RecordDescript,
   pipethroughReadAfterWrite,
-  formatMungedResponse,
 } from '../../../../read-after-write'
-import { ids } from '../../../../lexicon/lexicons'
 
 export default function (server: Server, ctx: AppContext) {
   if (!ctx.bskyAppView) return
diff --git a/packages/pds/src/api/app/bsky/feed/getTimeline.ts b/packages/pds/src/api/app/bsky/feed/getTimeline.ts
index ce32d10245d..f92eb86de6d 100644
--- a/packages/pds/src/api/app/bsky/feed/getTimeline.ts
+++ b/packages/pds/src/api/app/bsky/feed/getTimeline.ts
@@ -1,10 +1,10 @@
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { OutputSchema } from '../../../../lexicon/types/app/bsky/feed/getTimeline'
 import {
+  LocalRecords,
   LocalViewer,
   pipethroughReadAfterWrite,
-  LocalRecords,
 } from '../../../../read-after-write'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/pds/src/api/app/bsky/feed/index.ts b/packages/pds/src/api/app/bsky/feed/index.ts
index 91bf8b135f9..85e0bdd65d7 100644
--- a/packages/pds/src/api/app/bsky/feed/index.ts
+++ b/packages/pds/src/api/app/bsky/feed/index.ts
@@ -1,5 +1,5 @@
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import getActorLikes from './getActorLikes'
 import getAuthorFeed from './getAuthorFeed'
 import getFeed from './getFeed'
diff --git a/packages/pds/src/api/app/bsky/index.ts b/packages/pds/src/api/app/bsky/index.ts
index 48019f2cf64..71a04c8c161 100644
--- a/packages/pds/src/api/app/bsky/index.ts
+++ b/packages/pds/src/api/app/bsky/index.ts
@@ -1,5 +1,5 @@
+import { AppContext } from '../../../context'
 import { Server } from '../../../lexicon'
-import AppContext from '../../../context'
 import actor from './actor'
 import feed from './feed'
 import notification from './notification'
diff --git a/packages/pds/src/api/app/bsky/notification/index.ts b/packages/pds/src/api/app/bsky/notification/index.ts
index 2c14eb6d850..c0912078d42 100644
--- a/packages/pds/src/api/app/bsky/notification/index.ts
+++ b/packages/pds/src/api/app/bsky/notification/index.ts
@@ -1,5 +1,5 @@
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import registerPush from './registerPush'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/pds/src/api/app/bsky/notification/registerPush.ts b/packages/pds/src/api/app/bsky/notification/registerPush.ts
index 22880297f10..f62de2d7461 100644
--- a/packages/pds/src/api/app/bsky/notification/registerPush.ts
+++ b/packages/pds/src/api/app/bsky/notification/registerPush.ts
@@ -1,11 +1,11 @@
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
+import { AtpAgent } from '@atproto/api'
 import { getNotif } from '@atproto/identity'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { AtpAgent } from '@atproto/api'
-import { getDidDoc } from '../util/resolver'
 import { AuthScope } from '../../../../auth-verifier'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
 import { ids } from '../../../../lexicon/lexicons'
+import { getDidDoc } from '../util/resolver'
 
 export default function (server: Server, ctx: AppContext) {
   const { bskyAppView } = ctx
diff --git a/packages/pds/src/api/app/bsky/util/resolver.ts b/packages/pds/src/api/app/bsky/util/resolver.ts
index eac4f916424..ce128784d83 100644
--- a/packages/pds/src/api/app/bsky/util/resolver.ts
+++ b/packages/pds/src/api/app/bsky/util/resolver.ts
@@ -1,6 +1,6 @@
 import { DidDocument, PoorlyFormattedDidDocumentError } from '@atproto/identity'
-import AppContext from '../../../../context'
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 
 // provides http-friendly errors during did resolution
 export const getDidDoc = async (ctx: AppContext, did: string) => {
diff --git a/packages/pds/src/api/com/atproto/admin/deleteAccount.ts b/packages/pds/src/api/com/atproto/admin/deleteAccount.ts
index cb18078d176..33251eabb97 100644
--- a/packages/pds/src/api/com/atproto/admin/deleteAccount.ts
+++ b/packages/pds/src/api/com/atproto/admin/deleteAccount.ts
@@ -1,6 +1,6 @@
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { AccountStatus } from '../../../../account-manager'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.admin.deleteAccount({
diff --git a/packages/pds/src/api/com/atproto/admin/disableAccountInvites.ts b/packages/pds/src/api/com/atproto/admin/disableAccountInvites.ts
index f22cb5a64ab..812db023d14 100644
--- a/packages/pds/src/api/com/atproto/admin/disableAccountInvites.ts
+++ b/packages/pds/src/api/com/atproto/admin/disableAccountInvites.ts
@@ -1,6 +1,6 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.admin.disableAccountInvites({
diff --git a/packages/pds/src/api/com/atproto/admin/disableInviteCodes.ts b/packages/pds/src/api/com/atproto/admin/disableInviteCodes.ts
index 5be085450c5..04e72c73ae6 100644
--- a/packages/pds/src/api/com/atproto/admin/disableInviteCodes.ts
+++ b/packages/pds/src/api/com/atproto/admin/disableInviteCodes.ts
@@ -1,6 +1,6 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.admin.disableInviteCodes({
diff --git a/packages/pds/src/api/com/atproto/admin/enableAccountInvites.ts b/packages/pds/src/api/com/atproto/admin/enableAccountInvites.ts
index d65bd781194..6df9820c419 100644
--- a/packages/pds/src/api/com/atproto/admin/enableAccountInvites.ts
+++ b/packages/pds/src/api/com/atproto/admin/enableAccountInvites.ts
@@ -1,6 +1,6 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.admin.enableAccountInvites({
diff --git a/packages/pds/src/api/com/atproto/admin/getAccountInfo.ts b/packages/pds/src/api/com/atproto/admin/getAccountInfo.ts
index f5561955de7..ba5051081fe 100644
--- a/packages/pds/src/api/com/atproto/admin/getAccountInfo.ts
+++ b/packages/pds/src/api/com/atproto/admin/getAccountInfo.ts
@@ -1,7 +1,6 @@
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { INVALID_HANDLE } from '@atproto/syntax'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
 import { formatAccountInfo } from './util'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/pds/src/api/com/atproto/admin/getAccountInfos.ts b/packages/pds/src/api/com/atproto/admin/getAccountInfos.ts
index 9531d7e69d1..5aebdfb4bef 100644
--- a/packages/pds/src/api/com/atproto/admin/getAccountInfos.ts
+++ b/packages/pds/src/api/com/atproto/admin/getAccountInfos.ts
@@ -1,5 +1,5 @@
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { formatAccountInfo } from './util'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/pds/src/api/com/atproto/admin/getInviteCodes.ts b/packages/pds/src/api/com/atproto/admin/getInviteCodes.ts
index 0cfe5f5a809..2169563e082 100644
--- a/packages/pds/src/api/com/atproto/admin/getInviteCodes.ts
+++ b/packages/pds/src/api/com/atproto/admin/getInviteCodes.ts
@@ -1,13 +1,13 @@
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { selectInviteCodesQb } from '../../../../account-manager/helpers/invite'
+import { AppContext } from '../../../../context'
 import {
-  LabeledResult,
   Cursor,
   GenericKeyset,
+  LabeledResult,
   paginate,
 } from '../../../../db/pagination'
-import { selectInviteCodesQb } from '../../../../account-manager/helpers/invite'
+import { Server } from '../../../../lexicon'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.admin.getInviteCodes({
diff --git a/packages/pds/src/api/com/atproto/admin/getSubjectStatus.ts b/packages/pds/src/api/com/atproto/admin/getSubjectStatus.ts
index 46f8e1ef487..388ee4011ea 100644
--- a/packages/pds/src/api/com/atproto/admin/getSubjectStatus.ts
+++ b/packages/pds/src/api/com/atproto/admin/getSubjectStatus.ts
@@ -1,8 +1,8 @@
 import { CID } from 'multiformats/cid'
 import { AtUri } from '@atproto/syntax'
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { OutputSchema } from '../../../../lexicon/types/com/atproto/admin/getSubjectStatus'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/pds/src/api/com/atproto/admin/index.ts b/packages/pds/src/api/com/atproto/admin/index.ts
index 8f4d9abb812..8e13ad7a0ff 100644
--- a/packages/pds/src/api/com/atproto/admin/index.ts
+++ b/packages/pds/src/api/com/atproto/admin/index.ts
@@ -1,18 +1,18 @@
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import updateSubjectStatus from './updateSubjectStatus'
-import getSubjectStatus from './getSubjectStatus'
-import getAccountInfo from './getAccountInfo'
-import enableAccountInvites from './enableAccountInvites'
+import deleteAccount from './deleteAccount'
 import disableAccountInvites from './disableAccountInvites'
 import disableInviteCodes from './disableInviteCodes'
+import enableAccountInvites from './enableAccountInvites'
+import getAccountInfo from './getAccountInfo'
+import getAccountInfos from './getAccountInfos'
 import getInviteCodes from './getInviteCodes'
-import updateAccountHandle from './updateAccountHandle'
+import getSubjectStatus from './getSubjectStatus'
+import sendEmail from './sendEmail'
 import updateAccountEmail from './updateAccountEmail'
+import updateAccountHandle from './updateAccountHandle'
 import updateAccountPassword from './updateAccountPassword'
-import sendEmail from './sendEmail'
-import deleteAccount from './deleteAccount'
-import getAccountInfos from './getAccountInfos'
+import updateSubjectStatus from './updateSubjectStatus'
 
 export default function (server: Server, ctx: AppContext) {
   updateSubjectStatus(server, ctx)
diff --git a/packages/pds/src/api/com/atproto/admin/sendEmail.ts b/packages/pds/src/api/com/atproto/admin/sendEmail.ts
index 491cf1b7f24..74a73417627 100644
--- a/packages/pds/src/api/com/atproto/admin/sendEmail.ts
+++ b/packages/pds/src/api/com/atproto/admin/sendEmail.ts
@@ -1,9 +1,9 @@
 import assert from 'node:assert'
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
-import { resultPassthru } from '../../../proxy'
 import { ids } from '../../../../lexicon/lexicons'
+import { resultPassthru } from '../../../proxy'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.admin.sendEmail({
diff --git a/packages/pds/src/api/com/atproto/admin/updateAccountEmail.ts b/packages/pds/src/api/com/atproto/admin/updateAccountEmail.ts
index 421cc3073da..d4c5c0853f9 100644
--- a/packages/pds/src/api/com/atproto/admin/updateAccountEmail.ts
+++ b/packages/pds/src/api/com/atproto/admin/updateAccountEmail.ts
@@ -1,6 +1,6 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { authPassthru } from './util'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/pds/src/api/com/atproto/admin/updateAccountHandle.ts b/packages/pds/src/api/com/atproto/admin/updateAccountHandle.ts
index 7604e178096..4b8beea2aa5 100644
--- a/packages/pds/src/api/com/atproto/admin/updateAccountHandle.ts
+++ b/packages/pds/src/api/com/atproto/admin/updateAccountHandle.ts
@@ -1,7 +1,7 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { normalizeAndValidateHandle } from '../../../../handle'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { httpLogger } from '../../../../logger'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/pds/src/api/com/atproto/admin/updateAccountPassword.ts b/packages/pds/src/api/com/atproto/admin/updateAccountPassword.ts
index 0c7a0f8c384..bd025bb9b87 100644
--- a/packages/pds/src/api/com/atproto/admin/updateAccountPassword.ts
+++ b/packages/pds/src/api/com/atproto/admin/updateAccountPassword.ts
@@ -1,5 +1,5 @@
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { authPassthru } from './util'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/pds/src/api/com/atproto/admin/updateSubjectStatus.ts b/packages/pds/src/api/com/atproto/admin/updateSubjectStatus.ts
index 26af65fd5a8..2adb541cf9c 100644
--- a/packages/pds/src/api/com/atproto/admin/updateSubjectStatus.ts
+++ b/packages/pds/src/api/com/atproto/admin/updateSubjectStatus.ts
@@ -1,13 +1,13 @@
 import { CID } from 'multiformats/cid'
 import { AtUri } from '@atproto/syntax'
+import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import {
-  isRepoRef,
   isRepoBlobRef,
+  isRepoRef,
 } from '../../../../lexicon/types/com/atproto/admin/defs'
 import { isMain as isStrongRef } from '../../../../lexicon/types/com/atproto/repo/strongRef'
-import { InvalidRequestError } from '@atproto/xrpc-server'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.admin.updateSubjectStatus({
diff --git a/packages/pds/src/api/com/atproto/admin/util.ts b/packages/pds/src/api/com/atproto/admin/util.ts
index 5e7fb0a5c47..b1367830884 100644
--- a/packages/pds/src/api/com/atproto/admin/util.ts
+++ b/packages/pds/src/api/com/atproto/admin/util.ts
@@ -1,6 +1,6 @@
 import express from 'express'
-import { ActorAccount } from '../../../../account-manager/helpers/account'
 import { INVALID_HANDLE } from '@atproto/syntax'
+import { ActorAccount } from '../../../../account-manager/helpers/account'
 import { CodeDetail } from '../../../../account-manager/helpers/invite'
 
 // Output designed to passed as second arg to AtpAgent methods.
diff --git a/packages/pds/src/api/com/atproto/identity/getRecommendedDidCredentials.ts b/packages/pds/src/api/com/atproto/identity/getRecommendedDidCredentials.ts
index 9bb65a49719..b81c1881514 100644
--- a/packages/pds/src/api/com/atproto/identity/getRecommendedDidCredentials.ts
+++ b/packages/pds/src/api/com/atproto/identity/getRecommendedDidCredentials.ts
@@ -1,5 +1,5 @@
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.identity.getRecommendedDidCredentials({
diff --git a/packages/pds/src/api/com/atproto/identity/index.ts b/packages/pds/src/api/com/atproto/identity/index.ts
index 0a1d72a919b..d44d8e7de68 100644
--- a/packages/pds/src/api/com/atproto/identity/index.ts
+++ b/packages/pds/src/api/com/atproto/identity/index.ts
@@ -1,11 +1,11 @@
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import resolveHandle from './resolveHandle'
-import updateHandle from './updateHandle'
 import getRecommendedDidCredentials from './getRecommendedDidCredentials'
 import requestPlcOperationSignature from './requestPlcOperationSignature'
+import resolveHandle from './resolveHandle'
 import signPlcOperation from './signPlcOperation'
 import submitPlcOperation from './submitPlcOperation'
+import updateHandle from './updateHandle'
 
 export default function (server: Server, ctx: AppContext) {
   resolveHandle(server, ctx)
diff --git a/packages/pds/src/api/com/atproto/identity/requestPlcOperationSignature.ts b/packages/pds/src/api/com/atproto/identity/requestPlcOperationSignature.ts
index 93be620f7c1..044d81ebbf7 100644
--- a/packages/pds/src/api/com/atproto/identity/requestPlcOperationSignature.ts
+++ b/packages/pds/src/api/com/atproto/identity/requestPlcOperationSignature.ts
@@ -1,11 +1,9 @@
 import assert from 'node:assert'
-
 import { InvalidRequestError } from '@atproto/xrpc-server'
-
-import AppContext from '../../../../context'
+import { AuthScope } from '../../../../auth-verifier'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import { ids } from '../../../../lexicon/lexicons'
-import { AuthScope } from '../../../../auth-verifier'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.identity.requestPlcOperationSignature({
diff --git a/packages/pds/src/api/com/atproto/identity/resolveHandle.ts b/packages/pds/src/api/com/atproto/identity/resolveHandle.ts
index f18529d0598..d0639ef43a5 100644
--- a/packages/pds/src/api/com/atproto/identity/resolveHandle.ts
+++ b/packages/pds/src/api/com/atproto/identity/resolveHandle.ts
@@ -1,7 +1,7 @@
-import { InvalidRequestError } from '@atproto/xrpc-server'
 import * as ident from '@atproto/syntax'
+import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.identity.resolveHandle(async ({ params }) => {
diff --git a/packages/pds/src/api/com/atproto/identity/signPlcOperation.ts b/packages/pds/src/api/com/atproto/identity/signPlcOperation.ts
index 3b1f646c671..01f9b613d1c 100644
--- a/packages/pds/src/api/com/atproto/identity/signPlcOperation.ts
+++ b/packages/pds/src/api/com/atproto/identity/signPlcOperation.ts
@@ -1,10 +1,8 @@
 import assert from 'node:assert'
-
+import * as plc from '@did-plc/lib'
 import { check } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import * as plc from '@did-plc/lib'
-
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import { ids } from '../../../../lexicon/lexicons'
 import { resultPassthru } from '../../../proxy'
diff --git a/packages/pds/src/api/com/atproto/identity/submitPlcOperation.ts b/packages/pds/src/api/com/atproto/identity/submitPlcOperation.ts
index 5a1983ae2db..5b8075f0fea 100644
--- a/packages/pds/src/api/com/atproto/identity/submitPlcOperation.ts
+++ b/packages/pds/src/api/com/atproto/identity/submitPlcOperation.ts
@@ -1,8 +1,8 @@
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import * as plc from '@did-plc/lib'
 import { check } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
 import { httpLogger as log } from '../../../../logger'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/pds/src/api/com/atproto/identity/updateHandle.ts b/packages/pds/src/api/com/atproto/identity/updateHandle.ts
index df0ad86afe4..7af0a0929cf 100644
--- a/packages/pds/src/api/com/atproto/identity/updateHandle.ts
+++ b/packages/pds/src/api/com/atproto/identity/updateHandle.ts
@@ -1,11 +1,11 @@
 import assert from 'node:assert'
-import { InvalidRequestError } from '@atproto/xrpc-server'
 import { DAY, MINUTE } from '@atproto/common'
+import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { normalizeAndValidateHandle } from '../../../../handle'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
-import { httpLogger } from '../../../../logger'
 import { ids } from '../../../../lexicon/lexicons'
+import { httpLogger } from '../../../../logger'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.identity.updateHandle({
diff --git a/packages/pds/src/api/com/atproto/index.ts b/packages/pds/src/api/com/atproto/index.ts
index c7d4f217f88..079b1b4ea3c 100644
--- a/packages/pds/src/api/com/atproto/index.ts
+++ b/packages/pds/src/api/com/atproto/index.ts
@@ -1,4 +1,4 @@
-import AppContext from '../../../context'
+import { AppContext } from '../../../context'
 import { Server } from '../../../lexicon'
 import admin from './admin'
 import identity from './identity'
diff --git a/packages/pds/src/api/com/atproto/moderation/createReport.ts b/packages/pds/src/api/com/atproto/moderation/createReport.ts
index fce5dc3b827..467d96c6d68 100644
--- a/packages/pds/src/api/com/atproto/moderation/createReport.ts
+++ b/packages/pds/src/api/com/atproto/moderation/createReport.ts
@@ -1,9 +1,9 @@
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
-import { parseProxyInfo } from '../../../../pipethrough'
-import { ids } from '../../../../lexicon/lexicons'
 import { AtpAgent } from '@atproto/api'
 import { AuthScope } from '../../../../auth-verifier'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
+import { ids } from '../../../../lexicon/lexicons'
+import { parseProxyInfo } from '../../../../pipethrough'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.moderation.createReport({
diff --git a/packages/pds/src/api/com/atproto/moderation/index.ts b/packages/pds/src/api/com/atproto/moderation/index.ts
index d3f181f3316..34b0d7ff9fe 100644
--- a/packages/pds/src/api/com/atproto/moderation/index.ts
+++ b/packages/pds/src/api/com/atproto/moderation/index.ts
@@ -1,4 +1,4 @@
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import createReport from './createReport'
 
diff --git a/packages/pds/src/api/com/atproto/repo/applyWrites.ts b/packages/pds/src/api/com/atproto/repo/applyWrites.ts
index 7fa537c3791..1b4d8ebd70e 100644
--- a/packages/pds/src/api/com/atproto/repo/applyWrites.ts
+++ b/packages/pds/src/api/com/atproto/repo/applyWrites.ts
@@ -1,23 +1,25 @@
 import { CID } from 'multiformats/cid'
-import { InvalidRequestError, AuthRequiredError } from '@atproto/xrpc-server'
 import { WriteOpAction } from '@atproto/repo'
-import { prepareCreate, prepareDelete, prepareUpdate } from '../../../../repo'
+import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import {
+  CreateResult,
+  DeleteResult,
   HandlerInput,
+  UpdateResult,
   isCreate,
-  isUpdate,
   isDelete,
-  CreateResult,
-  UpdateResult,
-  DeleteResult,
+  isUpdate,
 } from '../../../../lexicon/types/com/atproto/repo/applyWrites'
 import {
   BadCommitSwapError,
   InvalidRecordError,
   PreparedWrite,
+  prepareCreate,
+  prepareDelete,
+  prepareUpdate,
 } from '../../../../repo'
-import AppContext from '../../../../context'
 
 const ratelimitPoints = ({ input }: { input: HandlerInput }) => {
   let points = 0
diff --git a/packages/pds/src/api/com/atproto/repo/createRecord.ts b/packages/pds/src/api/com/atproto/repo/createRecord.ts
index 38d90d7482c..ee93555a922 100644
--- a/packages/pds/src/api/com/atproto/repo/createRecord.ts
+++ b/packages/pds/src/api/com/atproto/repo/createRecord.ts
@@ -1,14 +1,15 @@
 import { CID } from 'multiformats/cid'
-import { InvalidRequestError, AuthRequiredError } from '@atproto/xrpc-server'
 import { InvalidRecordKeyError } from '@atproto/syntax'
-import { prepareCreate, prepareDelete } from '../../../../repo'
+import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import {
   BadCommitSwapError,
   InvalidRecordError,
   PreparedCreate,
+  prepareCreate,
+  prepareDelete,
 } from '../../../../repo'
-import AppContext from '../../../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.repo.createRecord({
diff --git a/packages/pds/src/api/com/atproto/repo/deleteRecord.ts b/packages/pds/src/api/com/atproto/repo/deleteRecord.ts
index bef27a5ede3..b39bc8c05e7 100644
--- a/packages/pds/src/api/com/atproto/repo/deleteRecord.ts
+++ b/packages/pds/src/api/com/atproto/repo/deleteRecord.ts
@@ -1,9 +1,12 @@
+import { CID } from 'multiformats/cid'
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
-import { prepareDelete } from '../../../../repo'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
-import { BadCommitSwapError, BadRecordSwapError } from '../../../../repo'
-import { CID } from 'multiformats/cid'
+import {
+  BadCommitSwapError,
+  BadRecordSwapError,
+  prepareDelete,
+} from '../../../../repo'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.repo.deleteRecord({
diff --git a/packages/pds/src/api/com/atproto/repo/describeRepo.ts b/packages/pds/src/api/com/atproto/repo/describeRepo.ts
index 6bc54e873c8..2843630f0c3 100644
--- a/packages/pds/src/api/com/atproto/repo/describeRepo.ts
+++ b/packages/pds/src/api/com/atproto/repo/describeRepo.ts
@@ -1,8 +1,8 @@
-import { InvalidRequestError } from '@atproto/xrpc-server'
 import * as id from '@atproto/identity'
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { INVALID_HANDLE } from '@atproto/syntax'
+import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
 import { assertRepoAvailability } from '../sync/util'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/pds/src/api/com/atproto/repo/getRecord.ts b/packages/pds/src/api/com/atproto/repo/getRecord.ts
index ec2bae6706e..970a5a86a85 100644
--- a/packages/pds/src/api/com/atproto/repo/getRecord.ts
+++ b/packages/pds/src/api/com/atproto/repo/getRecord.ts
@@ -1,7 +1,7 @@
 import { AtUri } from '@atproto/syntax'
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
 import { pipethrough } from '../../../../pipethrough'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/pds/src/api/com/atproto/repo/importRepo.ts b/packages/pds/src/api/com/atproto/repo/importRepo.ts
index e0a5608d065..06490842650 100644
--- a/packages/pds/src/api/com/atproto/repo/importRepo.ts
+++ b/packages/pds/src/api/com/atproto/repo/importRepo.ts
@@ -1,18 +1,18 @@
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
-import { ActorStoreTransactor } from '../../../../actor-store/actor-store-transactor'
+import { CID } from 'multiformats/cid'
+import PQueue from 'p-queue'
 import { TID } from '@atproto/common'
+import { BlobRef, LexValue, RepoRecord } from '@atproto/lexicon'
 import {
   WriteOpAction,
   getAndParseRecord,
   readCarStream,
   verifyDiff,
 } from '@atproto/repo'
-import { InvalidRequestError } from '@atproto/xrpc-server'
-import { CID } from 'multiformats/cid'
-import PQueue from 'p-queue'
 import { AtUri } from '@atproto/syntax'
-import { BlobRef, LexValue, RepoRecord } from '@atproto/lexicon'
+import { InvalidRequestError } from '@atproto/xrpc-server'
+import { ActorStoreTransactor } from '../../../../actor-store/actor-store-transactor'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.repo.importRepo({
diff --git a/packages/pds/src/api/com/atproto/repo/index.ts b/packages/pds/src/api/com/atproto/repo/index.ts
index 5c754064e95..ccf3f043ba8 100644
--- a/packages/pds/src/api/com/atproto/repo/index.ts
+++ b/packages/pds/src/api/com/atproto/repo/index.ts
@@ -1,15 +1,15 @@
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import applyWrites from './applyWrites'
 import createRecord from './createRecord'
 import deleteRecord from './deleteRecord'
 import describeRepo from './describeRepo'
 import getRecord from './getRecord'
+import importRepo from './importRepo'
+import listMissingBlobs from './listMissingBlobs'
 import listRecords from './listRecords'
 import putRecord from './putRecord'
 import uploadBlob from './uploadBlob'
-import listMissingBlobs from './listMissingBlobs'
-import importRepo from './importRepo'
 
 export default function (server: Server, ctx: AppContext) {
   applyWrites(server, ctx)
diff --git a/packages/pds/src/api/com/atproto/repo/listMissingBlobs.ts b/packages/pds/src/api/com/atproto/repo/listMissingBlobs.ts
index f888045b425..8ae46114f3b 100644
--- a/packages/pds/src/api/com/atproto/repo/listMissingBlobs.ts
+++ b/packages/pds/src/api/com/atproto/repo/listMissingBlobs.ts
@@ -1,5 +1,5 @@
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.repo.listMissingBlobs({
diff --git a/packages/pds/src/api/com/atproto/repo/listRecords.ts b/packages/pds/src/api/com/atproto/repo/listRecords.ts
index e8440835c9a..673049b8616 100644
--- a/packages/pds/src/api/com/atproto/repo/listRecords.ts
+++ b/packages/pds/src/api/com/atproto/repo/listRecords.ts
@@ -1,7 +1,7 @@
-import { InvalidRequestError } from '@atproto/xrpc-server'
 import { AtUri } from '@atproto/syntax'
+import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.repo.listRecords(async ({ params }) => {
diff --git a/packages/pds/src/api/com/atproto/repo/putRecord.ts b/packages/pds/src/api/com/atproto/repo/putRecord.ts
index 5cc00dd12ee..d6d8f6019c8 100644
--- a/packages/pds/src/api/com/atproto/repo/putRecord.ts
+++ b/packages/pds/src/api/com/atproto/repo/putRecord.ts
@@ -1,10 +1,10 @@
+import { CID } from 'multiformats/cid'
 import { BlobRef } from '@atproto/lexicon'
 import { CommitData } from '@atproto/repo'
 import { AtUri } from '@atproto/syntax'
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
-import { CID } from 'multiformats/cid'
 import { ActorStoreTransactor } from '../../../../actor-store/actor-store-transactor'
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import { ids } from '../../../../lexicon/lexicons'
 import { Record as ProfileRecord } from '../../../../lexicon/types/app/bsky/actor/profile'
@@ -12,9 +12,9 @@ import {
   BadCommitSwapError,
   BadRecordSwapError,
   InvalidRecordError,
-  prepareCreate,
   PreparedCreate,
   PreparedUpdate,
+  prepareCreate,
   prepareUpdate,
 } from '../../../../repo'
 
diff --git a/packages/pds/src/api/com/atproto/repo/uploadBlob.ts b/packages/pds/src/api/com/atproto/repo/uploadBlob.ts
index e512d9a6e8a..6ba803b1aae 100644
--- a/packages/pds/src/api/com/atproto/repo/uploadBlob.ts
+++ b/packages/pds/src/api/com/atproto/repo/uploadBlob.ts
@@ -1,8 +1,8 @@
 import { DAY } from '@atproto/common'
 import { UpstreamTimeoutError } from '@atproto/xrpc-server'
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { BlobMetadata } from '../../../../actor-store/blob/transactor'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.repo.uploadBlob({
diff --git a/packages/pds/src/api/com/atproto/server/activateAccount.ts b/packages/pds/src/api/com/atproto/server/activateAccount.ts
index 5326a5936a0..cf5eba7b0b8 100644
--- a/packages/pds/src/api/com/atproto/server/activateAccount.ts
+++ b/packages/pds/src/api/com/atproto/server/activateAccount.ts
@@ -1,11 +1,10 @@
 import { CidSet } from '@atproto/repo'
 import { INVALID_HANDLE } from '@atproto/syntax'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import { assertValidDidDocumentForService } from './util'
 import { authPassthru } from '../../../proxy'
+import { assertValidDidDocumentForService } from './util'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.server.activateAccount({
diff --git a/packages/pds/src/api/com/atproto/server/checkAccountStatus.ts b/packages/pds/src/api/com/atproto/server/checkAccountStatus.ts
index 3c972c1980c..95da820a1bf 100644
--- a/packages/pds/src/api/com/atproto/server/checkAccountStatus.ts
+++ b/packages/pds/src/api/com/atproto/server/checkAccountStatus.ts
@@ -1,5 +1,5 @@
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { isValidDidDocForService } from './util'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/pds/src/api/com/atproto/server/confirmEmail.ts b/packages/pds/src/api/com/atproto/server/confirmEmail.ts
index d01891e2bc9..fd8d1ff7f2e 100644
--- a/packages/pds/src/api/com/atproto/server/confirmEmail.ts
+++ b/packages/pds/src/api/com/atproto/server/confirmEmail.ts
@@ -1,8 +1,6 @@
 import assert from 'node:assert'
-
 import { InvalidRequestError } from '@atproto/xrpc-server'
-
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import { ids } from '../../../../lexicon/lexicons'
 
diff --git a/packages/pds/src/api/com/atproto/server/createAccount.ts b/packages/pds/src/api/com/atproto/server/createAccount.ts
index f82f72343c7..090b847bbe0 100644
--- a/packages/pds/src/api/com/atproto/server/createAccount.ts
+++ b/packages/pds/src/api/com/atproto/server/createAccount.ts
@@ -1,20 +1,19 @@
-import { DidDocument, MINUTE, check } from '@atproto/common'
-import { AtprotoData, ensureAtpDocument } from '@atproto/identity'
-import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
-import { ExportableKeypair, Keypair, Secp256k1Keypair } from '@atproto/crypto'
 import * as plc from '@did-plc/lib'
 import { isEmailValid } from '@hapi/address'
 import { isDisposableEmail } from 'disposable-email-domains-js'
-
+import { DidDocument, MINUTE, check } from '@atproto/common'
+import { ExportableKeypair, Keypair, Secp256k1Keypair } from '@atproto/crypto'
+import { AtprotoData, ensureAtpDocument } from '@atproto/identity'
+import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
+import { AccountStatus } from '../../../../account-manager'
+import { AppContext } from '../../../../context'
 import {
   baseNormalizeAndValidate,
   normalizeAndValidateHandle,
 } from '../../../../handle'
 import { Server } from '../../../../lexicon'
 import { InputSchema as CreateAccountInput } from '../../../../lexicon/types/com/atproto/server/createAccount'
-import AppContext from '../../../../context'
 import { safeResolveDidDoc } from './util'
-import { AccountStatus } from '../../../../account-manager'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.server.createAccount({
diff --git a/packages/pds/src/api/com/atproto/server/createAppPassword.ts b/packages/pds/src/api/com/atproto/server/createAppPassword.ts
index 3dcd1c6e556..a1039e26419 100644
--- a/packages/pds/src/api/com/atproto/server/createAppPassword.ts
+++ b/packages/pds/src/api/com/atproto/server/createAppPassword.ts
@@ -1,6 +1,5 @@
 import assert from 'node:assert'
-
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import { ids } from '../../../../lexicon/lexicons'
 import { resultPassthru } from '../../../proxy'
diff --git a/packages/pds/src/api/com/atproto/server/createInviteCode.ts b/packages/pds/src/api/com/atproto/server/createInviteCode.ts
index 49fe2f6cd0b..25e0000462c 100644
--- a/packages/pds/src/api/com/atproto/server/createInviteCode.ts
+++ b/packages/pds/src/api/com/atproto/server/createInviteCode.ts
@@ -1,6 +1,6 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { genInvCode } from './util'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/pds/src/api/com/atproto/server/createInviteCodes.ts b/packages/pds/src/api/com/atproto/server/createInviteCodes.ts
index 8f15d55db0d..6bff2618664 100644
--- a/packages/pds/src/api/com/atproto/server/createInviteCodes.ts
+++ b/packages/pds/src/api/com/atproto/server/createInviteCodes.ts
@@ -1,8 +1,8 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
-import { genInvCodes } from './util'
 import { AccountCodes } from '../../../../lexicon/types/com/atproto/server/createInviteCodes'
+import { genInvCodes } from './util'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.server.createInviteCodes({
diff --git a/packages/pds/src/api/com/atproto/server/createSession.ts b/packages/pds/src/api/com/atproto/server/createSession.ts
index 3b15cde409f..36c269a3ab7 100644
--- a/packages/pds/src/api/com/atproto/server/createSession.ts
+++ b/packages/pds/src/api/com/atproto/server/createSession.ts
@@ -1,9 +1,8 @@
 import { DAY, MINUTE } from '@atproto/common'
 import { INVALID_HANDLE } from '@atproto/syntax'
 import { AuthRequiredError } from '@atproto/xrpc-server'
-
 import { formatAccountStatus } from '../../../../account-manager'
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import { authPassthru, resultPassthru } from '../../../proxy'
 import { didDocForSession } from './util'
diff --git a/packages/pds/src/api/com/atproto/server/deactivateAccount.ts b/packages/pds/src/api/com/atproto/server/deactivateAccount.ts
index 42b39b7ce84..ff21d6e772f 100644
--- a/packages/pds/src/api/com/atproto/server/deactivateAccount.ts
+++ b/packages/pds/src/api/com/atproto/server/deactivateAccount.ts
@@ -1,5 +1,5 @@
 import { AuthScope } from '../../../../auth-verifier'
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import { authPassthru } from '../../../proxy'
 
diff --git a/packages/pds/src/api/com/atproto/server/deleteAccount.ts b/packages/pds/src/api/com/atproto/server/deleteAccount.ts
index 3d896ccf087..6d7b8222e80 100644
--- a/packages/pds/src/api/com/atproto/server/deleteAccount.ts
+++ b/packages/pds/src/api/com/atproto/server/deleteAccount.ts
@@ -1,9 +1,9 @@
 import { MINUTE } from '@atproto/common'
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
+import { AccountStatus } from '../../../../account-manager'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { authPassthru } from '../../../proxy'
-import { AccountStatus } from '../../../../account-manager'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.server.deleteAccount({
diff --git a/packages/pds/src/api/com/atproto/server/deleteSession.ts b/packages/pds/src/api/com/atproto/server/deleteSession.ts
index 06626ac117a..de1811a06a0 100644
--- a/packages/pds/src/api/com/atproto/server/deleteSession.ts
+++ b/packages/pds/src/api/com/atproto/server/deleteSession.ts
@@ -1,4 +1,4 @@
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import { authPassthru } from '../../../proxy'
 
diff --git a/packages/pds/src/api/com/atproto/server/describeServer.ts b/packages/pds/src/api/com/atproto/server/describeServer.ts
index 7c895d243f6..9991381fb20 100644
--- a/packages/pds/src/api/com/atproto/server/describeServer.ts
+++ b/packages/pds/src/api/com/atproto/server/describeServer.ts
@@ -1,5 +1,5 @@
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.server.describeServer(() => {
diff --git a/packages/pds/src/api/com/atproto/server/getAccountInviteCodes.ts b/packages/pds/src/api/com/atproto/server/getAccountInviteCodes.ts
index 655921e9d3f..a1b38115d98 100644
--- a/packages/pds/src/api/com/atproto/server/getAccountInviteCodes.ts
+++ b/packages/pds/src/api/com/atproto/server/getAccountInviteCodes.ts
@@ -1,13 +1,11 @@
 import assert from 'node:assert'
-
 import { InvalidRequestError } from '@atproto/xrpc-server'
-
 import { CodeDetail } from '../../../../account-manager/helpers/invite'
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
+import { ids } from '../../../../lexicon/lexicons'
 import { resultPassthru } from '../../../proxy'
 import { genInvCodes } from './util'
-import { ids } from '../../../../lexicon/lexicons'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.server.getAccountInviteCodes({
diff --git a/packages/pds/src/api/com/atproto/server/getServiceAuth.ts b/packages/pds/src/api/com/atproto/server/getServiceAuth.ts
index 5f85ba57cb3..0dfeb59496b 100644
--- a/packages/pds/src/api/com/atproto/server/getServiceAuth.ts
+++ b/packages/pds/src/api/com/atproto/server/getServiceAuth.ts
@@ -1,10 +1,10 @@
-import { InvalidRequestError, createServiceJwt } from '@atproto/xrpc-server'
 import { HOUR, MINUTE } from '@atproto/common'
-import AppContext from '../../../../context'
-import { Server } from '../../../../lexicon'
-import { PRIVILEGED_METHODS, PROTECTED_METHODS } from '../../../../pipethrough'
+import { InvalidRequestError, createServiceJwt } from '@atproto/xrpc-server'
 import { AuthScope } from '../../../../auth-verifier'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
 import { ids } from '../../../../lexicon/lexicons'
+import { PRIVILEGED_METHODS, PROTECTED_METHODS } from '../../../../pipethrough'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.server.getServiceAuth({
diff --git a/packages/pds/src/api/com/atproto/server/getSession.ts b/packages/pds/src/api/com/atproto/server/getSession.ts
index 00ec86811c2..c210cd72948 100644
--- a/packages/pds/src/api/com/atproto/server/getSession.ts
+++ b/packages/pds/src/api/com/atproto/server/getSession.ts
@@ -1,12 +1,11 @@
-import { InvalidRequestError } from '@atproto/xrpc-server'
 import { INVALID_HANDLE } from '@atproto/syntax'
-
+import { InvalidRequestError } from '@atproto/xrpc-server'
 import { formatAccountStatus } from '../../../../account-manager'
-import AppContext from '../../../../context'
+import { AuthScope } from '../../../../auth-verifier'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import { authPassthru, resultPassthru } from '../../../proxy'
 import { didDocForSession } from './util'
-import { AuthScope } from '../../../../auth-verifier'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.server.getSession({
diff --git a/packages/pds/src/api/com/atproto/server/index.ts b/packages/pds/src/api/com/atproto/server/index.ts
index 7208f106b17..8aba753f63a 100644
--- a/packages/pds/src/api/com/atproto/server/index.ts
+++ b/packages/pds/src/api/com/atproto/server/index.ts
@@ -1,39 +1,30 @@
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-
-import describeServer from './describeServer'
-
+import activateAccount from './activateAccount'
+import checkAccountStatus from './checkAccountStatus'
+import confirmEmail from './confirmEmail'
 import createAccount from './createAccount'
+import createAppPassword from './createAppPassword'
 import createInviteCode from './createInviteCode'
 import createInviteCodes from './createInviteCodes'
-import getAccountInviteCodes from './getAccountInviteCodes'
-import reserveSigningKey from './reserveSigningKey'
-
-import requestDelete from './requestAccountDelete'
-import deleteAccount from './deleteAccount'
-
-import requestPasswordReset from './requestPasswordReset'
-import resetPassword from './resetPassword'
-
-import requestEmailConfirmation from './requestEmailConfirmation'
-import confirmEmail from './confirmEmail'
-
-import requestEmailUpdate from './requestEmailUpdate'
-import updateEmail from './updateEmail'
-
 import createSession from './createSession'
+import deactivateAccount from './deactivateAccount'
+import deleteAccount from './deleteAccount'
 import deleteSession from './deleteSession'
+import describeServer from './describeServer'
+import getAccountInviteCodes from './getAccountInviteCodes'
+import getServiceAuth from './getServiceAuth'
 import getSession from './getSession'
-import refreshSession from './refreshSession'
-
-import createAppPassword from './createAppPassword'
 import listAppPasswords from './listAppPasswords'
+import refreshSession from './refreshSession'
+import requestDelete from './requestAccountDelete'
+import requestEmailConfirmation from './requestEmailConfirmation'
+import requestEmailUpdate from './requestEmailUpdate'
+import requestPasswordReset from './requestPasswordReset'
+import reserveSigningKey from './reserveSigningKey'
+import resetPassword from './resetPassword'
 import revokeAppPassword from './revokeAppPassword'
-
-import getServiceAuth from './getServiceAuth'
-import checkAccountStatus from './checkAccountStatus'
-import activateAccount from './activateAccount'
-import deactivateAccount from './deactivateAccount'
+import updateEmail from './updateEmail'
 
 export default function (server: Server, ctx: AppContext) {
   describeServer(server, ctx)
diff --git a/packages/pds/src/api/com/atproto/server/listAppPasswords.ts b/packages/pds/src/api/com/atproto/server/listAppPasswords.ts
index 7414e3452c9..abb78c74e4c 100644
--- a/packages/pds/src/api/com/atproto/server/listAppPasswords.ts
+++ b/packages/pds/src/api/com/atproto/server/listAppPasswords.ts
@@ -1,6 +1,5 @@
 import assert from 'node:assert'
-
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import { ids } from '../../../../lexicon/lexicons'
 import { resultPassthru } from '../../../proxy'
diff --git a/packages/pds/src/api/com/atproto/server/refreshSession.ts b/packages/pds/src/api/com/atproto/server/refreshSession.ts
index f3be56b9610..d653c3a6c01 100644
--- a/packages/pds/src/api/com/atproto/server/refreshSession.ts
+++ b/packages/pds/src/api/com/atproto/server/refreshSession.ts
@@ -1,12 +1,11 @@
 import { INVALID_HANDLE } from '@atproto/syntax'
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
-
 import { formatAccountStatus } from '../../../../account-manager'
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { softDeleted } from '../../../../db/util'
 import { Server } from '../../../../lexicon'
-import { didDocForSession } from './util'
 import { authPassthru, resultPassthru } from '../../../proxy'
+import { didDocForSession } from './util'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.server.refreshSession({
diff --git a/packages/pds/src/api/com/atproto/server/requestAccountDelete.ts b/packages/pds/src/api/com/atproto/server/requestAccountDelete.ts
index 3068ff4519a..35ec2ae5840 100644
--- a/packages/pds/src/api/com/atproto/server/requestAccountDelete.ts
+++ b/packages/pds/src/api/com/atproto/server/requestAccountDelete.ts
@@ -1,9 +1,7 @@
 import assert from 'node:assert'
-
 import { DAY, HOUR } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import { ids } from '../../../../lexicon/lexicons'
 
diff --git a/packages/pds/src/api/com/atproto/server/requestEmailConfirmation.ts b/packages/pds/src/api/com/atproto/server/requestEmailConfirmation.ts
index 6e1724f4155..411a2653665 100644
--- a/packages/pds/src/api/com/atproto/server/requestEmailConfirmation.ts
+++ b/packages/pds/src/api/com/atproto/server/requestEmailConfirmation.ts
@@ -1,9 +1,7 @@
 import assert from 'node:assert'
-
 import { DAY, HOUR } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import { ids } from '../../../../lexicon/lexicons'
 
diff --git a/packages/pds/src/api/com/atproto/server/requestEmailUpdate.ts b/packages/pds/src/api/com/atproto/server/requestEmailUpdate.ts
index fa7b0f22fcc..a7b9bcfe470 100644
--- a/packages/pds/src/api/com/atproto/server/requestEmailUpdate.ts
+++ b/packages/pds/src/api/com/atproto/server/requestEmailUpdate.ts
@@ -1,12 +1,10 @@
 import assert from 'node:assert'
-
 import { DAY, HOUR } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import { resultPassthru } from '../../../proxy'
 import { ids } from '../../../../lexicon/lexicons'
+import { resultPassthru } from '../../../proxy'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.server.requestEmailUpdate({
diff --git a/packages/pds/src/api/com/atproto/server/requestPasswordReset.ts b/packages/pds/src/api/com/atproto/server/requestPasswordReset.ts
index 1ad117ad6c3..15f0bcd7c75 100644
--- a/packages/pds/src/api/com/atproto/server/requestPasswordReset.ts
+++ b/packages/pds/src/api/com/atproto/server/requestPasswordReset.ts
@@ -1,6 +1,6 @@
 import { DAY, HOUR } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import { authPassthru } from '../../../proxy'
 
diff --git a/packages/pds/src/api/com/atproto/server/reserveSigningKey.ts b/packages/pds/src/api/com/atproto/server/reserveSigningKey.ts
index 177bf4aff78..9326e76f316 100644
--- a/packages/pds/src/api/com/atproto/server/reserveSigningKey.ts
+++ b/packages/pds/src/api/com/atproto/server/reserveSigningKey.ts
@@ -1,5 +1,5 @@
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.server.reserveSigningKey({
diff --git a/packages/pds/src/api/com/atproto/server/resetPassword.ts b/packages/pds/src/api/com/atproto/server/resetPassword.ts
index 6194680e683..dc6ef8cb445 100644
--- a/packages/pds/src/api/com/atproto/server/resetPassword.ts
+++ b/packages/pds/src/api/com/atproto/server/resetPassword.ts
@@ -1,6 +1,6 @@
-import AppContext from '../../../../context'
-import { Server } from '../../../../lexicon'
 import { MINUTE } from '@atproto/common'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
 import { authPassthru } from '../../../proxy'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/pds/src/api/com/atproto/server/revokeAppPassword.ts b/packages/pds/src/api/com/atproto/server/revokeAppPassword.ts
index 2d1c9f2e8ac..c4bca296784 100644
--- a/packages/pds/src/api/com/atproto/server/revokeAppPassword.ts
+++ b/packages/pds/src/api/com/atproto/server/revokeAppPassword.ts
@@ -1,6 +1,5 @@
 import assert from 'node:assert'
-
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import { ids } from '../../../../lexicon/lexicons'
 
diff --git a/packages/pds/src/api/com/atproto/server/updateEmail.ts b/packages/pds/src/api/com/atproto/server/updateEmail.ts
index 838089f17ac..b7e2ab2cb45 100644
--- a/packages/pds/src/api/com/atproto/server/updateEmail.ts
+++ b/packages/pds/src/api/com/atproto/server/updateEmail.ts
@@ -1,11 +1,9 @@
 import assert from 'node:assert'
-
-import { InvalidRequestError } from '@atproto/xrpc-server'
 import { isEmailValid } from '@hapi/address'
 import { isDisposableEmail } from 'disposable-email-domains-js'
-
+import { InvalidRequestError } from '@atproto/xrpc-server'
 import { UserAlreadyExistsError } from '../../../../account-manager/helpers/account'
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import { ids } from '../../../../lexicon/lexicons'
 
diff --git a/packages/pds/src/api/com/atproto/server/util.ts b/packages/pds/src/api/com/atproto/server/util.ts
index e6f52b8df59..9aeb435ea4b 100644
--- a/packages/pds/src/api/com/atproto/server/util.ts
+++ b/packages/pds/src/api/com/atproto/server/util.ts
@@ -1,10 +1,10 @@
+import { getPdsEndpoint, getSigningDidKey } from '@atproto/common'
 import * as crypto from '@atproto/crypto'
 import { DidDocument } from '@atproto/identity'
+import { InvalidRequestError } from '@atproto/xrpc-server'
 import { ServerConfig } from '../../../../config'
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { httpLogger } from '../../../../logger'
-import { InvalidRequestError } from '@atproto/xrpc-server'
-import { getPdsEndpoint, getSigningDidKey } from '@atproto/common'
 
 // generate an invite code preceded by the hostname
 // with '.'s replaced by '-'s so it is not mistakable for a link
diff --git a/packages/pds/src/api/com/atproto/sync/deprecated/getCheckout.ts b/packages/pds/src/api/com/atproto/sync/deprecated/getCheckout.ts
index 0abc358534c..5a6a7ac8ffe 100644
--- a/packages/pds/src/api/com/atproto/sync/deprecated/getCheckout.ts
+++ b/packages/pds/src/api/com/atproto/sync/deprecated/getCheckout.ts
@@ -1,5 +1,5 @@
+import { AppContext } from '../../../../../context'
 import { Server } from '../../../../../lexicon'
-import AppContext from '../../../../../context'
 import { getCarStream } from '../getRepo'
 import { assertRepoAvailability } from '../util'
 
diff --git a/packages/pds/src/api/com/atproto/sync/deprecated/getHead.ts b/packages/pds/src/api/com/atproto/sync/deprecated/getHead.ts
index 9c74e33315d..f5aa2a96983 100644
--- a/packages/pds/src/api/com/atproto/sync/deprecated/getHead.ts
+++ b/packages/pds/src/api/com/atproto/sync/deprecated/getHead.ts
@@ -1,6 +1,6 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../../context'
 import { Server } from '../../../../../lexicon'
-import AppContext from '../../../../../context'
 import { assertRepoAvailability } from '../util'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/pds/src/api/com/atproto/sync/getBlob.ts b/packages/pds/src/api/com/atproto/sync/getBlob.ts
index 8125656072e..e45d6885a11 100644
--- a/packages/pds/src/api/com/atproto/sync/getBlob.ts
+++ b/packages/pds/src/api/com/atproto/sync/getBlob.ts
@@ -1,10 +1,10 @@
 import { CID } from 'multiformats/cid'
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
-import { InvalidRequestError } from '@atproto/xrpc-server'
 import { BlobNotFoundError } from '@atproto/repo'
-import { assertRepoAvailability } from './util'
+import { InvalidRequestError } from '@atproto/xrpc-server'
 import { AuthScope } from '../../../../auth-verifier'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
+import { assertRepoAvailability } from './util'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.sync.getBlob({
diff --git a/packages/pds/src/api/com/atproto/sync/getBlocks.ts b/packages/pds/src/api/com/atproto/sync/getBlocks.ts
index dfd10b61dc5..de6e5faee70 100644
--- a/packages/pds/src/api/com/atproto/sync/getBlocks.ts
+++ b/packages/pds/src/api/com/atproto/sync/getBlocks.ts
@@ -1,9 +1,9 @@
 import { CID } from 'multiformats/cid'
-import { InvalidRequestError } from '@atproto/xrpc-server'
 import { byteIterableToStream } from '@atproto/common'
 import { blocksToCarStream } from '@atproto/repo'
+import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { assertRepoAvailability } from './util'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/pds/src/api/com/atproto/sync/getLatestCommit.ts b/packages/pds/src/api/com/atproto/sync/getLatestCommit.ts
index 65043612c1e..cedf408bfd5 100644
--- a/packages/pds/src/api/com/atproto/sync/getLatestCommit.ts
+++ b/packages/pds/src/api/com/atproto/sync/getLatestCommit.ts
@@ -1,6 +1,6 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { assertRepoAvailability } from './util'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/pds/src/api/com/atproto/sync/getRecord.ts b/packages/pds/src/api/com/atproto/sync/getRecord.ts
index 9cc4adfecd5..3952ea3ff17 100644
--- a/packages/pds/src/api/com/atproto/sync/getRecord.ts
+++ b/packages/pds/src/api/com/atproto/sync/getRecord.ts
@@ -1,11 +1,11 @@
-import stream from 'stream'
+import stream from 'node:stream'
 import { CID } from 'multiformats/cid'
+import { byteIterableToStream } from '@atproto/common'
 import * as repo from '@atproto/repo'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
-import { byteIterableToStream } from '@atproto/common'
 import { SqlRepoReader } from '../../../../actor-store/repo/sql-repo-reader'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
 import { assertRepoAvailability } from './util'
 
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/pds/src/api/com/atproto/sync/getRepo.ts b/packages/pds/src/api/com/atproto/sync/getRepo.ts
index 3282220fda0..b20714f2482 100644
--- a/packages/pds/src/api/com/atproto/sync/getRepo.ts
+++ b/packages/pds/src/api/com/atproto/sync/getRepo.ts
@@ -1,13 +1,13 @@
-import stream from 'stream'
+import stream from 'node:stream'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import {
   RepoRootNotFoundError,
   SqlRepoReader,
 } from '../../../../actor-store/repo/sql-repo-reader'
-import { assertRepoAvailability } from './util'
 import { AuthScope } from '../../../../auth-verifier'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
+import { assertRepoAvailability } from './util'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.sync.getRepo({
diff --git a/packages/pds/src/api/com/atproto/sync/getRepoStatus.ts b/packages/pds/src/api/com/atproto/sync/getRepoStatus.ts
index d4bb30c7cfc..725e2895e29 100644
--- a/packages/pds/src/api/com/atproto/sync/getRepoStatus.ts
+++ b/packages/pds/src/api/com/atproto/sync/getRepoStatus.ts
@@ -1,7 +1,7 @@
+import { formatAccountStatus } from '../../../../account-manager'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { assertRepoAvailability } from './util'
-import { formatAccountStatus } from '../../../../account-manager'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.sync.getRepoStatus({
diff --git a/packages/pds/src/api/com/atproto/sync/index.ts b/packages/pds/src/api/com/atproto/sync/index.ts
index 128a2a94b49..2bb032cfaad 100644
--- a/packages/pds/src/api/com/atproto/sync/index.ts
+++ b/packages/pds/src/api/com/atproto/sync/index.ts
@@ -1,16 +1,16 @@
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
+import getCheckout from './deprecated/getCheckout'
+import getHead from './deprecated/getHead'
 import getBlob from './getBlob'
 import getBlocks from './getBlocks'
 import getLatestCommit from './getLatestCommit'
-import getRepoStatus from './getRepoStatus'
 import getRecord from './getRecord'
 import getRepo from './getRepo'
-import subscribeRepos from './subscribeRepos'
+import getRepoStatus from './getRepoStatus'
 import listBlobs from './listBlobs'
 import listRepos from './listRepos'
-import getCheckout from './deprecated/getCheckout'
-import getHead from './deprecated/getHead'
+import subscribeRepos from './subscribeRepos'
 
 export default function (server: Server, ctx: AppContext) {
   getBlob(server, ctx)
diff --git a/packages/pds/src/api/com/atproto/sync/listBlobs.ts b/packages/pds/src/api/com/atproto/sync/listBlobs.ts
index 97d04644d11..af87b8c6f2f 100644
--- a/packages/pds/src/api/com/atproto/sync/listBlobs.ts
+++ b/packages/pds/src/api/com/atproto/sync/listBlobs.ts
@@ -1,7 +1,7 @@
+import { AuthScope } from '../../../../auth-verifier'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { assertRepoAvailability } from './util'
-import { AuthScope } from '../../../../auth-verifier'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.sync.listBlobs({
diff --git a/packages/pds/src/api/com/atproto/sync/listRepos.ts b/packages/pds/src/api/com/atproto/sync/listRepos.ts
index 38f676e4f60..a3a3a7657eb 100644
--- a/packages/pds/src/api/com/atproto/sync/listRepos.ts
+++ b/packages/pds/src/api/com/atproto/sync/listRepos.ts
@@ -1,8 +1,8 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
-import { Cursor, GenericKeyset, paginate } from '../../../../db/pagination'
 import { formatAccountStatus } from '../../../../account-manager'
+import { AppContext } from '../../../../context'
+import { Cursor, GenericKeyset, paginate } from '../../../../db/pagination'
+import { Server } from '../../../../lexicon'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.sync.listRepos(async ({ params }) => {
diff --git a/packages/pds/src/api/com/atproto/sync/subscribeRepos.ts b/packages/pds/src/api/com/atproto/sync/subscribeRepos.ts
index 15d7d9dd37d..cfa5e75ecc4 100644
--- a/packages/pds/src/api/com/atproto/sync/subscribeRepos.ts
+++ b/packages/pds/src/api/com/atproto/sync/subscribeRepos.ts
@@ -1,8 +1,8 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
-import Outbox from '../../../../sequencer/outbox'
 import { httpLogger } from '../../../../logger'
+import { Outbox } from '../../../../sequencer/outbox'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.sync.subscribeRepos(async function* ({ params, signal }) {
diff --git a/packages/pds/src/api/com/atproto/sync/util.ts b/packages/pds/src/api/com/atproto/sync/util.ts
index 626d3699b2c..da670fedd77 100644
--- a/packages/pds/src/api/com/atproto/sync/util.ts
+++ b/packages/pds/src/api/com/atproto/sync/util.ts
@@ -1,6 +1,6 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { ActorAccount } from '../../../../account-manager/helpers/account'
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 
 export const assertRepoAvailability = async (
   ctx: AppContext,
diff --git a/packages/pds/src/api/com/atproto/temp/checkSignupQueue.ts b/packages/pds/src/api/com/atproto/temp/checkSignupQueue.ts
index 9f9dc32f25e..d7384a38ea2 100644
--- a/packages/pds/src/api/com/atproto/temp/checkSignupQueue.ts
+++ b/packages/pds/src/api/com/atproto/temp/checkSignupQueue.ts
@@ -1,7 +1,7 @@
+import { AuthScope } from '../../../../auth-verifier'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { authPassthru, resultPassthru } from '../../../proxy'
-import { AuthScope } from '../../../../auth-verifier'
 
 // THIS IS A TEMPORARY UNSPECCED ROUTE
 export default function (server: Server, ctx: AppContext) {
diff --git a/packages/pds/src/api/com/atproto/temp/index.ts b/packages/pds/src/api/com/atproto/temp/index.ts
index a39aef98fe9..43620a3b59c 100644
--- a/packages/pds/src/api/com/atproto/temp/index.ts
+++ b/packages/pds/src/api/com/atproto/temp/index.ts
@@ -1,4 +1,4 @@
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import checkSignupQueue from './checkSignupQueue'
 
diff --git a/packages/pds/src/api/index.ts b/packages/pds/src/api/index.ts
index f0d08cd559e..395eca76e8e 100644
--- a/packages/pds/src/api/index.ts
+++ b/packages/pds/src/api/index.ts
@@ -1,7 +1,7 @@
+import { AppContext } from '../context'
 import { Server } from '../lexicon'
-import comAtproto from './com/atproto'
 import appBsky from './app/bsky'
-import AppContext from '../context'
+import comAtproto from './com/atproto'
 
 export default function (server: Server, ctx: AppContext) {
   comAtproto(server, ctx)
diff --git a/packages/pds/src/api/proxy.ts b/packages/pds/src/api/proxy.ts
index fc51115e711..1813eff06fa 100644
--- a/packages/pds/src/api/proxy.ts
+++ b/packages/pds/src/api/proxy.ts
@@ -1,6 +1,6 @@
+import { IncomingMessage } from 'node:http'
 import { Headers } from '@atproto/xrpc'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { IncomingMessage } from 'node:http'
 
 export const resultPassthru = <T>(result: { headers: Headers; data: T }) => {
   // @TODO pass through any headers that we always want to forward along
diff --git a/packages/pds/src/auth-routes.ts b/packages/pds/src/auth-routes.ts
index 059c61b126d..d952f336d36 100644
--- a/packages/pds/src/auth-routes.ts
+++ b/packages/pds/src/auth-routes.ts
@@ -1,7 +1,6 @@
-import { oauthProtectedResourceMetadataSchema } from '@atproto/oauth-provider'
 import { Router } from 'express'
-
-import AppContext from './context'
+import { oauthProtectedResourceMetadataSchema } from '@atproto/oauth-provider'
+import { AppContext } from './context'
 
 export const createRouter = ({ authProvider, cfg }: AppContext): Router => {
   const router = Router()
diff --git a/packages/pds/src/auth-verifier.ts b/packages/pds/src/auth-verifier.ts
index 53c93c8abd8..7db671421ba 100644
--- a/packages/pds/src/auth-verifier.ts
+++ b/packages/pds/src/auth-verifier.ts
@@ -1,6 +1,7 @@
 import { KeyObject, createPublicKey, createSecretKey } from 'node:crypto'
 import { IncomingMessage, ServerResponse } from 'node:http'
-
+import * as jose from 'jose'
+import KeyEncoder from 'key-encoder'
 import { getVerificationMaterial } from '@atproto/common'
 import { IdResolver, getDidKeyFromMultibase } from '@atproto/identity'
 import {
@@ -18,8 +19,6 @@ import {
   parseReqNsid,
   verifyJwt as verifyServiceJwt,
 } from '@atproto/xrpc-server'
-import * as jose from 'jose'
-import KeyEncoder from 'key-encoder'
 import { AccountManager } from './account-manager'
 import { softDeleted } from './db'
 
diff --git a/packages/pds/src/basic-routes.ts b/packages/pds/src/basic-routes.ts
index 429674e9a94..3b9454c0b8d 100644
--- a/packages/pds/src/basic-routes.ts
+++ b/packages/pds/src/basic-routes.ts
@@ -1,9 +1,9 @@
-import express from 'express'
+import { Router } from 'express'
 import { sql } from 'kysely'
-import AppContext from './context'
+import { AppContext } from './context'
 
-export const createRouter = (ctx: AppContext): express.Router => {
-  const router = express.Router()
+export const createRouter = (ctx: AppContext): Router => {
+  const router = Router()
 
   router.get('/', function (req, res) {
     res.type('text/plain')
diff --git a/packages/pds/src/config/config.ts b/packages/pds/src/config/config.ts
index 263d987577e..0c5f5d9e998 100644
--- a/packages/pds/src/config/config.ts
+++ b/packages/pds/src/config/config.ts
@@ -1,5 +1,5 @@
-import path from 'node:path'
 import assert from 'node:assert'
+import path from 'node:path'
 import { DAY, HOUR, SECOND } from '@atproto/common'
 import { Customization } from '@atproto/oauth-provider'
 import { ServerEnvironment } from './env'
diff --git a/packages/pds/src/config/env.ts b/packages/pds/src/config/env.ts
index 1d26d4c06a6..22d2a393495 100644
--- a/packages/pds/src/config/env.ts
+++ b/packages/pds/src/config/env.ts
@@ -1,4 +1,4 @@
-import { envInt, envStr, envBool, envList } from '@atproto/common'
+import { envBool, envInt, envList, envStr } from '@atproto/common'
 
 export const readEnv = (): ServerEnvironment => {
   return {
diff --git a/packages/pds/src/context.ts b/packages/pds/src/context.ts
index 7b43401776a..3ed0b84a31d 100644
--- a/packages/pds/src/context.ts
+++ b/packages/pds/src/context.ts
@@ -1,19 +1,12 @@
 import assert from 'node:assert'
-import * as undici from 'undici'
-import * as nodemailer from 'nodemailer'
-import { Redis } from 'ioredis'
 import * as plc from '@did-plc/lib'
-import {
-  Fetch,
-  isUnicastIp,
-  loggedFetch,
-  safeFetchWrap,
-  unicastLookup,
-} from '@atproto-labs/fetch-node'
-import * as crypto from '@atproto/crypto'
-import { IdResolver } from '@atproto/identity'
+import { Redis } from 'ioredis'
+import * as nodemailer from 'nodemailer'
+import * as undici from 'undici'
 import { AtpAgent } from '@atproto/api'
 import { KmsKeypair, S3BlobStore } from '@atproto/aws'
+import * as crypto from '@atproto/crypto'
+import { IdResolver } from '@atproto/identity'
 import { JoseKey, OAuthVerifier } from '@atproto/oauth-provider'
 import { BlobStore } from '@atproto/repo'
 import {
@@ -23,28 +16,34 @@ import {
   createServiceAuthHeaders,
   createServiceJwt,
 } from '@atproto/xrpc-server'
-
-import { ServerConfig, ServerSecrets } from './config'
-import { PdsOAuthProvider } from './oauth/provider'
+import {
+  Fetch,
+  isUnicastIp,
+  loggedFetch,
+  safeFetchWrap,
+  unicastLookup,
+} from '@atproto-labs/fetch-node'
+import { AccountManager } from './account-manager'
+import { ActorStore } from './actor-store/actor-store'
 import {
   AuthVerifier,
   createPublicKeyObject,
   createSecretKeyObject,
 } from './auth-verifier'
-import { fetchLogger } from './logger'
-import { ServerMailer } from './mailer'
-import { ModerationMailer } from './mailer/moderation'
-import { AccountManager } from './account-manager'
-import { Sequencer } from './sequencer'
 import { BackgroundQueue } from './background'
-import { DidSqliteCache } from './did-cache'
+import { BskyAppView } from './bsky-app-view'
+import { ServerConfig, ServerSecrets } from './config'
 import { Crawlers } from './crawlers'
+import { DidSqliteCache } from './did-cache'
 import { DiskBlobStore } from './disk-blobstore'
-import { getRedisClient } from './redis'
-import { ActorStore } from './actor-store/actor-store'
-import { LocalViewer, LocalViewerCreator } from './read-after-write/viewer'
-import { BskyAppView } from './bsky-app-view'
 import { ImageUrlBuilder } from './image/image-url-builder'
+import { fetchLogger } from './logger'
+import { ServerMailer } from './mailer'
+import { ModerationMailer } from './mailer/moderation'
+import { PdsOAuthProvider } from './oauth/provider'
+import { LocalViewer, LocalViewerCreator } from './read-after-write/viewer'
+import { getRedisClient } from './redis'
+import { Sequencer } from './sequencer'
 
 export type AppContextOptions = {
   actorStore: ActorStore
@@ -416,5 +415,3 @@ export class AppContext {
     })
   }
 }
-
-export default AppContext
diff --git a/packages/pds/src/crawlers.ts b/packages/pds/src/crawlers.ts
index 5ca20b10621..1cea689521e 100644
--- a/packages/pds/src/crawlers.ts
+++ b/packages/pds/src/crawlers.ts
@@ -1,7 +1,7 @@
 import { AtpAgent } from '@atproto/api'
-import { crawlerLogger as log } from './logger'
 import { MINUTE } from '@atproto/common'
 import { BackgroundQueue } from './background'
+import { crawlerLogger as log } from './logger'
 
 const NOTIFY_THRESHOLD = 20 * MINUTE
 
diff --git a/packages/pds/src/db/db.ts b/packages/pds/src/db/db.ts
index f0a2c670547..469b820eed7 100644
--- a/packages/pds/src/db/db.ts
+++ b/packages/pds/src/db/db.ts
@@ -1,16 +1,16 @@
-import assert from 'assert'
+import assert from 'node:assert'
+import SqliteDB from 'better-sqlite3'
 import {
-  sql,
   Kysely,
-  SqliteDialect,
   KyselyPlugin,
   PluginTransformQueryArgs,
   PluginTransformResultArgs,
-  RootOperationNode,
   QueryResult,
+  RootOperationNode,
+  SqliteDialect,
   UnknownRow,
+  sql,
 } from 'kysely'
-import SqliteDB from 'better-sqlite3'
 import { dbLogger } from '../logger'
 import { retrySqlite } from './util'
 
diff --git a/packages/pds/src/db/migrator.ts b/packages/pds/src/db/migrator.ts
index 844a80c204d..d7557211995 100644
--- a/packages/pds/src/db/migrator.ts
+++ b/packages/pds/src/db/migrator.ts
@@ -1,4 +1,4 @@
-import { Kysely, Migrator as KyselyMigrator, Migration } from 'kysely'
+import { Kysely, Migration, Migrator as KyselyMigrator } from 'kysely'
 
 export class Migrator<T> extends KyselyMigrator {
   constructor(
diff --git a/packages/pds/src/db/tables/moderation.ts b/packages/pds/src/db/tables/moderation.ts
index e8707d4cff4..bc67eda3e25 100644
--- a/packages/pds/src/db/tables/moderation.ts
+++ b/packages/pds/src/db/tables/moderation.ts
@@ -1,10 +1,10 @@
 import { Generated } from 'kysely'
 import {
-  REASONOTHER,
-  REASONSPAM,
   REASONMISLEADING,
+  REASONOTHER,
   REASONRUDE,
   REASONSEXUAL,
+  REASONSPAM,
   REASONVIOLATION,
 } from '../../lexicon/types/com/atproto/moderation/defs'
 
diff --git a/packages/pds/src/db/util.ts b/packages/pds/src/db/util.ts
index 519921c70dc..79d7e05f247 100644
--- a/packages/pds/src/db/util.ts
+++ b/packages/pds/src/db/util.ts
@@ -1,4 +1,3 @@
-import { retry } from '@atproto/common'
 import {
   DummyDriver,
   DynamicModule,
@@ -6,11 +5,12 @@ import {
   RawBuilder,
   ReferenceExpression,
   SelectQueryBuilder,
-  sql,
   SqliteAdapter,
   SqliteIntrospector,
   SqliteQueryCompiler,
+  sql,
 } from 'kysely'
+import { retry } from '@atproto/common'
 
 // Applies to repo_root or record table
 export const notSoftDeletedClause = (alias: DbRef) => {
diff --git a/packages/pds/src/did-cache/db/index.ts b/packages/pds/src/did-cache/db/index.ts
index 25031c63431..8b656c053e8 100644
--- a/packages/pds/src/did-cache/db/index.ts
+++ b/packages/pds/src/did-cache/db/index.ts
@@ -1,6 +1,6 @@
 import { Database, Migrator } from '../../db'
-import { DidCacheSchema } from './schema'
 import migrations from './migrations'
+import { DidCacheSchema } from './schema'
 
 export * from './schema'
 
diff --git a/packages/pds/src/did-cache/index.ts b/packages/pds/src/did-cache/index.ts
index 526283090c5..254ea92cb9d 100644
--- a/packages/pds/src/did-cache/index.ts
+++ b/packages/pds/src/did-cache/index.ts
@@ -2,7 +2,7 @@ import PQueue from 'p-queue'
 import { CacheResult, DidCache, DidDocument } from '@atproto/identity'
 import { excluded } from '../db/util'
 import { didCacheLogger } from '../logger'
-import { DidCacheDb, getMigrator, getDb } from './db'
+import { DidCacheDb, getDb, getMigrator } from './db'
 
 export class DidSqliteCache implements DidCache {
   db: DidCacheDb
diff --git a/packages/pds/src/disk-blobstore.ts b/packages/pds/src/disk-blobstore.ts
index c5578d5d569..c3374703a33 100644
--- a/packages/pds/src/disk-blobstore.ts
+++ b/packages/pds/src/disk-blobstore.ts
@@ -1,12 +1,12 @@
-import fs from 'fs/promises'
-import fsSync from 'fs'
-import stream from 'stream'
-import path from 'path'
+import fsSync from 'node:fs'
+import fs from 'node:fs/promises'
+import path from 'node:path'
+import stream from 'node:stream'
 import { CID } from 'multiformats/cid'
-import { BlobNotFoundError, BlobStore } from '@atproto/repo'
+import { fileExists, isErrnoException, rmIfExists } from '@atproto/common'
 import { randomStr } from '@atproto/crypto'
+import { BlobNotFoundError, BlobStore } from '@atproto/repo'
 import { httpLogger as log } from './logger'
-import { isErrnoException, fileExists, rmIfExists } from '@atproto/common'
 
 export class DiskBlobStore implements BlobStore {
   constructor(
@@ -153,5 +153,3 @@ const translateErr = (err: unknown): BlobNotFoundError | unknown => {
   }
   return err
 }
-
-export default DiskBlobStore
diff --git a/packages/pds/src/error.ts b/packages/pds/src/error.ts
index b1033b26b3c..3b34abf2662 100644
--- a/packages/pds/src/error.ts
+++ b/packages/pds/src/error.ts
@@ -1,7 +1,7 @@
-import { XRPCError } from '@atproto/xrpc-server'
 import { ErrorRequestHandler } from 'express'
-import { httpLogger as log } from './logger'
 import { OAuthError } from '@atproto/oauth-provider'
+import { XRPCError } from '@atproto/xrpc-server'
+import { httpLogger as log } from './logger'
 
 export const handler: ErrorRequestHandler = (err, _req, res, next) => {
   log.error(err, 'unexpected internal server error')
diff --git a/packages/pds/src/handle/index.ts b/packages/pds/src/handle/index.ts
index 7f9859c8715..0be31a5f6a3 100644
--- a/packages/pds/src/handle/index.ts
+++ b/packages/pds/src/handle/index.ts
@@ -1,8 +1,8 @@
 import * as ident from '@atproto/syntax'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { reservedSubdomains } from './reserved'
+import { AppContext } from '../context'
 import { hasExplicitSlur } from './explicit-slurs'
-import AppContext from '../context'
+import { reservedSubdomains } from './reserved'
 
 export const normalizeAndValidateHandle = async (opts: {
   ctx: AppContext
diff --git a/packages/pds/src/image/index.ts b/packages/pds/src/image/index.ts
index 4f70321f0ed..fdc603ec860 100644
--- a/packages/pds/src/image/index.ts
+++ b/packages/pds/src/image/index.ts
@@ -1,5 +1,5 @@
-import { Readable } from 'stream'
-import { pipeline } from 'stream/promises'
+import { Readable } from 'node:stream'
+import { pipeline } from 'node:stream/promises'
 import sharp from 'sharp'
 import { errHasMsg } from '@atproto/common'
 
diff --git a/packages/pds/src/index.ts b/packages/pds/src/index.ts
index 1508fe9b504..6cef35eb512 100644
--- a/packages/pds/src/index.ts
+++ b/packages/pds/src/index.ts
@@ -4,27 +4,29 @@
 // leave at top of file before importing Routes
 import 'express-async-errors'
 
-import express from 'express'
+import events from 'node:events'
+import http from 'node:http'
+import { PlcClientError } from '@did-plc/lib'
 import cors from 'cors'
-import http from 'http'
-import events from 'events'
-import { Options as XrpcServerOptions } from '@atproto/xrpc-server'
+import express from 'express'
+import { HttpTerminator, createHttpTerminator } from 'http-terminator'
 import { DAY, HOUR, MINUTE, SECOND } from '@atproto/common'
-import { XRPCError, ResponseType } from '@atproto/xrpc-server'
-import { PlcClientError } from '@did-plc/lib'
-
+import {
+  Options as XrpcServerOptions,
+  ResponseType,
+  XRPCError,
+} from '@atproto/xrpc-server'
 import API from './api'
 import * as authRoutes from './auth-routes'
 import * as basicRoutes from './basic-routes'
-import * as wellKnown from './well-known'
-import * as error from './error'
-import { loggerMiddleware } from './logger'
 import { ServerConfig, ServerSecrets } from './config'
+import { AppContext, AppContextOptions } from './context'
+import * as error from './error'
 import { createServer } from './lexicon'
-import { createHttpTerminator, HttpTerminator } from 'http-terminator'
-import AppContext, { AppContextOptions } from './context'
-import compression from './util/compression'
+import { loggerMiddleware } from './logger'
 import { proxyHandler } from './pipethrough'
+import compression from './util/compression'
+import * as wellKnown from './well-known'
 
 export * from './config'
 export { Database } from './db'
diff --git a/packages/pds/src/logger.ts b/packages/pds/src/logger.ts
index a2b691b5a52..4e0e68bd449 100644
--- a/packages/pds/src/logger.ts
+++ b/packages/pds/src/logger.ts
@@ -1,6 +1,6 @@
 import { type IncomingMessage } from 'node:http'
 import { stdSerializers } from 'pino'
-import pinoHttp from 'pino-http'
+import { pinoHttp } from 'pino-http'
 import { obfuscateHeaders, subsystemLogger } from '@atproto/common'
 
 export const dbLogger = subsystemLogger('pds:db')
diff --git a/packages/pds/src/mailer/index.ts b/packages/pds/src/mailer/index.ts
index f5b92586bd3..8ae5780eb1d 100644
--- a/packages/pds/src/mailer/index.ts
+++ b/packages/pds/src/mailer/index.ts
@@ -1,10 +1,9 @@
 import { Transporter } from 'nodemailer'
-import { htmlToText } from 'nodemailer-html-to-text'
 import Mail from 'nodemailer/lib/mailer'
 import SMTPTransport from 'nodemailer/lib/smtp-transport'
+import { htmlToText } from 'nodemailer-html-to-text'
 import { ServerConfig } from '../config'
 import { mailerLogger } from '../logger'
-
 import * as templates from './templates'
 
 export class ServerMailer {
diff --git a/packages/pds/src/mailer/moderation.ts b/packages/pds/src/mailer/moderation.ts
index 7ddd737169d..37440dfe1ba 100644
--- a/packages/pds/src/mailer/moderation.ts
+++ b/packages/pds/src/mailer/moderation.ts
@@ -1,7 +1,7 @@
 import { Transporter } from 'nodemailer'
 import Mail from 'nodemailer/lib/mailer'
-import { htmlToText } from 'nodemailer-html-to-text'
 import SMTPTransport from 'nodemailer/lib/smtp-transport'
+import { htmlToText } from 'nodemailer-html-to-text'
 import { ServerConfig } from '../config'
 import { mailerLogger } from '../logger'
 
diff --git a/packages/pds/src/mailer/templates/confirm-email.d.ts b/packages/pds/src/mailer/templates/confirm-email.d.ts
index 3e2726d64ac..86d4a722184 100644
--- a/packages/pds/src/mailer/templates/confirm-email.d.ts
+++ b/packages/pds/src/mailer/templates/confirm-email.d.ts
@@ -1,4 +1,4 @@
-import { TemplateDelegate } from "handlebars";
+import { TemplateDelegate } from 'handlebars'
 
 declare const template: TemplateDelegate<{ token: string }>
 export default template
diff --git a/packages/pds/src/mailer/templates/delete-account.d.ts b/packages/pds/src/mailer/templates/delete-account.d.ts
index 3e2726d64ac..86d4a722184 100644
--- a/packages/pds/src/mailer/templates/delete-account.d.ts
+++ b/packages/pds/src/mailer/templates/delete-account.d.ts
@@ -1,4 +1,4 @@
-import { TemplateDelegate } from "handlebars";
+import { TemplateDelegate } from 'handlebars'
 
 declare const template: TemplateDelegate<{ token: string }>
 export default template
diff --git a/packages/pds/src/mailer/templates/plc-operation.d.ts b/packages/pds/src/mailer/templates/plc-operation.d.ts
index 3e2726d64ac..86d4a722184 100644
--- a/packages/pds/src/mailer/templates/plc-operation.d.ts
+++ b/packages/pds/src/mailer/templates/plc-operation.d.ts
@@ -1,4 +1,4 @@
-import { TemplateDelegate } from "handlebars";
+import { TemplateDelegate } from 'handlebars'
 
 declare const template: TemplateDelegate<{ token: string }>
 export default template
diff --git a/packages/pds/src/mailer/templates/reset-password.d.ts b/packages/pds/src/mailer/templates/reset-password.d.ts
index fddf84b980f..e6e5c02a016 100644
--- a/packages/pds/src/mailer/templates/reset-password.d.ts
+++ b/packages/pds/src/mailer/templates/reset-password.d.ts
@@ -1,4 +1,4 @@
-import { TemplateDelegate } from "handlebars";
+import { TemplateDelegate } from 'handlebars'
 
 declare const template: TemplateDelegate<{ token: string; handle: string }>
 export default template
diff --git a/packages/pds/src/mailer/templates/update-email.d.ts b/packages/pds/src/mailer/templates/update-email.d.ts
index 3e2726d64ac..86d4a722184 100644
--- a/packages/pds/src/mailer/templates/update-email.d.ts
+++ b/packages/pds/src/mailer/templates/update-email.d.ts
@@ -1,4 +1,4 @@
-import { TemplateDelegate } from "handlebars";
+import { TemplateDelegate } from 'handlebars'
 
 declare const template: TemplateDelegate<{ token: string }>
 export default template
diff --git a/packages/pds/src/oauth/provider.ts b/packages/pds/src/oauth/provider.ts
index 534e5c34a24..e5cbccbe580 100644
--- a/packages/pds/src/oauth/provider.ts
+++ b/packages/pds/src/oauth/provider.ts
@@ -3,7 +3,6 @@ import {
   OAuthProvider,
   OAuthProviderOptions,
 } from '@atproto/oauth-provider'
-
 import { AccountManager } from '../account-manager/index'
 import { oauthLogger } from '../logger'
 
diff --git a/packages/pds/src/pipethrough.ts b/packages/pds/src/pipethrough.ts
index d45ce590c6c..a10133fee62 100644
--- a/packages/pds/src/pipethrough.ts
+++ b/packages/pds/src/pipethrough.ts
@@ -1,9 +1,7 @@
-import express from 'express'
 import { IncomingHttpHeaders, ServerResponse } from 'node:http'
 import { PassThrough, Readable } from 'node:stream'
+import express from 'express'
 import { Dispatcher } from 'undici'
-
-import { buildProxiedContentEncoding } from '@atproto-labs/xrpc-utils'
 import {
   decodeStream,
   getServiceEndpoint,
@@ -17,11 +15,11 @@ import {
   HandlerPipeThroughStream,
   InternalServerError,
   InvalidRequestError,
-  parseReqNsid,
   XRPCError as XRPCServerError,
+  parseReqNsid,
 } from '@atproto/xrpc-server'
-
-import AppContext from './context'
+import { buildProxiedContentEncoding } from '@atproto-labs/xrpc-utils'
+import { AppContext } from './context'
 import { ids } from './lexicon/lexicons'
 import { httpLogger } from './logger'
 
diff --git a/packages/pds/src/read-after-write/types.ts b/packages/pds/src/read-after-write/types.ts
index cfdd6ff7fe3..df492136666 100644
--- a/packages/pds/src/read-after-write/types.ts
+++ b/packages/pds/src/read-after-write/types.ts
@@ -1,8 +1,8 @@
-import { Headers } from '@atproto/xrpc'
-import { AtUri } from '@atproto/syntax'
 import { CID } from 'multiformats/cid'
-import { Record as PostRecord } from '../lexicon/types/app/bsky/feed/post'
+import { AtUri } from '@atproto/syntax'
+import { Headers } from '@atproto/xrpc'
 import { Record as ProfileRecord } from '../lexicon/types/app/bsky/actor/profile'
+import { Record as PostRecord } from '../lexicon/types/app/bsky/feed/post'
 import { LocalViewer } from './viewer'
 
 export type LocalRecords = {
diff --git a/packages/pds/src/read-after-write/util.ts b/packages/pds/src/read-after-write/util.ts
index 16ae22d0811..02336d1780a 100644
--- a/packages/pds/src/read-after-write/util.ts
+++ b/packages/pds/src/read-after-write/util.ts
@@ -1,3 +1,4 @@
+import express from 'express'
 import { jsonToLex } from '@atproto/lexicon'
 import { HeadersMap } from '@atproto/xrpc'
 import {
@@ -5,9 +6,7 @@ import {
   HandlerPipeThroughBuffer,
   parseReqNsid,
 } from '@atproto/xrpc-server'
-import express from 'express'
-
-import AppContext from '../context'
+import { AppContext } from '../context'
 import { lexicons } from '../lexicon/lexicons'
 import { readStickyLogger as log } from '../logger'
 import {
diff --git a/packages/pds/src/read-after-write/viewer.ts b/packages/pds/src/read-after-write/viewer.ts
index abfd56bacd5..9fc649a0c70 100644
--- a/packages/pds/src/read-after-write/viewer.ts
+++ b/packages/pds/src/read-after-write/viewer.ts
@@ -1,42 +1,42 @@
 import { AtUri, INVALID_HANDLE } from '@atproto/syntax'
 import { createServiceAuthHeaders } from '@atproto/xrpc-server'
-import { Record as PostRecord } from '../lexicon/types/app/bsky/feed/post'
-import { Record as ProfileRecord } from '../lexicon/types/app/bsky/actor/profile'
+import { AccountManager } from '../account-manager'
+import { ActorStoreReader } from '../actor-store/actor-store-reader'
+import { BskyAppView } from '../bsky-app-view'
+import { ImageUrlBuilder } from '../image/image-url-builder'
 import { ids } from '../lexicon/lexicons'
 import {
-  ProfileViewBasic,
   ProfileView,
+  ProfileViewBasic,
   ProfileViewDetailed,
 } from '../lexicon/types/app/bsky/actor/defs'
+import { Record as ProfileRecord } from '../lexicon/types/app/bsky/actor/profile'
 import {
-  FeedViewPost,
-  GeneratorView,
-  PostView,
-} from '../lexicon/types/app/bsky/feed/defs'
-import { ListView } from '../lexicon/types/app/bsky/graph/defs'
+  Main as EmbedExternal,
+  isMain as isEmbedExternal,
+} from '../lexicon/types/app/bsky/embed/external'
 import {
   Main as EmbedImages,
   isMain as isEmbedImages,
 } from '../lexicon/types/app/bsky/embed/images'
-import {
-  Main as EmbedExternal,
-  isMain as isEmbedExternal,
-} from '../lexicon/types/app/bsky/embed/external'
 import {
   Main as EmbedRecord,
-  isMain as isEmbedRecord,
   View as EmbedRecordView,
   ViewRecord,
+  isMain as isEmbedRecord,
 } from '../lexicon/types/app/bsky/embed/record'
 import {
   Main as EmbedRecordWithMedia,
   isMain as isEmbedRecordWithMedia,
 } from '../lexicon/types/app/bsky/embed/recordWithMedia'
-import { ActorStoreReader } from '../actor-store/actor-store-reader'
+import {
+  FeedViewPost,
+  GeneratorView,
+  PostView,
+} from '../lexicon/types/app/bsky/feed/defs'
+import { Record as PostRecord } from '../lexicon/types/app/bsky/feed/post'
+import { ListView } from '../lexicon/types/app/bsky/graph/defs'
 import { LocalRecords, RecordDescript } from './types'
-import { AccountManager } from '../account-manager'
-import { BskyAppView } from '../bsky-app-view'
-import { ImageUrlBuilder } from '../image/image-url-builder'
 
 type CommonSignedUris = 'avatar' | 'banner' | 'feed_thumbnail' | 'feed_fullsize'
 
diff --git a/packages/pds/src/redis.ts b/packages/pds/src/redis.ts
index 67528a11833..f6760ae316b 100644
--- a/packages/pds/src/redis.ts
+++ b/packages/pds/src/redis.ts
@@ -1,4 +1,4 @@
-import assert from 'assert'
+import assert from 'node:assert'
 import { Redis } from 'ioredis'
 import { redisLogger } from './logger'
 
diff --git a/packages/pds/src/repo/prepare.ts b/packages/pds/src/repo/prepare.ts
index bbe4f24d2e5..eb86f4e9537 100644
--- a/packages/pds/src/repo/prepare.ts
+++ b/packages/pds/src/repo/prepare.ts
@@ -1,9 +1,4 @@
 import { CID } from 'multiformats/cid'
-import {
-  AtUri,
-  ensureValidRecordKey,
-  ensureValidDatetime,
-} from '@atproto/syntax'
 import { TID, check, dataToCborBlock } from '@atproto/common'
 import {
   BlobRef,
@@ -15,30 +10,35 @@ import {
   untypedJsonBlobRef,
 } from '@atproto/lexicon'
 import {
-  cborToLex,
-  RecordDeleteOp,
   RecordCreateOp,
+  RecordDeleteOp,
   RecordUpdateOp,
   RecordWriteOp,
   WriteOpAction,
+  cborToLex,
 } from '@atproto/repo'
 import {
+  AtUri,
+  ensureValidDatetime,
+  ensureValidRecordKey,
+} from '@atproto/syntax'
+import { hasExplicitSlur } from '../handle/explicit-slurs'
+import * as lex from '../lexicon/lexicons'
+import { isRecord as isProfile } from '../lexicon/types/app/bsky/actor/profile'
+import { isRecord as isFeedGenerator } from '../lexicon/types/app/bsky/feed/generator'
+import { isRecord as isPost } from '../lexicon/types/app/bsky/feed/post'
+import { isRecord as isList } from '../lexicon/types/app/bsky/graph/list'
+import { isRecord as isStarterPack } from '../lexicon/types/app/bsky/graph/starterpack'
+import { isTag } from '../lexicon/types/app/bsky/richtext/facet'
+import {
+  InvalidRecordError,
+  PreparedBlobRef,
   PreparedCreate,
-  PreparedUpdate,
   PreparedDelete,
-  InvalidRecordError,
+  PreparedUpdate,
   PreparedWrite,
-  PreparedBlobRef,
   ValidationStatus,
 } from './types'
-import * as lex from '../lexicon/lexicons'
-import { isRecord as isFeedGenerator } from '../lexicon/types/app/bsky/feed/generator'
-import { isRecord as isStarterPack } from '../lexicon/types/app/bsky/graph/starterpack'
-import { isRecord as isPost } from '../lexicon/types/app/bsky/feed/post'
-import { isTag } from '../lexicon/types/app/bsky/richtext/facet'
-import { isRecord as isList } from '../lexicon/types/app/bsky/graph/list'
-import { isRecord as isProfile } from '../lexicon/types/app/bsky/actor/profile'
-import { hasExplicitSlur } from '../handle/explicit-slurs'
 
 export const assertValidRecordWithStatus = (
   record: Record<string, unknown>,
diff --git a/packages/pds/src/repo/types.ts b/packages/pds/src/repo/types.ts
index c0c8fd16555..41fbba73260 100644
--- a/packages/pds/src/repo/types.ts
+++ b/packages/pds/src/repo/types.ts
@@ -1,7 +1,7 @@
 import { CID } from 'multiformats/cid'
-import { AtUri } from '@atproto/syntax'
-import { WriteOpAction } from '@atproto/repo'
 import { RepoRecord } from '@atproto/lexicon'
+import { WriteOpAction } from '@atproto/repo'
+import { AtUri } from '@atproto/syntax'
 
 export type ValidationStatus = 'valid' | 'unknown' | undefined
 
diff --git a/packages/pds/src/scripts/rebuild-repo.ts b/packages/pds/src/scripts/rebuild-repo.ts
index 0a71b524aac..6be44546111 100644
--- a/packages/pds/src/scripts/rebuild-repo.ts
+++ b/packages/pds/src/scripts/rebuild-repo.ts
@@ -1,3 +1,4 @@
+import readline from 'node:readline/promises'
 import { TID } from '@atproto/common'
 import {
   BlockMap,
@@ -6,8 +7,7 @@ import {
   MemoryBlockstore,
   signCommit,
 } from '@atproto/repo'
-import readline from 'node:readline/promises'
-import AppContext from '../context'
+import { AppContext } from '../context'
 
 export const rebuildRepo = async (ctx: AppContext, args: string[]) => {
   const did = args[0]
diff --git a/packages/pds/src/sequencer/db/index.ts b/packages/pds/src/sequencer/db/index.ts
index 132e46f5edd..c630a62f31f 100644
--- a/packages/pds/src/sequencer/db/index.ts
+++ b/packages/pds/src/sequencer/db/index.ts
@@ -1,6 +1,6 @@
 import { Database, Migrator } from '../../db'
-import { SequencerDbSchema } from './schema'
 import migrations from './migrations'
+import { SequencerDbSchema } from './schema'
 
 export * from './schema'
 
diff --git a/packages/pds/src/sequencer/events.ts b/packages/pds/src/sequencer/events.ts
index 4d7de593038..c314c7b7e71 100644
--- a/packages/pds/src/sequencer/events.ts
+++ b/packages/pds/src/sequencer/events.ts
@@ -1,16 +1,16 @@
+import { CID } from 'multiformats/cid'
 import { z } from 'zod'
 import { cborEncode, schema } from '@atproto/common'
 import {
   BlockMap,
-  blocksToCarFile,
   CidSet,
   CommitData,
   WriteOpAction,
+  blocksToCarFile,
 } from '@atproto/repo'
+import { AccountStatus } from '../account-manager'
 import { PreparedWrite } from '../repo'
-import { CID } from 'multiformats/cid'
 import { RepoSeqInsert } from './db'
-import { AccountStatus } from '../account-manager'
 
 export const formatSeqCommit = async (
   did: string,
diff --git a/packages/pds/src/sequencer/outbox.ts b/packages/pds/src/sequencer/outbox.ts
index 56ccba45ae9..3d9cfd1e33f 100644
--- a/packages/pds/src/sequencer/outbox.ts
+++ b/packages/pds/src/sequencer/outbox.ts
@@ -1,6 +1,6 @@
 import { AsyncBuffer, AsyncBufferFullError } from '@atproto/common'
-import { Sequencer, SeqEvt } from '.'
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { SeqEvt, Sequencer } from '.'
 
 export type OutboxOpts = {
   maxBufferSize: number
@@ -121,5 +121,3 @@ export class Outbox {
     }
   }
 }
-
-export default Outbox
diff --git a/packages/pds/src/sequencer/sequencer.ts b/packages/pds/src/sequencer/sequencer.ts
index 680c8c2a5a5..0448dec111b 100644
--- a/packages/pds/src/sequencer/sequencer.ts
+++ b/packages/pds/src/sequencer/sequencer.ts
@@ -1,8 +1,18 @@
-import EventEmitter from 'events'
+import EventEmitter from 'node:events'
 import TypedEmitter from 'typed-emitter'
-import { seqLogger as log } from '../logger'
 import { SECOND, cborDecode, wait } from '@atproto/common'
 import { CommitData } from '@atproto/repo'
+import { AccountStatus } from '../account-manager/helpers/account'
+import { Crawlers } from '../crawlers'
+import { seqLogger as log } from '../logger'
+import { PreparedWrite } from '../repo'
+import {
+  RepoSeqEntry,
+  RepoSeqInsert,
+  SequencerDb,
+  getDb,
+  getMigrator,
+} from './db'
 import {
   AccountEvt,
   CommitEvt,
@@ -16,16 +26,6 @@ import {
   formatSeqIdentityEvt,
   formatSeqTombstone,
 } from './events'
-import {
-  SequencerDb,
-  getMigrator,
-  RepoSeqEntry,
-  RepoSeqInsert,
-  getDb,
-} from './db'
-import { PreparedWrite } from '../repo'
-import { Crawlers } from '../crawlers'
-import { AccountStatus } from '../account-manager/helpers/account'
 
 export * from './events'
 
diff --git a/packages/pds/src/util/compression.ts b/packages/pds/src/util/compression.ts
index f79a672f2f5..1d150f735dd 100644
--- a/packages/pds/src/util/compression.ts
+++ b/packages/pds/src/util/compression.ts
@@ -1,5 +1,5 @@
-import express from 'express'
 import compression from 'compression'
+import express from 'express'
 
 export default function () {
   return compression({
diff --git a/packages/pds/src/util/params.ts b/packages/pds/src/util/params.ts
index 016af53c0f1..a1009d016cd 100644
--- a/packages/pds/src/util/params.ts
+++ b/packages/pds/src/util/params.ts
@@ -1,5 +1,5 @@
-import { InvalidRequestError } from '@atproto/xrpc-server'
 import { CID } from 'multiformats/cid'
+import { InvalidRequestError } from '@atproto/xrpc-server'
 
 export const parseCidParam = (cid: string): CID => {
   try {
diff --git a/packages/pds/src/well-known.ts b/packages/pds/src/well-known.ts
index a2c0fe4a7b1..68285e1d236 100644
--- a/packages/pds/src/well-known.ts
+++ b/packages/pds/src/well-known.ts
@@ -1,8 +1,8 @@
-import express from 'express'
-import AppContext from './context'
+import { Router } from 'express'
+import { AppContext } from './context'
 
-export const createRouter = (ctx: AppContext): express.Router => {
-  const router = express.Router()
+export const createRouter = (ctx: AppContext): Router => {
+  const router = Router()
 
   router.get('/.well-known/atproto-did', async function (req, res) {
     const handle = req.hostname
diff --git a/packages/pds/tests/_util.ts b/packages/pds/tests/_util.ts
index a49c834c2b6..d3cd7b2c82a 100644
--- a/packages/pds/tests/_util.ts
+++ b/packages/pds/tests/_util.ts
@@ -1,11 +1,11 @@
-import { lexToJson } from '@atproto/lexicon'
-import { AtUri } from '@atproto/syntax'
-import { type Express } from 'express'
-import { CID } from 'multiformats/cid'
 import { Server } from 'node:http'
 import { AddressInfo } from 'node:net'
-import { FeedViewPost } from '../src/lexicon/types/app/bsky/feed/defs'
+import { type Express } from 'express'
+import { CID } from 'multiformats/cid'
 import { ToolsOzoneModerationDefs } from '@atproto/api'
+import { lexToJson } from '@atproto/lexicon'
+import { AtUri } from '@atproto/syntax'
+import { FeedViewPost } from '../src/lexicon/types/app/bsky/feed/defs'
 
 // Swap out identifiers and dates with stable
 // values for the purpose of snapshot testing
diff --git a/packages/pds/tests/account-deletion.test.ts b/packages/pds/tests/account-deletion.test.ts
index 1490eb04447..b2fe0a41143 100644
--- a/packages/pds/tests/account-deletion.test.ts
+++ b/packages/pds/tests/account-deletion.test.ts
@@ -1,21 +1,21 @@
-import { TestNetworkNoAppView, SeedClient } from '@atproto/dev-env'
-import { once, EventEmitter } from 'events'
+import { EventEmitter, once } from 'node:events'
 import { Selectable } from 'kysely'
 import Mail from 'nodemailer/lib/mailer'
 import { AtpAgent } from '@atproto/api'
-import basicSeed from './seeds/basic'
-import { ServerMailer } from '../src/mailer'
+import { fileExists } from '@atproto/common'
+import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 import { BlobNotFoundError } from '@atproto/repo'
+import { AppContext } from '../src'
 import {
-  RepoRoot,
   Account,
   AppPassword,
   EmailToken,
   RefreshToken,
+  RepoRoot,
 } from '../src/account-manager/db'
-import { fileExists } from '@atproto/common'
-import { AppContext } from '../src'
+import { ServerMailer } from '../src/mailer'
 import { RepoSeq } from '../src/sequencer/db'
+import basicSeed from './seeds/basic'
 
 describe('account deletion', () => {
   let network: TestNetworkNoAppView
diff --git a/packages/pds/tests/account-migration.test.ts b/packages/pds/tests/account-migration.test.ts
index 9cef00703d4..6400dcd643a 100644
--- a/packages/pds/tests/account-migration.test.ts
+++ b/packages/pds/tests/account-migration.test.ts
@@ -1,12 +1,12 @@
-import { AtpAgent, AtUri } from '@atproto/api'
+import assert from 'node:assert'
+import { AtUri, AtpAgent } from '@atproto/api'
 import {
-  mockNetworkUtilities,
   SeedClient,
   TestNetworkNoAppView,
   TestPds,
+  mockNetworkUtilities,
 } from '@atproto/dev-env'
 import { readCar } from '@atproto/repo'
-import assert from 'assert'
 import { ids } from '../src/lexicon/lexicons'
 
 describe('account migration', () => {
diff --git a/packages/pds/tests/account.test.ts b/packages/pds/tests/account.test.ts
index 20731122024..e932266a44a 100644
--- a/packages/pds/tests/account.test.ts
+++ b/packages/pds/tests/account.test.ts
@@ -1,9 +1,9 @@
+import { EventEmitter, once } from 'node:events'
+import Mail from 'nodemailer/lib/mailer'
 import { AtpAgent, ComAtprotoServerResetPassword } from '@atproto/api'
 import * as crypto from '@atproto/crypto'
 import { TestNetworkNoAppView } from '@atproto/dev-env'
 import { IdResolver } from '@atproto/identity'
-import { EventEmitter, once } from 'events'
-import Mail from 'nodemailer/lib/mailer'
 import { AppContext } from '../src'
 import { ServerMailer } from '../src/mailer'
 
diff --git a/packages/pds/tests/app-passwords.test.ts b/packages/pds/tests/app-passwords.test.ts
index 35bae7528c1..7368007f7ec 100644
--- a/packages/pds/tests/app-passwords.test.ts
+++ b/packages/pds/tests/app-passwords.test.ts
@@ -1,6 +1,6 @@
+import * as jose from 'jose'
 import { AtpAgent } from '@atproto/api'
 import { TestNetworkNoAppView } from '@atproto/dev-env'
-import * as jose from 'jose'
 
 describe('app_passwords', () => {
   let network: TestNetworkNoAppView
diff --git a/packages/pds/tests/blob-deletes.test.ts b/packages/pds/tests/blob-deletes.test.ts
index 6b0412b0051..dfb20c5f693 100644
--- a/packages/pds/tests/blob-deletes.test.ts
+++ b/packages/pds/tests/blob-deletes.test.ts
@@ -1,7 +1,7 @@
-import { TestNetworkNoAppView, SeedClient } from '@atproto/dev-env'
 import { AtpAgent, BlobRef } from '@atproto/api'
-import { ids } from '../src/lexicon/lexicons'
+import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 import { AppContext } from '../src'
+import { ids } from '../src/lexicon/lexicons'
 
 describe('blob deletes', () => {
   let network: TestNetworkNoAppView
diff --git a/packages/pds/tests/create-post.test.ts b/packages/pds/tests/create-post.test.ts
index 742fe2bb841..f1120d7fb38 100644
--- a/packages/pds/tests/create-post.test.ts
+++ b/packages/pds/tests/create-post.test.ts
@@ -1,11 +1,11 @@
-import { TestNetworkNoAppView, SeedClient } from '@atproto/dev-env'
 import {
   AppBskyFeedPost,
-  AtUri,
-  RichText,
   AppBskyRichtextFacet,
+  AtUri,
   AtpAgent,
+  RichText,
 } from '@atproto/api'
+import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 import basicSeed from './seeds/basic'
 
 describe('pds posts record creation', () => {
diff --git a/packages/pds/tests/crud.test.ts b/packages/pds/tests/crud.test.ts
index 61273410054..e0509ebcf7f 100644
--- a/packages/pds/tests/crud.test.ts
+++ b/packages/pds/tests/crud.test.ts
@@ -1,15 +1,15 @@
 import assert from 'node:assert'
 import fs from 'node:fs/promises'
-import { AtUri } from '@atproto/syntax'
 import { AtpAgent } from '@atproto/api'
-import { BlobRef } from '@atproto/lexicon'
+import { TID, cidForCbor, ui8ToArrayBuffer } from '@atproto/common'
 import { TestNetworkNoAppView } from '@atproto/dev-env'
-import { cidForCbor, TID, ui8ToArrayBuffer } from '@atproto/common'
+import { BlobRef } from '@atproto/lexicon'
 import { BlobNotFoundError } from '@atproto/repo'
+import { AtUri } from '@atproto/syntax'
+import { AppContext } from '../src/context'
+import { ids, lexicons } from '../src/lexicon/lexicons'
 import * as Post from '../src/lexicon/types/app/bsky/feed/post'
 import { forSnapshot, paginateAll } from './_util'
-import AppContext from '../src/context'
-import { ids, lexicons } from '../src/lexicon/lexicons'
 
 describe('crud operations', () => {
   let network: TestNetworkNoAppView
diff --git a/packages/pds/tests/email-confirmation.test.ts b/packages/pds/tests/email-confirmation.test.ts
index 2e7472d07de..9f2e3ab0ca6 100644
--- a/packages/pds/tests/email-confirmation.test.ts
+++ b/packages/pds/tests/email-confirmation.test.ts
@@ -1,13 +1,13 @@
-import { once, EventEmitter } from 'events'
+import { EventEmitter, once } from 'node:events'
 import Mail from 'nodemailer/lib/mailer'
-import { AtpAgent } from '@atproto/api'
-import { TestNetworkNoAppView, SeedClient } from '@atproto/dev-env'
-import userSeed from './seeds/users'
-import { ServerMailer } from '../src/mailer'
 import {
+  AtpAgent,
   ComAtprotoServerConfirmEmail,
   ComAtprotoServerUpdateEmail,
 } from '@atproto/api'
+import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
+import { ServerMailer } from '../src/mailer'
+import userSeed from './seeds/users'
 
 describe('email confirmation', () => {
   let network: TestNetworkNoAppView
diff --git a/packages/pds/tests/entryway.test.ts b/packages/pds/tests/entryway.test.ts
index 30c5c3769c1..c3d59aef339 100644
--- a/packages/pds/tests/entryway.test.ts
+++ b/packages/pds/tests/entryway.test.ts
@@ -1,15 +1,15 @@
+import assert from 'node:assert'
 import * as os from 'node:os'
 import * as path from 'node:path'
-import assert from 'node:assert'
-import { decodeJwt } from 'jose'
 import * as plcLib from '@did-plc/lib'
-import { parseReqNsid } from '@atproto/xrpc-server'
+import getPort from 'get-port'
+import { decodeJwt } from 'jose'
+import * as ui8 from 'uint8arrays'
 import { AtpAgent } from '@atproto/api'
 import { Secp256k1Keypair, randomStr } from '@atproto/crypto'
 import { SeedClient, TestPds, TestPlc, mockResolvers } from '@atproto/dev-env'
 import * as pdsEntryway from '@atproto/pds-entryway'
-import * as ui8 from 'uint8arrays'
-import getPort from 'get-port'
+import { parseReqNsid } from '@atproto/xrpc-server'
 
 describe('entryway', () => {
   let plc: TestPlc
diff --git a/packages/pds/tests/file-uploads.test.ts b/packages/pds/tests/file-uploads.test.ts
index 4173e3395f0..b3cbd26d2fd 100644
--- a/packages/pds/tests/file-uploads.test.ts
+++ b/packages/pds/tests/file-uploads.test.ts
@@ -1,14 +1,14 @@
-import fs from 'fs/promises'
-import { gzipSync } from 'zlib'
-import { AtpAgent } from '@atproto/api'
-import { AppContext } from '../src'
-import DiskBlobStore from '../src/disk-blobstore'
+import fs from 'node:fs/promises'
+import { gzipSync } from 'node:zlib'
 import * as uint8arrays from 'uint8arrays'
+import { AtpAgent } from '@atproto/api'
 import { randomBytes } from '@atproto/crypto'
-import { BlobRef } from '@atproto/lexicon'
 import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
-import { users } from './seeds/users'
+import { BlobRef } from '@atproto/lexicon'
+import { AppContext } from '../src'
 import { ActorDb } from '../src/actor-store/db'
+import { DiskBlobStore } from '../src/disk-blobstore'
+import { users } from './seeds/users'
 
 describe('file uploads', () => {
   let network: TestNetworkNoAppView
diff --git a/packages/pds/tests/handles.test.ts b/packages/pds/tests/handles.test.ts
index 50c4ba942fa..7cb436866e0 100644
--- a/packages/pds/tests/handles.test.ts
+++ b/packages/pds/tests/handles.test.ts
@@ -1,14 +1,14 @@
-import { TestNetworkNoAppView, SeedClient } from '@atproto/dev-env'
 import { AtpAgent } from '@atproto/api'
+import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 import { IdResolver } from '@atproto/identity'
-import basicSeed from './seeds/basic'
 import { AppContext } from '../src'
+import basicSeed from './seeds/basic'
 
 // outside of suite so they can be used in mock
 let alice: string
 let bob: string
 
-jest.mock('dns/promises', () => {
+jest.mock('node:dns/promises', () => {
   return {
     resolveTxt: (domain: string) => {
       if (domain === '_atproto.alice.external') {
diff --git a/packages/pds/tests/invites-admin.test.ts b/packages/pds/tests/invites-admin.test.ts
index 7ffe1d3dd7e..990e8aeedb3 100644
--- a/packages/pds/tests/invites-admin.test.ts
+++ b/packages/pds/tests/invites-admin.test.ts
@@ -1,6 +1,6 @@
-import { TestNetworkNoAppView, SeedClient } from '@atproto/dev-env'
 import { AtpAgent } from '@atproto/api'
 import { randomStr } from '@atproto/crypto'
+import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 
 describe('pds admin invite views', () => {
   let network: TestNetworkNoAppView
diff --git a/packages/pds/tests/moderation.test.ts b/packages/pds/tests/moderation.test.ts
index 2eeff465a55..9adda3f4a99 100644
--- a/packages/pds/tests/moderation.test.ts
+++ b/packages/pds/tests/moderation.test.ts
@@ -1,12 +1,12 @@
 import { AtpAgent } from '@atproto/api'
-import { TestNetworkNoAppView, ImageRef, SeedClient } from '@atproto/dev-env'
+import { ImageRef, SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 import { BlobNotFoundError } from '@atproto/repo'
-import basicSeed from './seeds/basic'
 import {
   RepoBlobRef,
   RepoRef,
 } from '../src/lexicon/types/com/atproto/admin/defs'
 import { Main as StrongRef } from '../src/lexicon/types/com/atproto/repo/strongRef'
+import basicSeed from './seeds/basic'
 
 describe('moderation', () => {
   let network: TestNetworkNoAppView
diff --git a/packages/pds/tests/moderator-auth.test.ts b/packages/pds/tests/moderator-auth.test.ts
index 3330ba28f81..a4cb7e60c2e 100644
--- a/packages/pds/tests/moderator-auth.test.ts
+++ b/packages/pds/tests/moderator-auth.test.ts
@@ -1,11 +1,11 @@
+import * as plc from '@did-plc/lib'
 import { AtpAgent } from '@atproto/api'
-import { TestNetworkNoAppView, SeedClient } from '@atproto/dev-env'
 import { Keypair, Secp256k1Keypair } from '@atproto/crypto'
+import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 import { createServiceAuthHeaders } from '@atproto/xrpc-server'
-import * as plc from '@did-plc/lib'
-import usersSeed from './seeds/users'
-import { RepoRef } from '../src/lexicon/types/com/atproto/admin/defs'
 import { ids } from '../src/lexicon/lexicons'
+import { RepoRef } from '../src/lexicon/types/com/atproto/admin/defs'
+import usersSeed from './seeds/users'
 
 describe('moderator auth', () => {
   let network: TestNetworkNoAppView
diff --git a/packages/pds/tests/oauth.test.ts b/packages/pds/tests/oauth.test.ts
index 3087a6f5265..088773d75aa 100644
--- a/packages/pds/tests/oauth.test.ts
+++ b/packages/pds/tests/oauth.test.ts
@@ -1,11 +1,11 @@
 import assert from 'node:assert'
+import { once } from 'node:events'
+import { Server, createServer } from 'node:http'
+import { AddressInfo } from 'node:net'
+import { Browser, Page, launch } from 'puppeteer'
 import { TestNetworkNoAppView } from '@atproto/dev-env'
 // @ts-expect-error (json file)
 import files from '@atproto/oauth-client-browser-example'
-import { Browser, launch, Page } from 'puppeteer'
-import { once } from 'node:events'
-import { createServer, Server } from 'node:http'
-import { AddressInfo } from 'node:net'
 
 const getVisibleElement = async (page: Page, selector: string) => {
   const elementHandle = await page.waitForSelector(selector)
diff --git a/packages/pds/tests/plc-operations.test.ts b/packages/pds/tests/plc-operations.test.ts
index 8c982fae41a..1e00c851d0b 100644
--- a/packages/pds/tests/plc-operations.test.ts
+++ b/packages/pds/tests/plc-operations.test.ts
@@ -1,13 +1,13 @@
+import assert from 'node:assert'
+import { once } from 'node:events'
+import { EventEmitter } from 'node:stream'
+import * as plc from '@did-plc/lib'
+import Mail from 'nodemailer/lib/mailer'
 import { AtpAgent } from '@atproto/api'
+import { check } from '@atproto/common'
 import { Secp256k1Keypair } from '@atproto/crypto'
 import { SeedClient, TestNetworkNoAppView, basicSeed } from '@atproto/dev-env'
-import * as plc from '@did-plc/lib'
-import assert from 'assert'
-import { once } from 'events'
-import Mail from 'nodemailer/lib/mailer'
-import { EventEmitter } from 'stream'
 import { AppContext } from '../src'
-import { check } from '@atproto/common'
 
 describe('plc operations', () => {
   let network: TestNetworkNoAppView
diff --git a/packages/pds/tests/preferences.test.ts b/packages/pds/tests/preferences.test.ts
index 93abdb61bba..eedd3fe1e7d 100644
--- a/packages/pds/tests/preferences.test.ts
+++ b/packages/pds/tests/preferences.test.ts
@@ -1,7 +1,7 @@
 import { AtpAgent } from '@atproto/api'
-import { TestNetworkNoAppView, SeedClient } from '@atproto/dev-env'
-import usersSeed from './seeds/users'
+import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 import { AuthScope } from '../dist/auth-verifier'
+import usersSeed from './seeds/users'
 
 describe('user preferences', () => {
   let network: TestNetworkNoAppView
diff --git a/packages/pds/tests/proxied/admin.test.ts b/packages/pds/tests/proxied/admin.test.ts
index d9871ea73a3..0a725025e12 100644
--- a/packages/pds/tests/proxied/admin.test.ts
+++ b/packages/pds/tests/proxied/admin.test.ts
@@ -1,7 +1,7 @@
 import { AtpAgent } from '@atproto/api'
-import { TestNetwork, SeedClient } from '@atproto/dev-env'
-import basicSeed from '../seeds/basic'
+import { SeedClient, TestNetwork } from '@atproto/dev-env'
 import { forSnapshot } from '../_util'
+import basicSeed from '../seeds/basic'
 
 describe('proxies admin requests', () => {
   let network: TestNetwork
diff --git a/packages/pds/tests/proxied/feedgen.test.ts b/packages/pds/tests/proxied/feedgen.test.ts
index 52831edab40..d78d71b5250 100644
--- a/packages/pds/tests/proxied/feedgen.test.ts
+++ b/packages/pds/tests/proxied/feedgen.test.ts
@@ -1,8 +1,8 @@
-import { AtpAgent, AtUri } from '@atproto/api'
-import { TestNetwork, SeedClient } from '@atproto/dev-env'
-import basicSeed from '../seeds/basic'
-import { forSnapshot } from '../_util'
+import { AtUri, AtpAgent } from '@atproto/api'
+import { SeedClient, TestNetwork } from '@atproto/dev-env'
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { forSnapshot } from '../_util'
+import basicSeed from '../seeds/basic'
 
 describe('feedgen proxy view', () => {
   let network: TestNetwork
diff --git a/packages/pds/tests/proxied/notif.test.ts b/packages/pds/tests/proxied/notif.test.ts
index 1d244be81bd..48b2924d360 100644
--- a/packages/pds/tests/proxied/notif.test.ts
+++ b/packages/pds/tests/proxied/notif.test.ts
@@ -1,12 +1,12 @@
-import { once } from 'events'
-import http from 'http'
-import { AddressInfo } from 'net'
+import { once } from 'node:events'
+import http from 'node:http'
+import { AddressInfo } from 'node:net'
 import express from 'express'
 import { AtpAgent } from '@atproto/api'
-import { TestNetworkNoAppView, SeedClient } from '@atproto/dev-env'
+import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 import { verifyJwt } from '@atproto/xrpc-server'
-import usersSeed from '../seeds/users'
 import { createServer } from '../../src/lexicon'
+import usersSeed from '../seeds/users'
 
 describe('notif service proxy', () => {
   let network: TestNetworkNoAppView
diff --git a/packages/pds/tests/proxied/procedures.test.ts b/packages/pds/tests/proxied/procedures.test.ts
index 3cc84e3f3d2..fa96e93f9de 100644
--- a/packages/pds/tests/proxied/procedures.test.ts
+++ b/packages/pds/tests/proxied/procedures.test.ts
@@ -1,5 +1,5 @@
 import { AtpAgent } from '@atproto/api'
-import { TestNetwork, SeedClient } from '@atproto/dev-env'
+import { SeedClient, TestNetwork } from '@atproto/dev-env'
 import basicSeed from '../seeds/basic'
 
 describe('proxies appview procedures', () => {
diff --git a/packages/pds/tests/proxied/proxy-catchall.test.ts b/packages/pds/tests/proxied/proxy-catchall.test.ts
index 7ed68d1ae30..18d78198cc6 100644
--- a/packages/pds/tests/proxied/proxy-catchall.test.ts
+++ b/packages/pds/tests/proxied/proxy-catchall.test.ts
@@ -1,13 +1,13 @@
-import AtpAgent from '@atproto/api'
-import { Keypair } from '@atproto/crypto'
-import { TestNetworkNoAppView } from '@atproto/dev-env'
-import { LexiconDoc } from '@atproto/lexicon'
-import * as plc from '@did-plc/lib'
-import express from 'express'
 import { once } from 'node:events'
 import http from 'node:http'
 import { AddressInfo } from 'node:net'
 import { setTimeout as sleep } from 'node:timers/promises'
+import * as plc from '@did-plc/lib'
+import express from 'express'
+import AtpAgent from '@atproto/api'
+import { Keypair } from '@atproto/crypto'
+import { TestNetworkNoAppView } from '@atproto/dev-env'
+import { LexiconDoc } from '@atproto/lexicon'
 
 const lexicons = [
   {
diff --git a/packages/pds/tests/proxied/proxy-header.test.ts b/packages/pds/tests/proxied/proxy-header.test.ts
index 131d4a28aee..350113c96ac 100644
--- a/packages/pds/tests/proxied/proxy-header.test.ts
+++ b/packages/pds/tests/proxied/proxy-header.test.ts
@@ -1,12 +1,12 @@
-import { Keypair } from '@atproto/crypto'
-import { SeedClient, TestNetworkNoAppView, usersSeed } from '@atproto/dev-env'
-import { verifyJwt } from '@atproto/xrpc-server'
-import * as plc from '@did-plc/lib'
-import express from 'express'
 import assert from 'node:assert'
 import { once } from 'node:events'
 import http from 'node:http'
 import { AddressInfo } from 'node:net'
+import * as plc from '@did-plc/lib'
+import express from 'express'
+import { Keypair } from '@atproto/crypto'
+import { SeedClient, TestNetworkNoAppView, usersSeed } from '@atproto/dev-env'
+import { verifyJwt } from '@atproto/xrpc-server'
 import { parseProxyHeader } from '../../src/pipethrough'
 
 describe('proxy header', () => {
diff --git a/packages/pds/tests/proxied/read-after-write.test.ts b/packages/pds/tests/proxied/read-after-write.test.ts
index 72aa7f59035..f344d85f443 100644
--- a/packages/pds/tests/proxied/read-after-write.test.ts
+++ b/packages/pds/tests/proxied/read-after-write.test.ts
@@ -1,13 +1,13 @@
-import util from 'node:util'
 import assert from 'node:assert'
-import { AtpAgent } from '@atproto/api'
+import util from 'node:util'
 import { request } from 'undici'
-import { TestNetwork, SeedClient, RecordRef } from '@atproto/dev-env'
-import basicSeed from '../seeds/basic'
-import { ThreadViewPost } from '../../src/lexicon/types/app/bsky/feed/defs'
-import { View as RecordEmbedView } from '../../src/lexicon/types/app/bsky/embed/record'
+import { AtpAgent } from '@atproto/api'
+import { RecordRef, SeedClient, TestNetwork } from '@atproto/dev-env'
 import { View as ExternalEmbedView } from '../../src/lexicon/types/app/bsky/embed/external'
 import { View as ImagesEmbedView } from '../../src/lexicon/types/app/bsky/embed/images'
+import { View as RecordEmbedView } from '../../src/lexicon/types/app/bsky/embed/record'
+import { ThreadViewPost } from '../../src/lexicon/types/app/bsky/feed/defs'
+import basicSeed from '../seeds/basic'
 
 describe('proxy read after write', () => {
   let network: TestNetwork
diff --git a/packages/pds/tests/proxied/views.test.ts b/packages/pds/tests/proxied/views.test.ts
index 01b097e8b3f..eb69405c0ef 100644
--- a/packages/pds/tests/proxied/views.test.ts
+++ b/packages/pds/tests/proxied/views.test.ts
@@ -1,7 +1,7 @@
-import { AtpAgent, AtUri } from '@atproto/api'
-import { TestNetwork, SeedClient } from '@atproto/dev-env'
-import basicSeed from '../seeds/basic'
+import { AtUri, AtpAgent } from '@atproto/api'
+import { SeedClient, TestNetwork } from '@atproto/dev-env'
 import { forSnapshot } from '../_util'
+import basicSeed from '../seeds/basic'
 
 describe('proxies view requests', () => {
   let network: TestNetwork
diff --git a/packages/pds/tests/races.test.ts b/packages/pds/tests/races.test.ts
index f8bc141218f..4b0aac6b888 100644
--- a/packages/pds/tests/races.test.ts
+++ b/packages/pds/tests/races.test.ts
@@ -1,10 +1,10 @@
 import { AtpAgent } from '@atproto/api'
 import { wait } from '@atproto/common'
+import { Keypair } from '@atproto/crypto'
 import { TestNetworkNoAppView } from '@atproto/dev-env'
 import { readCarWithRoot, verifyRepo } from '@atproto/repo'
-import AppContext from '../src/context'
+import { AppContext } from '../src/context'
 import { PreparedCreate, prepareCreate } from '../src/repo'
-import { Keypair } from '@atproto/crypto'
 
 describe('races', () => {
   let network: TestNetworkNoAppView
diff --git a/packages/pds/tests/rate-limits.test.ts b/packages/pds/tests/rate-limits.test.ts
index 3e8703126f3..f9587a1fec0 100644
--- a/packages/pds/tests/rate-limits.test.ts
+++ b/packages/pds/tests/rate-limits.test.ts
@@ -1,6 +1,6 @@
 import { AtpAgent } from '@atproto/api'
 import { randomStr } from '@atproto/crypto'
-import { TestNetworkNoAppView, SeedClient } from '@atproto/dev-env'
+import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 import userSeed from './seeds/basic'
 
 describe('rate limits', () => {
diff --git a/packages/pds/tests/sequencer.test.ts b/packages/pds/tests/sequencer.test.ts
index 184463b8ddc..04e7f6b2bd2 100644
--- a/packages/pds/tests/sequencer.test.ts
+++ b/packages/pds/tests/sequencer.test.ts
@@ -1,17 +1,17 @@
-import { TestNetworkNoAppView, SeedClient } from '@atproto/dev-env'
-import { randomStr } from '@atproto/crypto'
 import {
   cborDecode,
   cborEncode,
   readFromGenerator,
   wait,
 } from '@atproto/common'
-import { Sequencer, SeqEvt, formatSeqCommit } from '../src/sequencer'
-import { sequencer, repoPrepare } from '../../pds'
-import Outbox from '../src/sequencer/outbox'
-import userSeed from './seeds/users'
-import { ids } from '../src/lexicon/lexicons'
+import { randomStr } from '@atproto/crypto'
+import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 import { readCarWithRoot } from '@atproto/repo'
+import { repoPrepare, sequencer } from '../../pds'
+import { ids } from '../src/lexicon/lexicons'
+import { SeqEvt, Sequencer, formatSeqCommit } from '../src/sequencer'
+import { Outbox } from '../src/sequencer/outbox'
+import userSeed from './seeds/users'
 
 describe('sequencer', () => {
   let network: TestNetworkNoAppView
diff --git a/packages/pds/tests/server.test.ts b/packages/pds/tests/server.test.ts
index ea36d4b6b44..7a23d23e876 100644
--- a/packages/pds/tests/server.test.ts
+++ b/packages/pds/tests/server.test.ts
@@ -1,9 +1,9 @@
-import { AtpAgent, AtUri } from '@atproto/api'
-import { randomStr } from '@atproto/crypto'
-import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
-import express from 'express'
 import { finished } from 'node:stream/promises'
+import express from 'express'
 import { request } from 'undici'
+import { AtUri, AtpAgent } from '@atproto/api'
+import { randomStr } from '@atproto/crypto'
+import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 import { handler as errorHandler } from '../src/error'
 import { startServer } from './_util'
 import basicSeed from './seeds/basic'
diff --git a/packages/pds/tests/sync/list.test.ts b/packages/pds/tests/sync/list.test.ts
index a71f9327794..789b33073b6 100644
--- a/packages/pds/tests/sync/list.test.ts
+++ b/packages/pds/tests/sync/list.test.ts
@@ -1,5 +1,5 @@
-import { TestNetworkNoAppView, SeedClient } from '@atproto/dev-env'
 import { AtpAgent } from '@atproto/api'
+import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 import basicSeed from '../seeds/basic'
 
 describe('sync listing', () => {
diff --git a/packages/pds/tests/sync/subscribe-repos.test.ts b/packages/pds/tests/sync/subscribe-repos.test.ts
index 573596df536..1fe81c7fa03 100644
--- a/packages/pds/tests/sync/subscribe-repos.test.ts
+++ b/packages/pds/tests/sync/subscribe-repos.test.ts
@@ -1,28 +1,28 @@
-import { TestNetworkNoAppView, SeedClient } from '@atproto/dev-env'
+import { CID } from 'multiformats/cid'
+import { WebSocket } from 'ws'
 import { AtpAgent } from '@atproto/api'
 import {
-  cborDecode,
   HOUR,
   MINUTE,
+  cborDecode,
   readFromGenerator,
   wait,
 } from '@atproto/common'
 import { randomStr } from '@atproto/crypto'
+import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 import * as repo from '@atproto/repo'
 import { readCar } from '@atproto/repo'
-import { byFrame, ErrorFrame, Frame, MessageFrame } from '@atproto/xrpc-server'
-import { WebSocket } from 'ws'
+import { ErrorFrame, Frame, MessageFrame, byFrame } from '@atproto/xrpc-server'
+import { AppContext } from '../../src'
+import { AccountStatus } from '../../src/account-manager'
 import {
+  Account as AccountEvt,
   Commit as CommitEvt,
   Handle as HandleEvt,
-  Tombstone as TombstoneEvt,
-  Account as AccountEvt,
   Identity as IdentityEvt,
+  Tombstone as TombstoneEvt,
 } from '../../src/lexicon/types/com/atproto/sync/subscribeRepos'
-import { AppContext } from '../../src'
 import basicSeed from '../seeds/basic'
-import { CID } from 'multiformats/cid'
-import { AccountStatus } from '../../src/account-manager'
 
 describe('repo subscribe repos', () => {
   let serverHost: string
diff --git a/packages/pds/tests/sync/sync.test.ts b/packages/pds/tests/sync/sync.test.ts
index cdc565f140b..281a8cd0b31 100644
--- a/packages/pds/tests/sync/sync.test.ts
+++ b/packages/pds/tests/sync/sync.test.ts
@@ -1,11 +1,11 @@
-import { TestNetworkNoAppView, SeedClient } from '@atproto/dev-env'
+import { CID } from 'multiformats/cid'
 import { AtpAgent } from '@atproto/api'
-import { cidForCbor, TID } from '@atproto/common'
+import { TID, cidForCbor } from '@atproto/common'
 import { Keypair, randomStr } from '@atproto/crypto'
+import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 import * as repo from '@atproto/repo'
 import { MemoryBlockstore } from '@atproto/repo'
 import { AtUri } from '@atproto/syntax'
-import { CID } from 'multiformats/cid'
 
 describe('repo sync', () => {
   let network: TestNetworkNoAppView
diff --git a/packages/pds/tests/takedown-appeal.test.ts b/packages/pds/tests/takedown-appeal.test.ts
index afe1bbd791e..fafdda934a3 100644
--- a/packages/pds/tests/takedown-appeal.test.ts
+++ b/packages/pds/tests/takedown-appeal.test.ts
@@ -1,7 +1,7 @@
 import { AtpAgent, ComAtprotoModerationDefs } from '@atproto/api'
 import { SeedClient, TestNetwork } from '@atproto/dev-env'
-import { forSubjectStatusSnapshot } from './_util'
 import { ids } from '../src/lexicon/lexicons'
+import { forSubjectStatusSnapshot } from './_util'
 
 describe('appeal account takedown', () => {
   let network: TestNetwork
diff --git a/packages/repo/bench/mst.bench.ts b/packages/repo/bench/mst.bench.ts
index d0e4704eef3..6819aa95928 100644
--- a/packages/repo/bench/mst.bench.ts
+++ b/packages/repo/bench/mst.bench.ts
@@ -1,7 +1,7 @@
+import fs from 'node:fs'
 import { CID } from 'multiformats'
-import { Fanout, MemoryBlockstore, MST, NodeEntry } from '../src'
+import { Fanout, MST, MemoryBlockstore, NodeEntry } from '../src'
 import * as util from '../tests/_util'
-import fs from 'fs'
 
 type BenchmarkData = {
   fanout: number
diff --git a/packages/repo/package.json b/packages/repo/package.json
index 548759d9a77..8abc3d13128 100644
--- a/packages/repo/package.json
+++ b/packages/repo/package.json
@@ -7,6 +7,9 @@
     "atproto",
     "mst"
   ],
+  "engines": {
+    "node": ">=18.7.0"
+  },
   "homepage": "https://atproto.com",
   "repository": {
     "type": "git",
diff --git a/packages/repo/src/block-map.ts b/packages/repo/src/block-map.ts
index a88d844471d..5d3211e528e 100644
--- a/packages/repo/src/block-map.ts
+++ b/packages/repo/src/block-map.ts
@@ -1,7 +1,7 @@
-import { lexToIpld, LexValue } from '@atproto/lexicon'
-import { dataToCborBlock } from '@atproto/common'
 import { CID } from 'multiformats/cid'
 import * as uint8arrays from 'uint8arrays'
+import { dataToCborBlock } from '@atproto/common'
+import { LexValue, lexToIpld } from '@atproto/lexicon'
 
 export class BlockMap {
   private map: Map<string, Uint8Array> = new Map()
diff --git a/packages/repo/src/data-diff.ts b/packages/repo/src/data-diff.ts
index bbf6fcf46b7..6a4884eaab5 100644
--- a/packages/repo/src/data-diff.ts
+++ b/packages/repo/src/data-diff.ts
@@ -1,7 +1,7 @@
 import { CID } from 'multiformats'
-import CidSet from './cid-set'
+import { BlockMap } from './block-map'
+import { CidSet } from './cid-set'
 import { MST, NodeEntry, mstDiff } from './mst'
-import BlockMap from './block-map'
 
 export class DataDiff {
   adds: Record<string, DataAdd> = {}
@@ -115,5 +115,3 @@ export type DataDelete = {
   key: string
   cid: CID
 }
-
-export default DataDiff
diff --git a/packages/repo/src/mst/diff.ts b/packages/repo/src/mst/diff.ts
index 20bd215fb33..2b6400fadce 100644
--- a/packages/repo/src/mst/diff.ts
+++ b/packages/repo/src/mst/diff.ts
@@ -1,6 +1,6 @@
 import { DataDiff } from '../data-diff'
-import MST from './mst'
-import MstWalker from './walker'
+import { MST } from './mst'
+import { MstWalker } from './walker'
 
 export const nullDiff = async (tree: MST): Promise<DataDiff> => {
   const diff = new DataDiff()
diff --git a/packages/repo/src/mst/mst.ts b/packages/repo/src/mst/mst.ts
index 26db1f7315e..01fbd13b699 100644
--- a/packages/repo/src/mst/mst.ts
+++ b/packages/repo/src/mst/mst.ts
@@ -1,14 +1,13 @@
-import z from 'zod'
-import { CID } from 'multiformats'
-
-import { ReadableBlockstore } from '../storage'
-import { schema as common, cidForCbor, dataToCborBlock } from '@atproto/common'
 import { BlockWriter } from '@ipld/car/writer'
-import * as util from './util'
-import BlockMap from '../block-map'
-import CidSet from '../cid-set'
+import { CID } from 'multiformats'
+import { z } from 'zod'
+import { cidForCbor, dataToCborBlock, schema as common } from '@atproto/common'
+import { BlockMap } from '../block-map'
+import { CidSet } from '../cid-set'
 import { MissingBlockError, MissingBlocksError } from '../error'
 import * as parse from '../parse'
+import { ReadableBlockstore } from '../storage'
+import * as util from './util'
 
 /**
  * This is an implementation of a Merkle Search Tree (MST)
@@ -811,5 +810,3 @@ export class Leaf {
     }
   }
 }
-
-export default MST
diff --git a/packages/repo/src/mst/util.ts b/packages/repo/src/mst/util.ts
index 0cc916cdd61..932577be654 100644
--- a/packages/repo/src/mst/util.ts
+++ b/packages/repo/src/mst/util.ts
@@ -1,9 +1,9 @@
 import { CID } from 'multiformats'
 import * as uint8arrays from 'uint8arrays'
-import { ReadableBlockstore } from '../storage'
-import { sha256 } from '@atproto/crypto'
-import { MST, Leaf, NodeEntry, NodeData, MstOpts } from './mst'
 import { cidForCbor } from '@atproto/common'
+import { sha256 } from '@atproto/crypto'
+import { ReadableBlockstore } from '../storage'
+import { Leaf, MST, MstOpts, NodeData, NodeEntry } from './mst'
 
 export const leadingZerosOnHash = async (key: string | Uint8Array) => {
   const hash = await sha256(key)
diff --git a/packages/repo/src/mst/walker.ts b/packages/repo/src/mst/walker.ts
index f9f37539526..f062208d9d1 100644
--- a/packages/repo/src/mst/walker.ts
+++ b/packages/repo/src/mst/walker.ts
@@ -116,5 +116,3 @@ export class MstWalker {
     }
   }
 }
-
-export default MstWalker
diff --git a/packages/repo/src/parse.ts b/packages/repo/src/parse.ts
index bed93ad623b..f195ef7b6f2 100644
--- a/packages/repo/src/parse.ts
+++ b/packages/repo/src/parse.ts
@@ -1,7 +1,7 @@
-import { check, cborDecode } from '@atproto/common'
-import { RepoRecord } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
-import BlockMap from './block-map'
+import { cborDecode, check } from '@atproto/common'
+import { RepoRecord } from '@atproto/lexicon'
+import { BlockMap } from './block-map'
 import { MissingBlockError, UnexpectedObjectError } from './error'
 import { cborToLexRecord } from './util'
 
diff --git a/packages/repo/src/readable-repo.ts b/packages/repo/src/readable-repo.ts
index 7e53a7e5a55..50ecbf07dcd 100644
--- a/packages/repo/src/readable-repo.ts
+++ b/packages/repo/src/readable-repo.ts
@@ -1,12 +1,12 @@
 import { CID } from 'multiformats/cid'
-import { def, RepoContents, Commit } from './types'
-import { ReadableBlockstore } from './storage'
-import { MST } from './mst'
+import { RepoRecord } from '@atproto/lexicon'
+import { MissingBlocksError } from './error'
 import log from './logger'
-import * as util from './util'
+import { MST } from './mst'
 import * as parse from './parse'
-import { MissingBlocksError } from './error'
-import { RepoRecord } from '@atproto/lexicon'
+import { ReadableBlockstore } from './storage'
+import { Commit, RepoContents, def } from './types'
+import * as util from './util'
 
 type Params = {
   storage: ReadableBlockstore
@@ -85,5 +85,3 @@ export class ReadableRepo {
     return contents
   }
 }
-
-export default ReadableRepo
diff --git a/packages/repo/src/repo.ts b/packages/repo/src/repo.ts
index 0a9bcf9ad0a..af1ce4a1d63 100644
--- a/packages/repo/src/repo.ts
+++ b/packages/repo/src/repo.ts
@@ -1,23 +1,23 @@
 import { CID } from 'multiformats/cid'
-import { dataToCborBlock, TID } from '@atproto/common'
+import { TID, dataToCborBlock } from '@atproto/common'
 import * as crypto from '@atproto/crypto'
 import { lexToIpld } from '@atproto/lexicon'
+import { BlockMap } from './block-map'
+import { CidSet } from './cid-set'
+import { DataDiff } from './data-diff'
+import log from './logger'
+import { MST } from './mst'
+import { ReadableRepo } from './readable-repo'
+import { RepoStorage } from './storage'
 import {
   Commit,
   CommitData,
-  def,
   RecordCreateOp,
   RecordWriteOp,
   WriteOpAction,
+  def,
 } from './types'
-import { RepoStorage } from './storage'
-import { MST } from './mst'
-import DataDiff from './data-diff'
-import log from './logger'
-import BlockMap from './block-map'
-import { ReadableRepo } from './readable-repo'
 import * as util from './util'
-import CidSet from './cid-set'
 
 type Params = {
   storage: RepoStorage
diff --git a/packages/repo/src/storage/memory-blockstore.ts b/packages/repo/src/storage/memory-blockstore.ts
index 1426d962dc0..8277db4bdff 100644
--- a/packages/repo/src/storage/memory-blockstore.ts
+++ b/packages/repo/src/storage/memory-blockstore.ts
@@ -1,7 +1,7 @@
 import { CID } from 'multiformats/cid'
+import { BlockMap } from '../block-map'
 import { CommitData } from '../types'
-import BlockMap from '../block-map'
-import ReadableBlockstore from './readable-blockstore'
+import { ReadableBlockstore } from './readable-blockstore'
 import { RepoStorage } from './types'
 
 export class MemoryBlockstore
diff --git a/packages/repo/src/storage/readable-blockstore.ts b/packages/repo/src/storage/readable-blockstore.ts
index 1f8217128aa..74e17c8ed49 100644
--- a/packages/repo/src/storage/readable-blockstore.ts
+++ b/packages/repo/src/storage/readable-blockstore.ts
@@ -1,7 +1,7 @@
+import { CID } from 'multiformats/cid'
 import { check } from '@atproto/common'
 import { RepoRecord } from '@atproto/lexicon'
-import { CID } from 'multiformats/cid'
-import BlockMap from '../block-map'
+import { BlockMap } from '../block-map'
 import { MissingBlockError } from '../error'
 import * as parse from '../parse'
 import { cborToLexRecord } from '../util'
diff --git a/packages/repo/src/storage/sync-storage.ts b/packages/repo/src/storage/sync-storage.ts
index 626aeedb9f9..4c2292c9b5e 100644
--- a/packages/repo/src/storage/sync-storage.ts
+++ b/packages/repo/src/storage/sync-storage.ts
@@ -1,6 +1,6 @@
 import { CID } from 'multiformats/cid'
-import BlockMap from '../block-map'
-import ReadableBlockstore from './readable-blockstore'
+import { BlockMap } from '../block-map'
+import { ReadableBlockstore } from './readable-blockstore'
 
 export class SyncStorage extends ReadableBlockstore {
   constructor(
diff --git a/packages/repo/src/storage/types.ts b/packages/repo/src/storage/types.ts
index b1eebd5d983..b38ef6c5bf6 100644
--- a/packages/repo/src/storage/types.ts
+++ b/packages/repo/src/storage/types.ts
@@ -1,8 +1,8 @@
-import stream from 'stream'
+import stream from 'node:stream'
 import { CID } from 'multiformats/cid'
-import { RepoRecord } from '@atproto/lexicon'
 import { check } from '@atproto/common'
-import BlockMap from '../block-map'
+import { RepoRecord } from '@atproto/lexicon'
+import { BlockMap } from '../block-map'
 import { CommitData } from '../types'
 
 export interface RepoStorage {
diff --git a/packages/repo/src/sync/consumer.ts b/packages/repo/src/sync/consumer.ts
index cf2716e24b0..c0436e42678 100644
--- a/packages/repo/src/sync/consumer.ts
+++ b/packages/repo/src/sync/consumer.ts
@@ -1,17 +1,17 @@
 import { CID } from 'multiformats/cid'
+import { BlockMap } from '../block-map'
+import { DataDiff } from '../data-diff'
+import { MST } from '../mst'
+import { ReadableRepo } from '../readable-repo'
 import { MemoryBlockstore, ReadableBlockstore, SyncStorage } from '../storage'
-import DataDiff from '../data-diff'
-import ReadableRepo from '../readable-repo'
-import * as util from '../util'
 import {
-  RecordClaim,
   RecordCidClaim,
+  RecordClaim,
   VerifiedDiff,
   VerifiedRepo,
+  def,
 } from '../types'
-import { def } from '../types'
-import { MST } from '../mst'
-import BlockMap from '../block-map'
+import * as util from '../util'
 
 export const verifyRepoCar = async (
   carBytes: Uint8Array,
diff --git a/packages/repo/src/sync/provider.ts b/packages/repo/src/sync/provider.ts
index 215481c6aa0..c49c35c5b57 100644
--- a/packages/repo/src/sync/provider.ts
+++ b/packages/repo/src/sync/provider.ts
@@ -1,11 +1,11 @@
-import { def, RecordPath } from '../types'
 import { BlockWriter } from '@ipld/car/writer'
 import { CID } from 'multiformats/cid'
-import CidSet from '../cid-set'
+import { CidSet } from '../cid-set'
 import { MissingBlocksError } from '../error'
+import { MST } from '../mst'
 import { ReadableBlockstore, RepoStorage } from '../storage'
+import { RecordPath, def } from '../types'
 import * as util from '../util'
-import { MST } from '../mst'
 
 // Full Repo
 // -------------
diff --git a/packages/repo/src/types.ts b/packages/repo/src/types.ts
index cda74bcbbbd..3920e4350f7 100644
--- a/packages/repo/src/types.ts
+++ b/packages/repo/src/types.ts
@@ -1,10 +1,10 @@
+import { CID } from 'multiformats'
 import { z } from 'zod'
-import { def as commonDef } from '@atproto/common-web'
 import { schema as common } from '@atproto/common'
-import { CID } from 'multiformats'
-import BlockMap from './block-map'
+import { def as commonDef } from '@atproto/common-web'
 import { RepoRecord } from '@atproto/lexicon'
-import CidSet from './cid-set'
+import { BlockMap } from './block-map'
+import { CidSet } from './cid-set'
 
 // Repo nodes
 // ---------------
diff --git a/packages/repo/src/util.ts b/packages/repo/src/util.ts
index d6ef28f75e1..898248ce84e 100644
--- a/packages/repo/src/util.ts
+++ b/packages/repo/src/util.ts
@@ -1,22 +1,24 @@
+import { Readable } from 'node:stream'
 import { setImmediate } from 'node:timers/promises'
-import { CID } from 'multiformats/cid'
-import * as cbor from '@ipld/dag-cbor'
 import { CarBlockIterator } from '@ipld/car/iterator'
 import { BlockWriter, CarWriter } from '@ipld/car/writer'
+import * as cbor from '@ipld/dag-cbor'
+import { CID } from 'multiformats/cid'
 import {
-  streamToBuffer,
-  verifyCidForBytes,
+  TID,
+  byteIterableToStream,
   cborDecode,
   check,
-  schema,
   cidForCbor,
-  byteIterableToStream,
-  TID,
+  schema,
+  streamToBuffer,
+  verifyCidForBytes,
 } from '@atproto/common'
-import { ipldToLex, lexToIpld, LexValue, RepoRecord } from '@atproto/lexicon'
-
 import * as crypto from '@atproto/crypto'
-import DataDiff from './data-diff'
+import { Keypair } from '@atproto/crypto'
+import { LexValue, RepoRecord, ipldToLex, lexToIpld } from '@atproto/lexicon'
+import { BlockMap } from './block-map'
+import { DataDiff } from './data-diff'
 import {
   CarBlock,
   Commit,
@@ -29,9 +31,6 @@ import {
   UnsignedCommit,
   WriteOpAction,
 } from './types'
-import BlockMap from './block-map'
-import { Keypair } from '@atproto/crypto'
-import { Readable } from 'stream'
 
 export async function* verifyIncomingCarBlocks(
   car: AsyncIterable<CarBlock>,
diff --git a/packages/repo/tests/_util.ts b/packages/repo/tests/_util.ts
index a2de1fc05b4..0a149cdc775 100644
--- a/packages/repo/tests/_util.ts
+++ b/packages/repo/tests/_util.ts
@@ -1,22 +1,22 @@
-import fs from 'fs'
+import fs from 'node:fs'
 import { CID } from 'multiformats'
 import { TID, dataToCborBlock } from '@atproto/common'
 import * as crypto from '@atproto/crypto'
-import { Repo } from '../src/repo'
-import { RepoStorage } from '../src/storage'
-import { MST } from '../src/mst'
+import { Keypair, randomBytes } from '@atproto/crypto'
 import {
   BlockMap,
   CollectionContents,
+  Commit,
+  CommitData,
+  DataDiff,
+  RecordPath,
   RecordWriteOp,
   RepoContents,
-  RecordPath,
   WriteOpAction,
-  Commit,
-  DataDiff,
-  CommitData,
 } from '../src'
-import { Keypair, randomBytes } from '@atproto/crypto'
+import { MST } from '../src/mst'
+import { Repo } from '../src/repo'
+import { RepoStorage } from '../src/storage'
 
 type IdMapping = Record<string, CID>
 
diff --git a/packages/repo/tests/commit-data.test.ts b/packages/repo/tests/commit-data.test.ts
index 966290bdfbf..af5ad99fc37 100644
--- a/packages/repo/tests/commit-data.test.ts
+++ b/packages/repo/tests/commit-data.test.ts
@@ -1,6 +1,6 @@
 import { Secp256k1Keypair } from '@atproto/crypto'
+import { Repo, WriteOpAction, blocksToCarFile, verifyProofs } from '../src'
 import { MemoryBlockstore } from '../src/storage'
-import { blocksToCarFile, Repo, verifyProofs, WriteOpAction } from '../src'
 
 describe('Commit data', () => {
   // @NOTE this test uses a fully deterministic tree structure
diff --git a/packages/repo/tests/mst.test.ts b/packages/repo/tests/mst.test.ts
index 5a39d977417..06cfb80fe95 100644
--- a/packages/repo/tests/mst.test.ts
+++ b/packages/repo/tests/mst.test.ts
@@ -1,12 +1,10 @@
+import { CID } from 'multiformats'
+import { DataAdd, DataDelete, DataDiff, DataUpdate } from '../src/data-diff'
 import { MST } from '../src/mst'
-import DataDiff, { DataAdd, DataUpdate, DataDelete } from '../src/data-diff'
-import { countPrefixLen, InvalidMstKeyError } from '../src/mst/util'
-
+import { InvalidMstKeyError, countPrefixLen } from '../src/mst/util'
 import { MemoryBlockstore } from '../src/storage'
 import * as util from './_util'
 
-import { CID } from 'multiformats'
-
 describe('Merkle Search Tree', () => {
   let blockstore: MemoryBlockstore
   let mst: MST
diff --git a/packages/repo/tests/proofs.test.ts b/packages/repo/tests/proofs.test.ts
index 2bf1e38d9b3..f35bb89f98b 100644
--- a/packages/repo/tests/proofs.test.ts
+++ b/packages/repo/tests/proofs.test.ts
@@ -3,7 +3,6 @@ import * as crypto from '@atproto/crypto'
 import { RecordCidClaim, RecordPath, Repo, RepoContents } from '../src'
 import { MemoryBlockstore } from '../src/storage'
 import * as sync from '../src/sync'
-
 import * as util from './_util'
 
 describe('Repo Proofs', () => {
diff --git a/packages/repo/tests/repo.test.ts b/packages/repo/tests/repo.test.ts
index 75d7ef23a14..4e2ece34fcd 100644
--- a/packages/repo/tests/repo.test.ts
+++ b/packages/repo/tests/repo.test.ts
@@ -1,10 +1,10 @@
+import { TID } from '@atproto/common'
 import * as crypto from '@atproto/crypto'
+import { Secp256k1Keypair } from '@atproto/crypto'
+import { RepoContents, WriteOpAction, verifyCommitSig } from '../src'
 import { Repo } from '../src/repo'
 import { MemoryBlockstore } from '../src/storage'
 import * as util from './_util'
-import { TID } from '@atproto/common'
-import { RepoContents, verifyCommitSig, WriteOpAction } from '../src'
-import { Secp256k1Keypair } from '@atproto/crypto'
 
 describe('Repo', () => {
   const collName = 'com.example.posts'
diff --git a/packages/repo/tests/sync.test.ts b/packages/repo/tests/sync.test.ts
index 5018d8f58ef..d5107f3aee6 100644
--- a/packages/repo/tests/sync.test.ts
+++ b/packages/repo/tests/sync.test.ts
@@ -1,3 +1,5 @@
+import { CarReader } from '@ipld/car/reader'
+import { streamToBuffer } from '@atproto/common'
 import * as crypto from '@atproto/crypto'
 import {
   CidSet,
@@ -9,10 +11,7 @@ import {
 } from '../src'
 import { MemoryBlockstore } from '../src/storage'
 import * as sync from '../src/sync'
-
 import * as util from './_util'
-import { streamToBuffer } from '@atproto/common'
-import { CarReader } from '@ipld/car/reader'
 
 describe('Repo Sync', () => {
   let storage: MemoryBlockstore
diff --git a/packages/sync/package.json b/packages/sync/package.json
index 353c45b2fd8..0a7eef8dbae 100644
--- a/packages/sync/package.json
+++ b/packages/sync/package.json
@@ -15,6 +15,9 @@
     "url": "https://github.com/bluesky-social/atproto",
     "directory": "packages/sync"
   },
+  "engines": {
+    "node": ">=18.7.0"
+  },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
diff --git a/packages/sync/src/events.ts b/packages/sync/src/events.ts
index 9f91603b8d0..f9f2bde3c27 100644
--- a/packages/sync/src/events.ts
+++ b/packages/sync/src/events.ts
@@ -1,8 +1,8 @@
+import type { CID } from 'multiformats/cid'
 import { DidDocument } from '@atproto/identity'
 import type { RepoRecord } from '@atproto/lexicon'
 import { BlockMap } from '@atproto/repo'
 import { AtUri } from '@atproto/syntax'
-import type { CID } from 'multiformats/cid'
 
 export type Event = CommitEvt | IdentityEvt | AccountEvt
 
diff --git a/packages/sync/src/firehose/index.ts b/packages/sync/src/firehose/index.ts
index 4a03382e6c1..f765a1361df 100644
--- a/packages/sync/src/firehose/index.ts
+++ b/packages/sync/src/firehose/index.ts
@@ -1,20 +1,31 @@
-import { createDeferrable, Deferrable, wait } from '@atproto/common'
+import { CID } from 'multiformats/cid'
+import type { ClientOptions } from 'ws'
+import { Deferrable, createDeferrable, wait } from '@atproto/common'
 import {
+  DidDocument,
   IdResolver,
   parseToAtprotoDocument,
-  DidDocument,
 } from '@atproto/identity'
 import {
+  RepoVerificationError,
   cborToLexRecord,
   formatDataKey,
   parseDataKey,
   readCar,
-  RepoVerificationError,
   verifyProofs,
 } from '@atproto/repo'
 import { AtUri } from '@atproto/syntax'
 import { Subscription } from '@atproto/xrpc-server'
-import type { ClientOptions } from 'ws'
+import {
+  AccountEvt,
+  AccountStatus,
+  CommitEvt,
+  CommitMeta,
+  Event,
+  IdentityEvt,
+} from '../events'
+import { EventRunner } from '../runner'
+import { didAndSeqForEvt } from '../util'
 import {
   type Account,
   type Commit,
@@ -26,17 +37,6 @@ import {
   isIdentity,
   isValidRepoEvent,
 } from './lexicons'
-import {
-  Event,
-  CommitMeta,
-  CommitEvt,
-  AccountEvt,
-  AccountStatus,
-  IdentityEvt,
-} from '../events'
-import { CID } from 'multiformats/cid'
-import { EventRunner } from '../runner'
-import { didAndSeqForEvt } from '../util'
 
 export type FirehoseOptions = ClientOptions & {
   idResolver: IdResolver
diff --git a/packages/sync/src/firehose/lexicons.ts b/packages/sync/src/firehose/lexicons.ts
index 0a7b1605f24..57aee9b0732 100644
--- a/packages/sync/src/firehose/lexicons.ts
+++ b/packages/sync/src/firehose/lexicons.ts
@@ -1,8 +1,7 @@
 import type { IncomingMessage } from 'node:http'
-
+import type { CID } from 'multiformats/cid'
 import { type LexiconDoc, Lexicons } from '@atproto/lexicon'
 import type { ErrorFrame, HandlerAuth } from '@atproto/xrpc-server'
-import type { CID } from 'multiformats/cid'
 
 // @NOTE: this file is an ugly copy job of codegen output. I'd like to clean this whole thing up
 
diff --git a/packages/sync/src/runner/memory-runner.ts b/packages/sync/src/runner/memory-runner.ts
index fc4c49a39b7..aee6e961000 100644
--- a/packages/sync/src/runner/memory-runner.ts
+++ b/packages/sync/src/runner/memory-runner.ts
@@ -2,8 +2,6 @@ import PQueue from 'p-queue'
 import { ConsecutiveList } from './consecutive-list'
 import { EventRunner } from './types'
 
-export { ConsecutiveList }
-
 export type MemoryRunnerOptions = {
   setCursor?: (cursor: number) => Promise<void>
   concurrency?: number
diff --git a/packages/sync/src/util.ts b/packages/sync/src/util.ts
index ab4bebfaf3e..f90d9465076 100644
--- a/packages/sync/src/util.ts
+++ b/packages/sync/src/util.ts
@@ -1,4 +1,4 @@
-import { isAccount, isCommit, isIdentity, RepoEvent } from './firehose/lexicons'
+import { RepoEvent, isAccount, isCommit, isIdentity } from './firehose/lexicons'
 
 export const didAndSeqForEvt = (
   evt: RepoEvent,
diff --git a/packages/sync/tests/firehose.test.ts b/packages/sync/tests/firehose.test.ts
index 474a31d93a1..d32fd51ee0e 100644
--- a/packages/sync/tests/firehose.test.ts
+++ b/packages/sync/tests/firehose.test.ts
@@ -1,12 +1,12 @@
+import { createDeferrable, wait } from '@atproto/common'
 import {
-  mockResolvers,
   SeedClient,
   TestNetworkNoAppView,
+  mockResolvers,
 } from '@atproto/dev-env'
-import { Firehose, FirehoseOptions, MemoryRunner } from '../src'
 import { IdResolver } from '@atproto/identity'
+import { Firehose, FirehoseOptions, MemoryRunner } from '../src'
 import { Create, Event } from '../src/events'
-import { createDeferrable, wait } from '@atproto/common'
 
 describe('firehose', () => {
   let network: TestNetworkNoAppView
diff --git a/packages/syntax/src/aturi_validation.ts b/packages/syntax/src/aturi_validation.ts
index 4e5372661ad..3bc29aea3c6 100644
--- a/packages/syntax/src/aturi_validation.ts
+++ b/packages/syntax/src/aturi_validation.ts
@@ -1,5 +1,5 @@
-import { ensureValidHandle, ensureValidHandleRegex } from './handle'
 import { ensureValidDid, ensureValidDidRegex } from './did'
+import { ensureValidHandle, ensureValidHandleRegex } from './handle'
 import { ensureValidNsid, ensureValidNsidRegex } from './nsid'
 
 // Human-readable constraints on ATURI:
diff --git a/packages/syntax/tests/aturi.test.ts b/packages/syntax/tests/aturi.test.ts
index ffb437999c3..7e546a248f6 100644
--- a/packages/syntax/tests/aturi.test.ts
+++ b/packages/syntax/tests/aturi.test.ts
@@ -1,6 +1,6 @@
+import * as fs from 'node:fs'
+import * as readline from 'node:readline'
 import { AtUri, ensureValidAtUri, ensureValidAtUriRegex } from '../src/index'
-import * as readline from 'readline'
-import * as fs from 'fs'
 
 describe('At Uris', () => {
   it('parses valid at uris', () => {
diff --git a/packages/syntax/tests/datetime.test.ts b/packages/syntax/tests/datetime.test.ts
index c5c3d181689..1e07ec7306e 100644
--- a/packages/syntax/tests/datetime.test.ts
+++ b/packages/syntax/tests/datetime.test.ts
@@ -1,12 +1,12 @@
+import * as fs from 'node:fs'
+import * as readline from 'node:readline'
 import {
-  isValidDatetime,
+  InvalidDatetimeError,
   ensureValidDatetime,
+  isValidDatetime,
   normalizeDatetime,
   normalizeDatetimeAlways,
-  InvalidDatetimeError,
 } from '../src'
-import * as readline from 'readline'
-import * as fs from 'fs'
 
 describe('datetime validation', () => {
   const expectValid = (h: string) => {
diff --git a/packages/syntax/tests/did.test.ts b/packages/syntax/tests/did.test.ts
index 2c3abdae233..68fdc562c61 100644
--- a/packages/syntax/tests/did.test.ts
+++ b/packages/syntax/tests/did.test.ts
@@ -1,6 +1,6 @@
-import { ensureValidDid, ensureValidDidRegex, InvalidDidError } from '../src'
-import * as readline from 'readline'
-import * as fs from 'fs'
+import * as fs from 'node:fs'
+import * as readline from 'node:readline'
+import { InvalidDidError, ensureValidDid, ensureValidDidRegex } from '../src'
 
 describe('DID permissive validation', () => {
   const expectValid = (h: string) => {
diff --git a/packages/syntax/tests/handle.test.ts b/packages/syntax/tests/handle.test.ts
index ebea3a1bb66..0f0d51e4db4 100644
--- a/packages/syntax/tests/handle.test.ts
+++ b/packages/syntax/tests/handle.test.ts
@@ -1,11 +1,11 @@
+import * as fs from 'node:fs'
+import * as readline from 'node:readline'
 import {
+  InvalidHandleError,
   ensureValidHandle,
-  normalizeAndEnsureValidHandle,
   ensureValidHandleRegex,
-  InvalidHandleError,
+  normalizeAndEnsureValidHandle,
 } from '../src'
-import * as readline from 'readline'
-import * as fs from 'fs'
 
 describe('handle validation', () => {
   const expectValid = (h: string) => {
diff --git a/packages/syntax/tests/nsid.test.ts b/packages/syntax/tests/nsid.test.ts
index c428bb60b7a..8396428b2c0 100644
--- a/packages/syntax/tests/nsid.test.ts
+++ b/packages/syntax/tests/nsid.test.ts
@@ -1,11 +1,11 @@
+import * as fs from 'node:fs'
+import * as readline from 'node:readline'
 import {
-  ensureValidNsid,
-  ensureValidNsidRegex,
   InvalidNsidError,
   NSID,
+  ensureValidNsid,
+  ensureValidNsidRegex,
 } from '../src'
-import * as readline from 'readline'
-import * as fs from 'fs'
 
 describe('NSID parsing & creation', () => {
   it('parses valid NSIDs', () => {
diff --git a/packages/syntax/tests/recordkey.test.ts b/packages/syntax/tests/recordkey.test.ts
index 85d70ad298b..d1063ea4557 100644
--- a/packages/syntax/tests/recordkey.test.ts
+++ b/packages/syntax/tests/recordkey.test.ts
@@ -1,6 +1,6 @@
-import { ensureValidRecordKey, InvalidRecordKeyError } from '../src'
-import * as readline from 'readline'
-import * as fs from 'fs'
+import * as fs from 'node:fs'
+import * as readline from 'node:readline'
+import { InvalidRecordKeyError, ensureValidRecordKey } from '../src'
 
 describe('recordkey validation', () => {
   const expectValid = (r: string) => {
diff --git a/packages/syntax/tests/tid.test.ts b/packages/syntax/tests/tid.test.ts
index 6fe012ad554..6522c159bda 100644
--- a/packages/syntax/tests/tid.test.ts
+++ b/packages/syntax/tests/tid.test.ts
@@ -1,6 +1,6 @@
-import { ensureValidTid, InvalidTidError } from '../src'
-import * as readline from 'readline'
-import * as fs from 'fs'
+import * as fs from 'node:fs'
+import * as readline from 'node:readline'
+import { InvalidTidError, ensureValidTid } from '../src'
 
 describe('tid validation', () => {
   const expectValid = (t: string) => {
diff --git a/packages/xrpc-server/package.json b/packages/xrpc-server/package.json
index 21f52aa8d9f..1ffa7f0b613 100644
--- a/packages/xrpc-server/package.json
+++ b/packages/xrpc-server/package.json
@@ -13,6 +13,9 @@
     "url": "https://github.com/bluesky-social/atproto",
     "directory": "packages/xrpc-server"
   },
+  "engines": {
+    "node": ">=18.7.0"
+  },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
diff --git a/packages/xrpc-server/src/auth.ts b/packages/xrpc-server/src/auth.ts
index 78942f5c430..bdd2cebda50 100644
--- a/packages/xrpc-server/src/auth.ts
+++ b/packages/xrpc-server/src/auth.ts
@@ -1,7 +1,7 @@
+import * as ui8 from 'uint8arrays'
 import * as common from '@atproto/common'
 import { MINUTE } from '@atproto/common'
 import * as crypto from '@atproto/crypto'
-import * as ui8 from 'uint8arrays'
 import { AuthRequiredError } from './types'
 
 type ServiceJwtParams = {
diff --git a/packages/xrpc-server/src/rate-limiter.ts b/packages/xrpc-server/src/rate-limiter.ts
index 01b487f9c76..eb0fe416e0f 100644
--- a/packages/xrpc-server/src/rate-limiter.ts
+++ b/packages/xrpc-server/src/rate-limiter.ts
@@ -10,8 +10,8 @@ import {
   CalcPointsFn,
   RateLimitExceededError,
   RateLimiterConsume,
-  RateLimiterReset,
   RateLimiterI,
+  RateLimiterReset,
   RateLimiterStatus,
   XRPCReqContext,
 } from './types'
diff --git a/packages/xrpc-server/src/server.ts b/packages/xrpc-server/src/server.ts
index 41dc8293dd6..9690afb8246 100644
--- a/packages/xrpc-server/src/server.ts
+++ b/packages/xrpc-server/src/server.ts
@@ -1,12 +1,5 @@
-import { check, schema } from '@atproto/common'
-import {
-  LexiconDoc,
-  Lexicons,
-  lexToJson,
-  LexXrpcProcedure,
-  LexXrpcQuery,
-  LexXrpcSubscription,
-} from '@atproto/lexicon'
+import { Readable } from 'node:stream'
+import { pipeline } from 'node:stream/promises'
 import express, {
   Application,
   ErrorRequestHandler,
@@ -16,10 +9,18 @@ import express, {
   RequestHandler,
   Response,
   Router,
+  json as jsonParser,
+  text as textParser,
 } from 'express'
-import { Readable } from 'node:stream'
-import { pipeline } from 'node:stream/promises'
-
+import { check, schema } from '@atproto/common'
+import {
+  LexXrpcProcedure,
+  LexXrpcQuery,
+  LexXrpcSubscription,
+  LexiconDoc,
+  Lexicons,
+  lexToJson,
+} from '@atproto/lexicon'
 import log from './logger'
 import { consumeMany, resetMany } from './rate-limiter'
 import { ErrorFrame, Frame, MessageFrame, XrpcStreamServer } from './stream'
@@ -30,21 +31,21 @@ import {
   HandlerSuccess,
   InternalServerError,
   InvalidRequestError,
-  isHandlerError,
-  isHandlerPipeThroughBuffer,
-  isHandlerPipeThroughStream,
-  isShared,
   MethodNotImplementedError,
   Options,
   Params,
-  RateLimiterI,
   RateLimitExceededError,
+  RateLimiterI,
   XRPCError,
   XRPCHandler,
   XRPCHandlerConfig,
   XRPCReqContext,
   XRPCStreamHandler,
   XRPCStreamHandlerConfig,
+  isHandlerError,
+  isHandlerPipeThroughBuffer,
+  isHandlerPipeThroughStream,
+  isShared,
 } from './types'
 import {
   decodeQueryParams,
@@ -59,7 +60,7 @@ export function createServer(lexicons?: LexiconDoc[], options?: Options) {
 
 export class Server {
   router: Express = express()
-  routes: Router = express.Router()
+  routes: Router = Router()
   subscriptions = new Map<string, XrpcStreamServer>()
   lex = new Lexicons()
   options: Options
@@ -80,8 +81,8 @@ export class Server {
     })
     this.options = opts
     this.middleware = {
-      json: express.json({ limit: opts?.payload?.jsonLimit }),
-      text: express.text({ limit: opts?.payload?.textLimit }),
+      json: jsonParser({ limit: opts?.payload?.jsonLimit }),
+      text: textParser({ limit: opts?.payload?.textLimit }),
     }
     this.globalRateLimiters = []
     this.sharedRateLimiters = {}
diff --git a/packages/xrpc-server/src/stream/frames.ts b/packages/xrpc-server/src/stream/frames.ts
index 866277d3f5a..6869b3ddecd 100644
--- a/packages/xrpc-server/src/stream/frames.ts
+++ b/packages/xrpc-server/src/stream/frames.ts
@@ -1,13 +1,13 @@
 import * as uint8arrays from 'uint8arrays'
-import { cborEncode, cborDecodeMulti } from '@atproto/common'
+import { cborDecodeMulti, cborEncode } from '@atproto/common'
 import {
-  frameHeader,
+  ErrorFrameBody,
+  ErrorFrameHeader,
   FrameHeader,
   FrameType,
   MessageFrameHeader,
-  ErrorFrameHeader,
-  ErrorFrameBody,
   errorFrameBody,
+  frameHeader,
 } from './types'
 
 export abstract class Frame {
diff --git a/packages/xrpc-server/src/stream/server.ts b/packages/xrpc-server/src/stream/server.ts
index f52730dff4b..9d52d99e36a 100644
--- a/packages/xrpc-server/src/stream/server.ts
+++ b/packages/xrpc-server/src/stream/server.ts
@@ -1,7 +1,7 @@
-import { IncomingMessage } from 'http'
-import { WebSocketServer, ServerOptions, WebSocket } from 'ws'
+import { IncomingMessage } from 'node:http'
+import { ServerOptions, WebSocket, WebSocketServer } from 'ws'
 import { ErrorFrame, Frame } from './frames'
-import logger from './logger'
+import { logger } from './logger'
 import { CloseCode, DisconnectError } from './types'
 
 export class XrpcStreamServer {
diff --git a/packages/xrpc-server/src/stream/stream.ts b/packages/xrpc-server/src/stream/stream.ts
index d2475365e0d..6da90ab03ec 100644
--- a/packages/xrpc-server/src/stream/stream.ts
+++ b/packages/xrpc-server/src/stream/stream.ts
@@ -1,6 +1,6 @@
-import { XRPCError, ResponseType } from '@atproto/xrpc'
-import { DuplexOptions } from 'stream'
-import { createWebSocketStream, WebSocket } from 'ws'
+import { DuplexOptions } from 'node:stream'
+import { WebSocket, createWebSocketStream } from 'ws'
+import { ResponseType, XRPCError } from '@atproto/xrpc'
 import { Frame, MessageFrame } from './frames'
 
 export function streamByteChunks(ws: WebSocket, options?: DuplexOptions) {
diff --git a/packages/xrpc-server/src/stream/subscription.ts b/packages/xrpc-server/src/stream/subscription.ts
index 50fdb804017..63d1752ed76 100644
--- a/packages/xrpc-server/src/stream/subscription.ts
+++ b/packages/xrpc-server/src/stream/subscription.ts
@@ -1,6 +1,6 @@
 import { ClientOptions } from 'ws'
-import { WebSocketKeepAlive } from './websocket-keepalive'
 import { ensureChunkIsMessage } from './stream'
+import { WebSocketKeepAlive } from './websocket-keepalive'
 
 export class Subscription<T = unknown> {
   constructor(
diff --git a/packages/xrpc-server/src/stream/websocket-keepalive.ts b/packages/xrpc-server/src/stream/websocket-keepalive.ts
index 8efeee4e6f3..dd332669d15 100644
--- a/packages/xrpc-server/src/stream/websocket-keepalive.ts
+++ b/packages/xrpc-server/src/stream/websocket-keepalive.ts
@@ -1,5 +1,5 @@
+import { ClientOptions, WebSocket } from 'ws'
 import { SECOND, wait } from '@atproto/common'
-import { WebSocket, ClientOptions } from 'ws'
 import { streamByteChunks } from './stream'
 import { CloseCode, DisconnectError } from './types'
 
diff --git a/packages/xrpc-server/src/types.ts b/packages/xrpc-server/src/types.ts
index 5ea430a9fd6..61b7c913e9f 100644
--- a/packages/xrpc-server/src/types.ts
+++ b/packages/xrpc-server/src/types.ts
@@ -1,14 +1,14 @@
+import { IncomingMessage } from 'node:http'
+import { Readable } from 'node:stream'
+import express from 'express'
+import { isHttpError } from 'http-errors'
+import { z } from 'zod'
 import {
   ResponseType,
   ResponseTypeNames,
   ResponseTypeStrings,
   XRPCError as XRPCClientError,
 } from '@atproto/xrpc'
-import express from 'express'
-import { IncomingMessage } from 'http'
-import { isHttpError } from 'http-errors'
-import { Readable } from 'stream'
-import zod from 'zod'
 
 export type CatchallHandler = (
   req: express.Request,
@@ -47,60 +47,56 @@ export type UndecodedParams = (typeof express.request)['query']
 export type Primitive = string | number | boolean
 export type Params = Record<string, Primitive | Primitive[] | undefined>
 
-export const handlerInput = zod.object({
-  encoding: zod.string(),
-  body: zod.any(),
+export const handlerInput = z.object({
+  encoding: z.string(),
+  body: z.any(),
 })
-export type HandlerInput = zod.infer<typeof handlerInput>
+export type HandlerInput = z.infer<typeof handlerInput>
 
-export const handlerAuth = zod.object({
-  credentials: zod.any(),
-  artifacts: zod.any(),
+export const handlerAuth = z.object({
+  credentials: z.any(),
+  artifacts: z.any(),
 })
-export type HandlerAuth = zod.infer<typeof handlerAuth>
+export type HandlerAuth = z.infer<typeof handlerAuth>
 
-export const headersSchema = zod.record(zod.string())
+export const headersSchema = z.record(z.string())
 
-export const handlerSuccess = zod.object({
-  encoding: zod.string(),
-  body: zod.any(),
+export const handlerSuccess = z.object({
+  encoding: z.string(),
+  body: z.any(),
   headers: headersSchema.optional(),
 })
-export type HandlerSuccess = zod.infer<typeof handlerSuccess>
+export type HandlerSuccess = z.infer<typeof handlerSuccess>
 
-export const handlerPipeThroughBuffer = zod.object({
-  encoding: zod.string(),
-  buffer: zod.instanceof(Buffer),
+export const handlerPipeThroughBuffer = z.object({
+  encoding: z.string(),
+  buffer: z.instanceof(Buffer),
   headers: headersSchema.optional(),
 })
 
-export type HandlerPipeThroughBuffer = zod.infer<
-  typeof handlerPipeThroughBuffer
->
+export type HandlerPipeThroughBuffer = z.infer<typeof handlerPipeThroughBuffer>
 
-export const handlerPipeThroughStream = zod.object({
-  encoding: zod.string(),
-  stream: zod.instanceof(Readable),
+export const handlerPipeThroughStream = z.object({
+  encoding: z.string(),
+  stream: z.instanceof(Readable),
   headers: headersSchema.optional(),
 })
 
-export type HandlerPipeThroughStream = zod.infer<
-  typeof handlerPipeThroughStream
->
+export type HandlerPipeThroughStream = z.infer<typeof handlerPipeThroughStream>
 
-export const handlerPipeThrough = zod.union([
+export const handlerPipeThrough = z.union([
   handlerPipeThroughBuffer,
   handlerPipeThroughStream,
 ])
 
-export type HandlerPipeThrough = zod.infer<typeof handlerPipeThrough>
+export type HandlerPipeThrough = z.infer<typeof handlerPipeThrough>
 
-export const handlerError = zod.object({
-  status: zod.number(),
-  error: zod.string().optional(),
-  message: zod.string().optional(),
+export const handlerError = z.object({
+  status: z.number(),
+  error: z.string().optional(),
+  message: z.string().optional(),
 })
-export type HandlerError = zod.infer<typeof handlerError>
+export type HandlerError = z.infer<typeof handlerError>
 
 export type HandlerOutput = HandlerSuccess | HandlerPipeThrough | HandlerError
 
diff --git a/packages/xrpc-server/src/util.ts b/packages/xrpc-server/src/util.ts
index 5c721eee134..7a6cabdab75 100644
--- a/packages/xrpc-server/src/util.ts
+++ b/packages/xrpc-server/src/util.ts
@@ -1,28 +1,27 @@
 import assert from 'node:assert'
-import { Duplex, pipeline, Readable } from 'node:stream'
 import { IncomingMessage } from 'node:http'
+import { Duplex, Readable, pipeline } from 'node:stream'
 import express from 'express'
 import mime from 'mime-types'
+import { MaxSizeChecker, createDecoders } from '@atproto/common'
 import {
-  jsonToLex,
-  Lexicons,
   LexXrpcProcedure,
   LexXrpcQuery,
   LexXrpcSubscription,
+  Lexicons,
+  jsonToLex,
 } from '@atproto/lexicon'
-import { createDecoders, MaxSizeChecker } from '@atproto/common'
 import { ResponseType } from '@atproto/xrpc'
-
 import {
-  UndecodedParams,
-  Params,
   HandlerInput,
   HandlerSuccess,
-  handlerSuccess,
-  InvalidRequestError,
   InternalServerError,
-  XRPCError,
+  InvalidRequestError,
+  Params,
   RouteOpts,
+  UndecodedParams,
+  XRPCError,
+  handlerSuccess,
 } from './types'
 
 export function decodeQueryParams(
diff --git a/packages/xrpc-server/tests/_util.ts b/packages/xrpc-server/tests/_util.ts
index f3bc70be7b1..b0dc562254c 100644
--- a/packages/xrpc-server/tests/_util.ts
+++ b/packages/xrpc-server/tests/_util.ts
@@ -1,5 +1,5 @@
-import * as http from 'node:http'
 import { once } from 'node:events'
+import * as http from 'node:http'
 import express from 'express'
 import * as xrpc from '../src'
 import { AuthRequiredError } from '../src'
diff --git a/packages/xrpc-server/tests/auth.test.ts b/packages/xrpc-server/tests/auth.test.ts
index 66a561061c4..07ef8f46c0f 100644
--- a/packages/xrpc-server/tests/auth.test.ts
+++ b/packages/xrpc-server/tests/auth.test.ts
@@ -1,5 +1,5 @@
-import * as http from 'node:http'
 import { KeyObject, createPrivateKey } from 'node:crypto'
+import * as http from 'node:http'
 import { AddressInfo } from 'node:net'
 import * as jose from 'jose'
 import KeyEncoder from 'key-encoder'
@@ -7,13 +7,13 @@ import * as ui8 from 'uint8arrays'
 import { MINUTE } from '@atproto/common'
 import { Secp256k1Keypair } from '@atproto/crypto'
 import { LexiconDoc } from '@atproto/lexicon'
-import { XrpcClient, XRPCError } from '@atproto/xrpc'
+import { XRPCError, XrpcClient } from '@atproto/xrpc'
 import * as xrpcServer from '../src'
 import {
-  createServer,
+  basicAuthHeaders,
   closeServer,
   createBasicAuth,
-  basicAuthHeaders,
+  createServer,
 } from './_util'
 
 const LEXICONS: LexiconDoc[] = [
diff --git a/packages/xrpc-server/tests/bodies.test.ts b/packages/xrpc-server/tests/bodies.test.ts
index 90fcd7c1947..bf6c154fa18 100644
--- a/packages/xrpc-server/tests/bodies.test.ts
+++ b/packages/xrpc-server/tests/bodies.test.ts
@@ -2,13 +2,13 @@ import * as http from 'node:http'
 import { AddressInfo } from 'node:net'
 import { Readable } from 'node:stream'
 import { brotliCompressSync, deflateSync, gzipSync } from 'node:zlib'
-import { LexiconDoc } from '@atproto/lexicon'
-import { ResponseType, XrpcClient } from '@atproto/xrpc'
 import { cidForCbor } from '@atproto/common'
 import { randomBytes } from '@atproto/crypto'
-import { createServer, closeServer } from './_util'
+import { LexiconDoc } from '@atproto/lexicon'
+import { ResponseType, XrpcClient } from '@atproto/xrpc'
 import * as xrpcServer from '../src'
-import logger from '../src/logger'
+import { logger } from '../src/logger'
+import { closeServer, createServer } from './_util'
 
 const LEXICONS: LexiconDoc[] = [
   {
diff --git a/packages/xrpc-server/tests/errors.test.ts b/packages/xrpc-server/tests/errors.test.ts
index 25b0b04e594..ec683ca08b9 100644
--- a/packages/xrpc-server/tests/errors.test.ts
+++ b/packages/xrpc-server/tests/errors.test.ts
@@ -2,8 +2,8 @@ import * as http from 'node:http'
 import { AddressInfo } from 'node:net'
 import { LexiconDoc } from '@atproto/lexicon'
 import { XRPCError, XRPCInvalidResponseError, XrpcClient } from '@atproto/xrpc'
-import { createServer, closeServer } from './_util'
 import * as xrpcServer from '../src'
+import { closeServer, createServer } from './_util'
 
 const LEXICONS: LexiconDoc[] = [
   {
diff --git a/packages/xrpc-server/tests/frames.test.ts b/packages/xrpc-server/tests/frames.test.ts
index d386b57d994..a17b0b3aeed 100644
--- a/packages/xrpc-server/tests/frames.test.ts
+++ b/packages/xrpc-server/tests/frames.test.ts
@@ -1,6 +1,6 @@
 import * as cborx from 'cbor-x'
 import * as uint8arrays from 'uint8arrays'
-import { MessageFrame, ErrorFrame, Frame, FrameType } from '../src'
+import { ErrorFrame, Frame, FrameType, MessageFrame } from '../src'
 
 describe('Frames', () => {
   it('creates and parses message frame.', async () => {
diff --git a/packages/xrpc-server/tests/ipld.test.ts b/packages/xrpc-server/tests/ipld.test.ts
index 78e5774861f..ff38d90d5d5 100644
--- a/packages/xrpc-server/tests/ipld.test.ts
+++ b/packages/xrpc-server/tests/ipld.test.ts
@@ -1,10 +1,10 @@
 import * as http from 'node:http'
 import { AddressInfo } from 'node:net'
+import { CID } from 'multiformats/cid'
 import { LexiconDoc } from '@atproto/lexicon'
 import { XrpcClient } from '@atproto/xrpc'
-import { CID } from 'multiformats/cid'
-import { createServer, closeServer } from './_util'
 import * as xrpcServer from '../src'
+import { closeServer, createServer } from './_util'
 
 const LEXICONS: LexiconDoc[] = [
   {
diff --git a/packages/xrpc-server/tests/parameters.test.ts b/packages/xrpc-server/tests/parameters.test.ts
index 2ab1bf1aadd..a88a36bb096 100644
--- a/packages/xrpc-server/tests/parameters.test.ts
+++ b/packages/xrpc-server/tests/parameters.test.ts
@@ -2,8 +2,8 @@ import * as http from 'node:http'
 import { AddressInfo } from 'node:net'
 import { LexiconDoc } from '@atproto/lexicon'
 import { XrpcClient } from '@atproto/xrpc'
-import { createServer, closeServer } from './_util'
 import * as xrpcServer from '../src'
+import { closeServer, createServer } from './_util'
 
 const LEXICONS: LexiconDoc[] = [
   {
diff --git a/packages/xrpc-server/tests/procedures.test.ts b/packages/xrpc-server/tests/procedures.test.ts
index 195138a1053..90ca0429ac3 100644
--- a/packages/xrpc-server/tests/procedures.test.ts
+++ b/packages/xrpc-server/tests/procedures.test.ts
@@ -1,10 +1,10 @@
 import * as http from 'node:http'
+import { AddressInfo } from 'node:net'
 import { Readable } from 'node:stream'
 import { LexiconDoc } from '@atproto/lexicon'
 import { XrpcClient } from '@atproto/xrpc'
-import { createServer, closeServer } from './_util'
 import * as xrpcServer from '../src'
-import { AddressInfo } from 'node:net'
+import { closeServer, createServer } from './_util'
 
 const LEXICONS: LexiconDoc[] = [
   {
diff --git a/packages/xrpc-server/tests/queries.test.ts b/packages/xrpc-server/tests/queries.test.ts
index 39845f82594..c673fa1e7fd 100644
--- a/packages/xrpc-server/tests/queries.test.ts
+++ b/packages/xrpc-server/tests/queries.test.ts
@@ -2,8 +2,8 @@ import * as http from 'node:http'
 import { AddressInfo } from 'node:net'
 import { LexiconDoc } from '@atproto/lexicon'
 import { XrpcClient } from '@atproto/xrpc'
-import { createServer, closeServer } from './_util'
 import * as xrpcServer from '../src'
+import { closeServer, createServer } from './_util'
 
 const LEXICONS: LexiconDoc[] = [
   {
diff --git a/packages/xrpc-server/tests/responses.test.ts b/packages/xrpc-server/tests/responses.test.ts
index 5feb42bc3ed..ae892969abd 100644
--- a/packages/xrpc-server/tests/responses.test.ts
+++ b/packages/xrpc-server/tests/responses.test.ts
@@ -1,10 +1,10 @@
 import * as http from 'node:http'
 import { AddressInfo } from 'node:net'
+import { byteIterableToStream } from '@atproto/common'
 import { LexiconDoc } from '@atproto/lexicon'
 import { XrpcClient } from '@atproto/xrpc'
-import { byteIterableToStream } from '@atproto/common'
-import { createServer, closeServer } from './_util'
 import * as xrpcServer from '../src'
+import { closeServer, createServer } from './_util'
 
 const LEXICONS: LexiconDoc[] = [
   {
diff --git a/packages/xrpc-server/tests/stream.test.ts b/packages/xrpc-server/tests/stream.test.ts
index fa879dfd661..faae93e564b 100644
--- a/packages/xrpc-server/tests/stream.test.ts
+++ b/packages/xrpc-server/tests/stream.test.ts
@@ -1,6 +1,6 @@
-import * as http from 'http'
-import { once } from 'events'
-import { AddressInfo } from 'net'
+import { once } from 'node:events'
+import * as http from 'node:http'
+import { AddressInfo } from 'node:net'
 import { WebSocket } from 'ws'
 import { XRPCError } from '@atproto/xrpc'
 import {
diff --git a/packages/xrpc-server/tests/subscriptions.test.ts b/packages/xrpc-server/tests/subscriptions.test.ts
index cff7646a802..109397c5701 100644
--- a/packages/xrpc-server/tests/subscriptions.test.ts
+++ b/packages/xrpc-server/tests/subscriptions.test.ts
@@ -1,17 +1,17 @@
 import * as http from 'node:http'
 import { AddressInfo } from 'node:net'
-import { WebSocket, WebSocketServer, createWebSocketStream } from 'ws'
 import getPort from 'get-port'
+import { WebSocket, WebSocketServer, createWebSocketStream } from 'ws'
 import { wait } from '@atproto/common'
 import { LexiconDoc } from '@atproto/lexicon'
-import { byFrame, MessageFrame, ErrorFrame, Frame, Subscription } from '../src'
+import { ErrorFrame, Frame, MessageFrame, Subscription, byFrame } from '../src'
+import * as xrpcServer from '../src'
 import {
-  createServer,
+  basicAuthHeaders,
   closeServer,
   createBasicAuth,
-  basicAuthHeaders,
+  createServer,
 } from './_util'
-import * as xrpcServer from '../src'
 
 const LEXICONS: LexiconDoc[] = [
   {
diff --git a/packages/xrpc/src/client.ts b/packages/xrpc/src/client.ts
index 4d36b6aa0ca..009563500a8 100644
--- a/packages/xrpc/src/client.ts
+++ b/packages/xrpc/src/client.ts
@@ -1,7 +1,7 @@
 import { LexiconDoc, Lexicons } from '@atproto/lexicon'
 import { CallOptions, QueryParams } from './types'
-import { XrpcClient } from './xrpc-client'
 import { combineHeaders } from './util'
+import { XrpcClient } from './xrpc-client'
 
 /** @deprecated Use {@link XrpcClient} instead */
 export class Client {
diff --git a/packages/xrpc/src/index.ts b/packages/xrpc/src/index.ts
index f14bb111c25..1967728b85d 100644
--- a/packages/xrpc/src/index.ts
+++ b/packages/xrpc/src/index.ts
@@ -4,7 +4,9 @@ export * from './types'
 export * from './util'
 export * from './xrpc-client'
 
+/* eslint-disable import/no-deprecated */
 import { Client } from './client'
 /** @deprecated create a local {@link XrpcClient} instance instead */
 const defaultInst = new Client()
 export default defaultInst
+/* eslint-enable import/no-deprecated */
diff --git a/packages/xrpc/src/util.ts b/packages/xrpc/src/util.ts
index 558449c908f..6fd21f885ca 100644
--- a/packages/xrpc/src/util.ts
+++ b/packages/xrpc/src/util.ts
@@ -1,17 +1,17 @@
 import {
-  jsonStringToLex,
   LexXrpcProcedure,
   LexXrpcQuery,
+  jsonStringToLex,
   stringifyLex,
 } from '@atproto/lexicon'
 import {
   CallOptions,
-  errorResponseBody,
   ErrorResponseBody,
   Gettable,
   QueryParams,
   ResponseType,
   XRPCError,
+  errorResponseBody,
 } from './types'
 
 const ReadableStream =
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index feb0d2272e0..79b4911ec5e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -44,6 +44,15 @@ importers:
       eslint-config-prettier:
         specifier: ^9.1.0
         version: 9.1.0(eslint@8.57.0)
+      eslint-import-resolver-typescript:
+        specifier: ^3.7.0
+        version: 3.7.0(eslint-plugin-import@2.31.0)(eslint@8.57.0)
+      eslint-plugin-import:
+        specifier: ^2.31.0
+        version: 2.31.0(@typescript-eslint/parser@7.4.0)(eslint-import-resolver-typescript@3.7.0)(eslint@8.57.0)
+      eslint-plugin-n:
+        specifier: ^17.15.0
+        version: 17.15.0(eslint@8.57.0)
       eslint-plugin-prettier:
         specifier: ^5.1.3
         version: 5.1.3(eslint-config-prettier@9.1.0)(eslint@8.57.0)(prettier@3.2.5)
@@ -4955,11 +4964,26 @@ packages:
       eslint-visitor-keys: 3.4.3
     dev: true
 
+  /@eslint-community/eslint-utils@4.4.1(eslint@8.57.0):
+    resolution: {integrity: sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+    dependencies:
+      eslint: 8.57.0
+      eslint-visitor-keys: 3.4.3
+    dev: true
+
   /@eslint-community/regexpp@4.10.0:
     resolution: {integrity: sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==}
     engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
     dev: true
 
+  /@eslint-community/regexpp@4.12.1:
+    resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==}
+    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
+    dev: true
+
   /@eslint/eslintrc@2.1.4:
     resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -5621,6 +5645,11 @@ packages:
       '@nodelib/fs.scandir': 2.1.5
       fastq: 1.15.0
 
+  /@nolyfill/is-core-module@1.0.39:
+    resolution: {integrity: sha512-nn5ozdjYQpUCZlWGuxcJY/KpxkWQs4DcbMCmKojjyrYDEAGy4Ce19NN4v5MduafTwJlbKc99UA8YhSVqq9yPZA==}
+    engines: {node: '>=12.4.0'}
+    dev: true
+
   /@npmcli/fs@2.1.2:
     resolution: {integrity: sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
@@ -6035,6 +6064,10 @@ packages:
     dev: true
     optional: true
 
+  /@rtsao/scc@1.1.0:
+    resolution: {integrity: sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==}
+    dev: true
+
   /@sinclair/typebox@0.24.51:
     resolution: {integrity: sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==}
     dev: true
@@ -6355,6 +6388,10 @@ packages:
     resolution: {integrity: sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==}
     dev: true
 
+  /@types/json5@0.0.29:
+    resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==}
+    dev: true
+
   /@types/keygrip@1.0.6:
     resolution: {integrity: sha512-lZuNAY9xeJt7Bx4t4dx0rYCDqGPW8RXhQZK1td7d4H6E9zYbLoOtjBvfwdTKpsyxQI/2jv+armjX/RW+ZNpXOQ==}
     dev: true
@@ -6849,14 +6886,46 @@ packages:
       is-array-buffer: 3.0.2
     dev: true
 
+  /array-buffer-byte-length@1.0.1:
+    resolution: {integrity: sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.8
+      is-array-buffer: 3.0.4
+    dev: true
+
   /array-flatten@1.1.1:
     resolution: {integrity: sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==}
 
+  /array-includes@3.1.8:
+    resolution: {integrity: sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-abstract: 1.23.5
+      es-object-atoms: 1.0.0
+      get-intrinsic: 1.2.5
+      is-string: 1.0.7
+    dev: true
+
   /array-union@2.1.0:
     resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
     engines: {node: '>=8'}
     dev: true
 
+  /array.prototype.findlastindex@1.2.5:
+    resolution: {integrity: sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-abstract: 1.23.5
+      es-errors: 1.3.0
+      es-object-atoms: 1.0.0
+      es-shim-unscopables: 1.0.2
+    dev: true
+
   /array.prototype.flat@1.3.1:
     resolution: {integrity: sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==}
     engines: {node: '>= 0.4'}
@@ -6867,6 +6936,26 @@ packages:
       es-shim-unscopables: 1.0.0
     dev: true
 
+  /array.prototype.flat@1.3.2:
+    resolution: {integrity: sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
+      es-shim-unscopables: 1.0.0
+    dev: true
+
+  /array.prototype.flatmap@1.3.2:
+    resolution: {integrity: sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
+      es-shim-unscopables: 1.0.0
+    dev: true
+
   /arraybuffer.prototype.slice@1.0.1:
     resolution: {integrity: sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==}
     engines: {node: '>= 0.4'}
@@ -6879,6 +6968,20 @@ packages:
       is-shared-array-buffer: 1.0.2
     dev: true
 
+  /arraybuffer.prototype.slice@1.0.3:
+    resolution: {integrity: sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      array-buffer-byte-length: 1.0.1
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-abstract: 1.23.5
+      es-errors: 1.3.0
+      get-intrinsic: 1.2.5
+      is-array-buffer: 3.0.4
+      is-shared-array-buffer: 1.0.3
+    dev: true
+
   /arrify@1.0.1:
     resolution: {integrity: sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==}
     engines: {node: '>=0.10.0'}
@@ -6932,6 +7035,13 @@ packages:
     engines: {node: '>= 0.4'}
     dev: true
 
+  /available-typed-arrays@1.0.7:
+    resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      possible-typed-array-names: 1.0.0
+    dev: true
+
   /await-lock@2.2.2:
     resolution: {integrity: sha512-aDczADvlvTGajTDjcjpJMqRkOF6Qdz3YbPZm/PyW6tKPkx2hlYBzxMhEywM/tU72HrVZjgl5VCdRuMlA7pZ8Gw==}
     dev: false
@@ -7277,12 +7387,30 @@ packages:
       - bluebird
     dev: true
 
+  /call-bind-apply-helpers@1.0.1:
+    resolution: {integrity: sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      es-errors: 1.3.0
+      function-bind: 1.1.2
+    dev: true
+
   /call-bind@1.0.2:
     resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==}
     dependencies:
       function-bind: 1.1.1
       get-intrinsic: 1.2.1
 
+  /call-bind@1.0.8:
+    resolution: {integrity: sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind-apply-helpers: 1.0.1
+      es-define-property: 1.0.1
+      get-intrinsic: 1.2.5
+      set-function-length: 1.2.2
+    dev: true
+
   /callsites@3.1.0:
     resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
     engines: {node: '>=6'}
@@ -7782,6 +7910,33 @@ packages:
     engines: {node: '>= 14'}
     dev: true
 
+  /data-view-buffer@1.0.1:
+    resolution: {integrity: sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.8
+      es-errors: 1.3.0
+      is-data-view: 1.0.1
+    dev: true
+
+  /data-view-byte-length@1.0.1:
+    resolution: {integrity: sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.8
+      es-errors: 1.3.0
+      is-data-view: 1.0.1
+    dev: true
+
+  /data-view-byte-offset@1.0.0:
+    resolution: {integrity: sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.8
+      es-errors: 1.3.0
+      is-data-view: 1.0.1
+    dev: true
+
   /dataloader@1.4.0:
     resolution: {integrity: sha512-68s5jYdlvasItOJnCuI2Q9s4q98g0pCyL3HrcKJu8KNugUl8ahgmZYg38ysLTgQjjXX3H8CJLkAvWrclWfcalw==}
     dev: true
@@ -7883,6 +8038,17 @@ packages:
     dependencies:
       ms: 2.0.0
 
+  /debug@3.2.7:
+    resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+    dependencies:
+      ms: 2.1.3
+    dev: true
+
   /debug@4.3.4:
     resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
     engines: {node: '>=6.0'}
@@ -7947,6 +8113,15 @@ packages:
       clone: 1.0.4
     dev: true
 
+  /define-data-property@1.1.4:
+    resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      es-define-property: 1.0.1
+      es-errors: 1.3.0
+      gopd: 1.0.1
+    dev: true
+
   /define-properties@1.2.0:
     resolution: {integrity: sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==}
     engines: {node: '>= 0.4'}
@@ -7954,6 +8129,15 @@ packages:
       has-property-descriptors: 1.0.0
       object-keys: 1.1.1
 
+  /define-properties@1.2.1:
+    resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      define-data-property: 1.1.4
+      has-property-descriptors: 1.0.0
+      object-keys: 1.1.1
+    dev: true
+
   /degenerator@5.0.1:
     resolution: {integrity: sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==}
     engines: {node: '>= 14'}
@@ -8042,6 +8226,13 @@ packages:
     resolution: {integrity: sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==}
     dev: true
 
+  /doctrine@2.1.0:
+    resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      esutils: 2.0.3
+    dev: true
+
   /doctrine@3.0.0:
     resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
     engines: {node: '>=6.0.0'}
@@ -8081,6 +8272,15 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
+  /dunder-proto@1.0.0:
+    resolution: {integrity: sha512-9+Sj30DIu+4KvHqMfLUGLFYL2PkURSYMVXJyXe92nFRvlYq5hBjLEhblKB+vkd/WVlUYMWigiY07T91Fkk0+4A==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind-apply-helpers: 1.0.1
+      es-errors: 1.3.0
+      gopd: 1.2.0
+    dev: true
+
   /eastasianwidth@0.2.0:
     resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
 
@@ -8140,6 +8340,14 @@ packages:
     dependencies:
       once: 1.4.0
 
+  /enhanced-resolve@5.17.1:
+    resolution: {integrity: sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==}
+    engines: {node: '>=10.13.0'}
+    dependencies:
+      graceful-fs: 4.2.11
+      tapable: 2.2.1
+    dev: true
+
   /enquirer@2.4.1:
     resolution: {integrity: sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==}
     engines: {node: '>=8.6'}
@@ -8211,6 +8419,75 @@ packages:
       which-typed-array: 1.1.11
     dev: true
 
+  /es-abstract@1.23.5:
+    resolution: {integrity: sha512-vlmniQ0WNPwXqA0BnmwV3Ng7HxiGlh6r5U6JcTMNx8OilcAGqVJBHJcPjqOMaczU9fRuRK5Px2BdVyPRnKMMVQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      array-buffer-byte-length: 1.0.1
+      arraybuffer.prototype.slice: 1.0.3
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.8
+      data-view-buffer: 1.0.1
+      data-view-byte-length: 1.0.1
+      data-view-byte-offset: 1.0.0
+      es-define-property: 1.0.1
+      es-errors: 1.3.0
+      es-object-atoms: 1.0.0
+      es-set-tostringtag: 2.0.3
+      es-to-primitive: 1.2.1
+      function.prototype.name: 1.1.6
+      get-intrinsic: 1.2.5
+      get-symbol-description: 1.0.2
+      globalthis: 1.0.4
+      gopd: 1.0.1
+      has-property-descriptors: 1.0.2
+      has-proto: 1.2.0
+      has-symbols: 1.0.3
+      hasown: 2.0.2
+      internal-slot: 1.0.7
+      is-array-buffer: 3.0.4
+      is-callable: 1.2.7
+      is-data-view: 1.0.1
+      is-negative-zero: 2.0.3
+      is-regex: 1.1.4
+      is-shared-array-buffer: 1.0.3
+      is-string: 1.0.7
+      is-typed-array: 1.1.13
+      is-weakref: 1.0.2
+      object-inspect: 1.13.3
+      object-keys: 1.1.1
+      object.assign: 4.1.5
+      regexp.prototype.flags: 1.5.3
+      safe-array-concat: 1.1.2
+      safe-regex-test: 1.0.3
+      string.prototype.trim: 1.2.9
+      string.prototype.trimend: 1.0.8
+      string.prototype.trimstart: 1.0.8
+      typed-array-buffer: 1.0.2
+      typed-array-byte-length: 1.0.1
+      typed-array-byte-offset: 1.0.3
+      typed-array-length: 1.0.7
+      unbox-primitive: 1.0.2
+      which-typed-array: 1.1.16
+    dev: true
+
+  /es-define-property@1.0.1:
+    resolution: {integrity: sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==}
+    engines: {node: '>= 0.4'}
+    dev: true
+
+  /es-errors@1.3.0:
+    resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
+    engines: {node: '>= 0.4'}
+    dev: true
+
+  /es-object-atoms@1.0.0:
+    resolution: {integrity: sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      es-errors: 1.3.0
+    dev: true
+
   /es-set-tostringtag@2.0.1:
     resolution: {integrity: sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==}
     engines: {node: '>= 0.4'}
@@ -8220,12 +8497,27 @@ packages:
       has-tostringtag: 1.0.0
     dev: true
 
+  /es-set-tostringtag@2.0.3:
+    resolution: {integrity: sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      get-intrinsic: 1.2.5
+      has-tostringtag: 1.0.2
+      hasown: 2.0.2
+    dev: true
+
   /es-shim-unscopables@1.0.0:
     resolution: {integrity: sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==}
     dependencies:
       has: 1.0.3
     dev: true
 
+  /es-shim-unscopables@1.0.2:
+    resolution: {integrity: sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==}
+    dependencies:
+      hasown: 2.0.2
+    dev: true
+
   /es-to-primitive@1.2.1:
     resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==}
     engines: {node: '>= 0.4'}
@@ -8484,6 +8776,16 @@ packages:
       source-map: 0.6.1
     dev: true
 
+  /eslint-compat-utils@0.5.1(eslint@8.57.0):
+    resolution: {integrity: sha512-3z3vFexKIEnjHE3zCMRo6fn/e44U7T1khUjg+Hp0ZQMCigh28rALD0nPFBcGZuiLC5rLZa2ubQHDRln09JfU2Q==}
+    engines: {node: '>=12'}
+    peerDependencies:
+      eslint: '>=6.0.0'
+    dependencies:
+      eslint: 8.57.0
+      semver: 7.6.3
+    dev: true
+
   /eslint-config-prettier@9.1.0(eslint@8.57.0):
     resolution: {integrity: sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==}
     hasBin: true
@@ -8493,6 +8795,139 @@ packages:
       eslint: 8.57.0
     dev: true
 
+  /eslint-import-resolver-node@0.3.9:
+    resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==}
+    dependencies:
+      debug: 3.2.7
+      is-core-module: 2.15.1
+      resolve: 1.22.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /eslint-import-resolver-typescript@3.7.0(eslint-plugin-import@2.31.0)(eslint@8.57.0):
+    resolution: {integrity: sha512-Vrwyi8HHxY97K5ebydMtffsWAn1SCR9eol49eCd5fJS4O1WV7PaAjbcjmbfJJSMz/t4Mal212Uz/fQZrOB8mow==}
+    engines: {node: ^14.18.0 || >=16.0.0}
+    peerDependencies:
+      eslint: '*'
+      eslint-plugin-import: '*'
+      eslint-plugin-import-x: '*'
+    peerDependenciesMeta:
+      eslint-plugin-import:
+        optional: true
+      eslint-plugin-import-x:
+        optional: true
+    dependencies:
+      '@nolyfill/is-core-module': 1.0.39
+      debug: 4.3.7
+      enhanced-resolve: 5.17.1
+      eslint: 8.57.0
+      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@7.4.0)(eslint-import-resolver-typescript@3.7.0)(eslint@8.57.0)
+      fast-glob: 3.3.2
+      get-tsconfig: 4.8.1
+      is-bun-module: 1.3.0
+      is-glob: 4.0.3
+      stable-hash: 0.0.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /eslint-module-utils@2.12.0(@typescript-eslint/parser@7.4.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.7.0)(eslint@8.57.0):
+    resolution: {integrity: sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint: '*'
+      eslint-import-resolver-node: '*'
+      eslint-import-resolver-typescript: '*'
+      eslint-import-resolver-webpack: '*'
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
+      eslint:
+        optional: true
+      eslint-import-resolver-node:
+        optional: true
+      eslint-import-resolver-typescript:
+        optional: true
+      eslint-import-resolver-webpack:
+        optional: true
+    dependencies:
+      '@typescript-eslint/parser': 7.4.0(eslint@8.57.0)(typescript@5.6.3)
+      debug: 3.2.7
+      eslint: 8.57.0
+      eslint-import-resolver-node: 0.3.9
+      eslint-import-resolver-typescript: 3.7.0(eslint-plugin-import@2.31.0)(eslint@8.57.0)
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /eslint-plugin-es-x@7.8.0(eslint@8.57.0):
+    resolution: {integrity: sha512-7Ds8+wAAoV3T+LAKeu39Y5BzXCrGKrcISfgKEqTS4BDN8SFEDQd0S43jiQ8vIa3wUKD07qitZdfzlenSi8/0qQ==}
+    engines: {node: ^14.18.0 || >=16.0.0}
+    peerDependencies:
+      eslint: '>=8'
+    dependencies:
+      '@eslint-community/eslint-utils': 4.4.1(eslint@8.57.0)
+      '@eslint-community/regexpp': 4.12.1
+      eslint: 8.57.0
+      eslint-compat-utils: 0.5.1(eslint@8.57.0)
+    dev: true
+
+  /eslint-plugin-import@2.31.0(@typescript-eslint/parser@7.4.0)(eslint-import-resolver-typescript@3.7.0)(eslint@8.57.0):
+    resolution: {integrity: sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
+    dependencies:
+      '@rtsao/scc': 1.1.0
+      '@typescript-eslint/parser': 7.4.0(eslint@8.57.0)(typescript@5.6.3)
+      array-includes: 3.1.8
+      array.prototype.findlastindex: 1.2.5
+      array.prototype.flat: 1.3.2
+      array.prototype.flatmap: 1.3.2
+      debug: 3.2.7
+      doctrine: 2.1.0
+      eslint: 8.57.0
+      eslint-import-resolver-node: 0.3.9
+      eslint-module-utils: 2.12.0(@typescript-eslint/parser@7.4.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.7.0)(eslint@8.57.0)
+      hasown: 2.0.2
+      is-core-module: 2.15.1
+      is-glob: 4.0.3
+      minimatch: 3.1.2
+      object.fromentries: 2.0.8
+      object.groupby: 1.0.3
+      object.values: 1.2.0
+      semver: 6.3.1
+      string.prototype.trimend: 1.0.8
+      tsconfig-paths: 3.15.0
+    transitivePeerDependencies:
+      - eslint-import-resolver-typescript
+      - eslint-import-resolver-webpack
+      - supports-color
+    dev: true
+
+  /eslint-plugin-n@17.15.0(eslint@8.57.0):
+    resolution: {integrity: sha512-xF3zJkOfLlFOm5TvmqmsnA9/fO+/z2pYs0dkuKXKN/ymS6UB1yEcaoIkqxLKQ9Dw/WmLX/Tdh6/5ZS5azVixFQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      eslint: '>=8.23.0'
+    dependencies:
+      '@eslint-community/eslint-utils': 4.4.1(eslint@8.57.0)
+      enhanced-resolve: 5.17.1
+      eslint: 8.57.0
+      eslint-plugin-es-x: 7.8.0(eslint@8.57.0)
+      get-tsconfig: 4.8.1
+      globals: 15.13.0
+      ignore: 5.3.2
+      minimatch: 9.0.5
+      semver: 7.6.3
+    dev: true
+
   /eslint-plugin-prettier@5.1.3(eslint-config-prettier@9.1.0)(eslint@8.57.0)(prettier@3.2.5):
     resolution: {integrity: sha512-C9GCVAs4Eq7ZC/XFQHITLiHJxQngdtraXaM+LoUFoFp/lHNl2Zn8f3WQbe9HvTBBQ9YnKFB0/2Ajdqwo5D1EAw==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -8772,6 +9207,17 @@ packages:
       merge2: 1.4.1
       micromatch: 4.0.5
 
+  /fast-glob@3.3.2:
+    resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==}
+    engines: {node: '>=8.6.0'}
+    dependencies:
+      '@nodelib/fs.stat': 2.0.5
+      '@nodelib/fs.walk': 1.2.8
+      glob-parent: 5.1.2
+      merge2: 1.4.1
+      micromatch: 4.0.5
+    dev: true
+
   /fast-json-stable-stringify@2.1.0:
     resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
     dev: true
@@ -9003,6 +9449,10 @@ packages:
   /function-bind@1.1.1:
     resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}
 
+  /function-bind@1.1.2:
+    resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
+    dev: true
+
   /function.prototype.name@1.1.6:
     resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==}
     engines: {node: '>= 0.4'}
@@ -9054,6 +9504,20 @@ packages:
       has-proto: 1.0.1
       has-symbols: 1.0.3
 
+  /get-intrinsic@1.2.5:
+    resolution: {integrity: sha512-Y4+pKa7XeRUPWFNvOOYHkRYrfzW07oraURSvjDmRVOJ748OrVmeXtpE4+GCEHncjCjkTxPNRt8kEbxDhsn6VTg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind-apply-helpers: 1.0.1
+      dunder-proto: 1.0.0
+      es-define-property: 1.0.1
+      es-errors: 1.3.0
+      function-bind: 1.1.2
+      gopd: 1.2.0
+      has-symbols: 1.1.0
+      hasown: 2.0.2
+    dev: true
+
   /get-package-type@0.1.0:
     resolution: {integrity: sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==}
     engines: {node: '>=8.0.0'}
@@ -9088,6 +9552,21 @@ packages:
       get-intrinsic: 1.2.1
     dev: true
 
+  /get-symbol-description@1.0.2:
+    resolution: {integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.8
+      es-errors: 1.3.0
+      get-intrinsic: 1.2.5
+    dev: true
+
+  /get-tsconfig@4.8.1:
+    resolution: {integrity: sha512-k9PN+cFBmaLWtVz29SkUoqU5O0slLuHJXt/2P+tMVFT+phsSGXGkp9t3rQIqdz0e+06EHNGs3oM6ZX1s2zHxRg==}
+    dependencies:
+      resolve-pkg-maps: 1.0.0
+    dev: true
+
   /get-uri@6.0.3:
     resolution: {integrity: sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==}
     engines: {node: '>= 14'}
@@ -9162,12 +9641,25 @@ packages:
       type-fest: 0.20.2
     dev: true
 
+  /globals@15.13.0:
+    resolution: {integrity: sha512-49TewVEz0UxZjr1WYYsWpPrhyC/B/pA8Bq0fUmet2n+eR7yn0IvNzNaoBwnK6mdkzcN+se7Ez9zUgULTz2QH4g==}
+    engines: {node: '>=18'}
+    dev: true
+
   /globalthis@1.0.3:
     resolution: {integrity: sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==}
     engines: {node: '>= 0.4'}
     dependencies:
       define-properties: 1.2.0
 
+  /globalthis@1.0.4:
+    resolution: {integrity: sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      define-properties: 1.2.1
+      gopd: 1.0.1
+    dev: true
+
   /globby@11.1.0:
     resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
     engines: {node: '>=10'}
@@ -9197,6 +9689,11 @@ packages:
       get-intrinsic: 1.2.1
     dev: true
 
+  /gopd@1.2.0:
+    resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==}
+    engines: {node: '>= 0.4'}
+    dev: true
+
   /graceful-fs@4.2.11:
     resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
     dev: true
@@ -9257,14 +9754,32 @@ packages:
     dependencies:
       get-intrinsic: 1.2.1
 
+  /has-property-descriptors@1.0.2:
+    resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==}
+    dependencies:
+      es-define-property: 1.0.1
+    dev: true
+
   /has-proto@1.0.1:
     resolution: {integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==}
     engines: {node: '>= 0.4'}
 
+  /has-proto@1.2.0:
+    resolution: {integrity: sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      dunder-proto: 1.0.0
+    dev: true
+
   /has-symbols@1.0.3:
     resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
     engines: {node: '>= 0.4'}
 
+  /has-symbols@1.1.0:
+    resolution: {integrity: sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==}
+    engines: {node: '>= 0.4'}
+    dev: true
+
   /has-tostringtag@1.0.0:
     resolution: {integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==}
     engines: {node: '>= 0.4'}
@@ -9272,6 +9787,13 @@ packages:
       has-symbols: 1.0.3
     dev: true
 
+  /has-tostringtag@1.0.2:
+    resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      has-symbols: 1.0.3
+    dev: true
+
   /has-unicode@2.0.1:
     resolution: {integrity: sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==}
     dev: true
@@ -9288,6 +9810,13 @@ packages:
       inherits: 2.0.4
       minimalistic-assert: 1.0.1
 
+  /hasown@2.0.2:
+    resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      function-bind: 1.1.2
+    dev: true
+
   /he@1.2.0:
     resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==}
     hasBin: true
@@ -9446,6 +9975,11 @@ packages:
     resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==}
     engines: {node: '>= 4'}
 
+  /ignore@5.3.2:
+    resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==}
+    engines: {node: '>= 4'}
+    dev: true
+
   /import-cwd@3.0.0:
     resolution: {integrity: sha512-4pnzH16plW+hgvRECbDWpQl3cqtvSofHWh44met7ESfZ8UZOWWddm8hEyDTqREJ9RbYHY8gi8DqmaelApoOGMg==}
     engines: {node: '>=8'}
@@ -9526,6 +10060,15 @@ packages:
       side-channel: 1.0.4
     dev: true
 
+  /internal-slot@1.0.7:
+    resolution: {integrity: sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      es-errors: 1.3.0
+      hasown: 2.0.2
+      side-channel: 1.0.4
+    dev: true
+
   /ioredis@5.3.2:
     resolution: {integrity: sha512-1DKMMzlIHM02eBBVOFQ1+AolGjs6+xEcM4PDL7NqOS6szq7H9jSaEkIUH6/a5Hl241LzW6JLSiAbNvTQjUupUA==}
     engines: {node: '>=12.22.0'}
@@ -9575,6 +10118,14 @@ packages:
       is-typed-array: 1.1.12
     dev: true
 
+  /is-array-buffer@3.0.4:
+    resolution: {integrity: sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.8
+      get-intrinsic: 1.2.5
+    dev: true
+
   /is-arrayish@0.2.1:
     resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
     dev: true
@@ -9582,6 +10133,13 @@ packages:
   /is-arrayish@0.3.2:
     resolution: {integrity: sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==}
 
+  /is-async-function@2.0.0:
+    resolution: {integrity: sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      has-tostringtag: 1.0.2
+    dev: true
+
   /is-bigint@1.0.4:
     resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==}
     dependencies:
@@ -9610,6 +10168,12 @@ packages:
       builtin-modules: 3.3.0
     dev: true
 
+  /is-bun-module@1.3.0:
+    resolution: {integrity: sha512-DgXeu5UWI0IsMQundYb5UAOzm6G2eVnarJ0byP6Tm55iZNKceD59LNPA2L4VvsScTtHcw0yEkVwSf7PC+QoLSA==}
+    dependencies:
+      semver: 7.6.3
+    dev: true
+
   /is-callable@1.2.7:
     resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
     engines: {node: '>= 0.4'}
@@ -9627,6 +10191,20 @@ packages:
     dependencies:
       has: 1.0.3
 
+  /is-core-module@2.15.1:
+    resolution: {integrity: sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      hasown: 2.0.2
+    dev: true
+
+  /is-data-view@1.0.1:
+    resolution: {integrity: sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      is-typed-array: 1.1.13
+    dev: true
+
   /is-date-object@1.0.5:
     resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==}
     engines: {node: '>= 0.4'}
@@ -9638,6 +10216,13 @@ packages:
     resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
     engines: {node: '>=0.10.0'}
 
+  /is-finalizationregistry@1.1.0:
+    resolution: {integrity: sha512-qfMdqbAQEwBw78ZyReKnlA8ezmPdb9BemzIIip/JkjaZUhitfXDkkr+3QTboW0JrSXT1QWyYShpvnNHGZ4c4yA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.8
+    dev: true
+
   /is-fullwidth-code-point@3.0.0:
     resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
     engines: {node: '>=8'}
@@ -9647,6 +10232,13 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
+  /is-generator-function@1.0.10:
+    resolution: {integrity: sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      has-tostringtag: 1.0.2
+    dev: true
+
   /is-glob@4.0.3:
     resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
     engines: {node: '>=0.10.0'}
@@ -9657,6 +10249,11 @@ packages:
     resolution: {integrity: sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==}
     dev: true
 
+  /is-map@2.0.3:
+    resolution: {integrity: sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==}
+    engines: {node: '>= 0.4'}
+    dev: true
+
   /is-module@1.0.0:
     resolution: {integrity: sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==}
     dev: true
@@ -9666,6 +10263,11 @@ packages:
     engines: {node: '>= 0.4'}
     dev: true
 
+  /is-negative-zero@2.0.3:
+    resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==}
+    engines: {node: '>= 0.4'}
+    dev: true
+
   /is-number-object@1.0.7:
     resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==}
     engines: {node: '>= 0.4'}
@@ -9701,12 +10303,24 @@ packages:
       has-tostringtag: 1.0.0
     dev: true
 
+  /is-set@2.0.3:
+    resolution: {integrity: sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==}
+    engines: {node: '>= 0.4'}
+    dev: true
+
   /is-shared-array-buffer@1.0.2:
     resolution: {integrity: sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==}
     dependencies:
       call-bind: 1.0.2
     dev: true
 
+  /is-shared-array-buffer@1.0.3:
+    resolution: {integrity: sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.8
+    dev: true
+
   /is-stream@2.0.1:
     resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
     engines: {node: '>=8'}
@@ -9740,12 +10354,32 @@ packages:
       which-typed-array: 1.1.11
     dev: true
 
+  /is-typed-array@1.1.13:
+    resolution: {integrity: sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      which-typed-array: 1.1.16
+    dev: true
+
+  /is-weakmap@2.0.2:
+    resolution: {integrity: sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==}
+    engines: {node: '>= 0.4'}
+    dev: true
+
   /is-weakref@1.0.2:
     resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==}
     dependencies:
       call-bind: 1.0.2
     dev: true
 
+  /is-weakset@2.0.3:
+    resolution: {integrity: sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.8
+      get-intrinsic: 1.2.5
+    dev: true
+
   /is-windows@1.0.2:
     resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}
     engines: {node: '>=0.10.0'}
@@ -10299,6 +10933,13 @@ packages:
     resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
     dev: true
 
+  /json5@1.0.2:
+    resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==}
+    hasBin: true
+    dependencies:
+      minimist: 1.2.8
+    dev: true
+
   /json5@2.2.3:
     resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
     engines: {node: '>=6'}
@@ -10737,6 +11378,13 @@ packages:
     dependencies:
       brace-expansion: 2.0.1
 
+  /minimatch@9.0.5:
+    resolution: {integrity: sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==}
+    engines: {node: '>=16 || 14 >=14.17'}
+    dependencies:
+      brace-expansion: 2.0.1
+    dev: true
+
   /minimist-options@4.1.0:
     resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==}
     engines: {node: '>= 6'}
@@ -11039,6 +11687,11 @@ packages:
   /object-inspect@1.12.3:
     resolution: {integrity: sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==}
 
+  /object-inspect@1.13.3:
+    resolution: {integrity: sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==}
+    engines: {node: '>= 0.4'}
+    dev: true
+
   /object-keys@1.1.1:
     resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
     engines: {node: '>= 0.4'}
@@ -11053,6 +11706,44 @@ packages:
       object-keys: 1.1.1
     dev: true
 
+  /object.assign@4.1.5:
+    resolution: {integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      has-symbols: 1.0.3
+      object-keys: 1.1.1
+    dev: true
+
+  /object.fromentries@2.0.8:
+    resolution: {integrity: sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-abstract: 1.23.5
+      es-object-atoms: 1.0.0
+    dev: true
+
+  /object.groupby@1.0.3:
+    resolution: {integrity: sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-abstract: 1.23.5
+    dev: true
+
+  /object.values@1.2.0:
+    resolution: {integrity: sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-object-atoms: 1.0.0
+    dev: true
+
   /on-exit-leak-free@2.1.0:
     resolution: {integrity: sha512-VuCaZZAjReZ3vUwgOB8LxAosIurDiAW0s13rI1YwmaP++jvcxP77AWoQvenZebpCA2m8WC1/EosPYPMjnRAp/w==}
 
@@ -11439,6 +12130,11 @@ packages:
       find-up: 4.1.0
     dev: true
 
+  /possible-typed-array-names@1.0.0:
+    resolution: {integrity: sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==}
+    engines: {node: '>= 0.4'}
+    dev: true
+
   /postcss-calc@8.2.4(postcss@8.4.38):
     resolution: {integrity: sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==}
     peerDependencies:
@@ -12261,6 +12957,20 @@ packages:
     dependencies:
       redis-errors: 1.2.0
 
+  /reflect.getprototypeof@1.0.8:
+    resolution: {integrity: sha512-B5dj6usc5dkk8uFliwjwDHM8To5/QwdKz9JcBZ8Ic4G1f0YmeeJTtE/ZTdgRFPAfxZFiUaPhZ1Jcs4qeagItGQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      dunder-proto: 1.0.0
+      es-abstract: 1.23.5
+      es-errors: 1.3.0
+      get-intrinsic: 1.2.5
+      gopd: 1.2.0
+      which-builtin-type: 1.2.0
+    dev: true
+
   /regenerator-runtime@0.14.0:
     resolution: {integrity: sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==}
     dev: true
@@ -12274,6 +12984,16 @@ packages:
       functions-have-names: 1.2.3
     dev: true
 
+  /regexp.prototype.flags@1.5.3:
+    resolution: {integrity: sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-errors: 1.3.0
+      set-function-name: 2.0.2
+    dev: true
+
   /require-directory@2.1.1:
     resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
     engines: {node: '>=0.10.0'}
@@ -12319,6 +13039,10 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /resolve-pkg-maps@1.0.0:
+    resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==}
+    dev: true
+
   /resolve.exports@1.1.1:
     resolution: {integrity: sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==}
     engines: {node: '>=10'}
@@ -12457,6 +13181,16 @@ packages:
       isarray: 2.0.5
     dev: true
 
+  /safe-array-concat@1.1.2:
+    resolution: {integrity: sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==}
+    engines: {node: '>=0.4'}
+    dependencies:
+      call-bind: 1.0.8
+      get-intrinsic: 1.2.5
+      has-symbols: 1.0.3
+      isarray: 2.0.5
+    dev: true
+
   /safe-buffer@5.1.2:
     resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
 
@@ -12475,6 +13209,15 @@ packages:
       is-regex: 1.1.4
     dev: true
 
+  /safe-regex-test@1.0.3:
+    resolution: {integrity: sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.8
+      es-errors: 1.3.0
+      is-regex: 1.1.4
+    dev: true
+
   /safe-stable-stringify@2.4.3:
     resolution: {integrity: sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==}
     engines: {node: '>=10'}
@@ -12570,6 +13313,28 @@ packages:
     resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==}
     dev: true
 
+  /set-function-length@1.2.2:
+    resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      define-data-property: 1.1.4
+      es-errors: 1.3.0
+      function-bind: 1.1.2
+      get-intrinsic: 1.2.5
+      gopd: 1.0.1
+      has-property-descriptors: 1.0.2
+    dev: true
+
+  /set-function-name@2.0.2:
+    resolution: {integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      define-data-property: 1.1.4
+      es-errors: 1.3.0
+      functions-have-names: 1.2.3
+      has-property-descriptors: 1.0.2
+    dev: true
+
   /setprototypeof@1.2.0:
     resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==}
 
@@ -12841,6 +13606,10 @@ packages:
       minipass: 3.3.6
     dev: true
 
+  /stable-hash@0.0.4:
+    resolution: {integrity: sha512-LjdcbuBeLcdETCrPn9i8AYAZ1eCtu4ECAWtP7UleOiZ9LzVxRzzUZEoZ8zB24nhkQnDWyET0I+3sWokSDS3E7g==}
+    dev: true
+
   /stable@0.1.8:
     resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
     deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
@@ -12932,6 +13701,16 @@ packages:
       es-abstract: 1.22.1
     dev: true
 
+  /string.prototype.trim@1.2.9:
+    resolution: {integrity: sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-abstract: 1.23.5
+      es-object-atoms: 1.0.0
+    dev: true
+
   /string.prototype.trimend@1.0.6:
     resolution: {integrity: sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==}
     dependencies:
@@ -12940,6 +13719,14 @@ packages:
       es-abstract: 1.22.1
     dev: true
 
+  /string.prototype.trimend@1.0.8:
+    resolution: {integrity: sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==}
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-object-atoms: 1.0.0
+    dev: true
+
   /string.prototype.trimstart@1.0.7:
     resolution: {integrity: sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==}
     dependencies:
@@ -12948,6 +13735,15 @@ packages:
       es-abstract: 1.22.1
     dev: true
 
+  /string.prototype.trimstart@1.0.8:
+    resolution: {integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
+      es-object-atoms: 1.0.0
+    dev: true
+
   /string_decoder@1.3.0:
     resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
     dependencies:
@@ -13126,6 +13922,11 @@ packages:
       - ts-node
     dev: true
 
+  /tapable@2.2.1:
+    resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==}
+    engines: {node: '>=6'}
+    dev: true
+
   /tar-fs@2.1.1:
     resolution: {integrity: sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==}
     dependencies:
@@ -13341,6 +14142,15 @@ packages:
       yn: 3.1.1
     dev: true
 
+  /tsconfig-paths@3.15.0:
+    resolution: {integrity: sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==}
+    dependencies:
+      '@types/json5': 0.0.29
+      json5: 1.0.2
+      minimist: 1.2.8
+      strip-bom: 3.0.0
+    dev: true
+
   /tslib@1.14.1:
     resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
     dev: false
@@ -13452,6 +14262,15 @@ packages:
       is-typed-array: 1.1.12
     dev: true
 
+  /typed-array-buffer@1.0.2:
+    resolution: {integrity: sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.8
+      es-errors: 1.3.0
+      is-typed-array: 1.1.13
+    dev: true
+
   /typed-array-byte-length@1.0.0:
     resolution: {integrity: sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==}
     engines: {node: '>= 0.4'}
@@ -13462,6 +14281,17 @@ packages:
       is-typed-array: 1.1.12
     dev: true
 
+  /typed-array-byte-length@1.0.1:
+    resolution: {integrity: sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.8
+      for-each: 0.3.3
+      gopd: 1.0.1
+      has-proto: 1.2.0
+      is-typed-array: 1.1.13
+    dev: true
+
   /typed-array-byte-offset@1.0.0:
     resolution: {integrity: sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==}
     engines: {node: '>= 0.4'}
@@ -13473,6 +14303,19 @@ packages:
       is-typed-array: 1.1.12
     dev: true
 
+  /typed-array-byte-offset@1.0.3:
+    resolution: {integrity: sha512-GsvTyUHTriq6o/bHcTd0vM7OQ9JEdlvluu9YISaA7+KzDzPaIzEeDFNkTfhdE3MYcNhNi0vq/LlegYgIs5yPAw==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.8
+      for-each: 0.3.3
+      gopd: 1.0.1
+      has-proto: 1.2.0
+      is-typed-array: 1.1.13
+      reflect.getprototypeof: 1.0.8
+    dev: true
+
   /typed-array-length@1.0.4:
     resolution: {integrity: sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==}
     dependencies:
@@ -13481,6 +14324,18 @@ packages:
       is-typed-array: 1.1.12
     dev: true
 
+  /typed-array-length@1.0.7:
+    resolution: {integrity: sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.8
+      for-each: 0.3.3
+      gopd: 1.0.1
+      is-typed-array: 1.1.13
+      possible-typed-array-names: 1.0.0
+      reflect.getprototypeof: 1.0.8
+    dev: true
+
   /typed-emitter@2.1.0:
     resolution: {integrity: sha512-g/KzbYKbH5C2vPkaXGu8DJlHrGKHLsM25Zg9WuC9pMGfuvT+X25tZQWo5fK1BjBm8+UrVE9LDCvaY0CQk+fXDA==}
     optionalDependencies:
@@ -13685,6 +14540,35 @@ packages:
       is-symbol: 1.0.4
     dev: true
 
+  /which-builtin-type@1.2.0:
+    resolution: {integrity: sha512-I+qLGQ/vucCby4tf5HsLmGueEla4ZhwTBSqaooS+Y0BuxN4Cp+okmGuV+8mXZ84KDI9BA+oklo+RzKg0ONdSUA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.8
+      function.prototype.name: 1.1.6
+      has-tostringtag: 1.0.2
+      is-async-function: 2.0.0
+      is-date-object: 1.0.5
+      is-finalizationregistry: 1.1.0
+      is-generator-function: 1.0.10
+      is-regex: 1.1.4
+      is-weakref: 1.0.2
+      isarray: 2.0.5
+      which-boxed-primitive: 1.0.2
+      which-collection: 1.0.2
+      which-typed-array: 1.1.16
+    dev: true
+
+  /which-collection@1.0.2:
+    resolution: {integrity: sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      is-map: 2.0.3
+      is-set: 2.0.3
+      is-weakmap: 2.0.2
+      is-weakset: 2.0.3
+    dev: true
+
   /which-module@2.0.1:
     resolution: {integrity: sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==}
     dev: true
@@ -13708,6 +14592,17 @@ packages:
       has-tostringtag: 1.0.0
     dev: true
 
+  /which-typed-array@1.1.16:
+    resolution: {integrity: sha512-g+N+GAWiRj66DngFwHvISJd+ITsyphZvD1vChfVg6cEdnzy53GzB3oy0fUNlvhz7H7+MiqhYr26qxQShCpKTTQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.8
+      for-each: 0.3.3
+      gopd: 1.0.1
+      has-tostringtag: 1.0.2
+    dev: true
+
   /which@1.3.1:
     resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
     hasBin: true
diff --git a/services/bsky/api.js b/services/bsky/api.js
index e14b43f2d32..56c769b9d47 100644
--- a/services/bsky/api.js
+++ b/services/bsky/api.js
@@ -1,4 +1,5 @@
 /* eslint-env node */
+/* eslint-disable import/order */
 
 'use strict'
 
@@ -39,11 +40,12 @@ dd.tracer._tracer.startSpan = function (name, options) {
 }
 
 // Tracer code above must come before anything else
-const path = require('node:path')
 const assert = require('node:assert')
-const cluster = require('cluster')
+const cluster = require('node:cluster')
+const path = require('node:path')
+
+const { BskyAppView, ServerConfig } = require('@atproto/bsky')
 const { Secp256k1Keypair } = require('@atproto/crypto')
-const { ServerConfig, BskyAppView } = require('@atproto/bsky')
 
 const main = async () => {
   const env = getEnv()
diff --git a/services/bsync/index.js b/services/bsync/index.js
index 93aa1a10fc8..ae5e162e53d 100644
--- a/services/bsync/index.js
+++ b/services/bsync/index.js
@@ -7,10 +7,10 @@ require('dd-trace') // Only works with commonjs
 
 // Tracer code above must come before anything else
 const {
+  default: BsyncService,
   envToCfg,
-  readEnv,
   httpLogger,
-  default: BsyncService,
+  readEnv,
 } = require('@atproto/bsync')
 
 const main = async () => {
diff --git a/services/ozone/api.js b/services/ozone/api.js
index 0b957b0de44..cc05cfb252b 100644
--- a/services/ozone/api.js
+++ b/services/ozone/api.js
@@ -13,19 +13,19 @@ require('dd-trace') // Only works with commonjs
   })
 
 // Tracer code above must come before anything else
-const path = require('path')
+const path = require('node:path')
 const {
   BunnyInvalidator,
   CloudfrontInvalidator,
   MultiImageInvalidator,
 } = require('@atproto/aws')
 const {
+  Database,
   OzoneService,
   envToCfg,
   envToSecrets,
-  readEnv,
   httpLogger,
-  Database,
+  readEnv,
 } = require('@atproto/ozone')
 
 const main = async () => {
diff --git a/services/pds/index.js b/services/pds/index.js
index 9022216d741..04dc2e64814 100644
--- a/services/pds/index.js
+++ b/services/pds/index.js
@@ -6,8 +6,8 @@ const {
   PDS,
   envToCfg,
   envToSecrets,
-  readEnv,
   httpLogger,
+  readEnv,
 } = require('@atproto/pds')
 const pkg = require('@atproto/pds/package.json')
 
diff --git a/services/pds/run-script.js b/services/pds/run-script.js
index ee9d627800c..600f42db70d 100644
--- a/services/pds/run-script.js
+++ b/services/pds/run-script.js
@@ -2,10 +2,10 @@
 
 'use strict'
 const {
+  AppContext,
   envToCfg,
   envToSecrets,
   readEnv,
-  AppContext,
   scripts,
 } = require('@atproto/pds')
 
diff --git a/services/pds/tracer.js b/services/pds/tracer.js
index 67e9cce5f87..de770ba7fd5 100644
--- a/services/pds/tracer.js
+++ b/services/pds/tracer.js
@@ -1,13 +1,12 @@
 /* eslint-env node */
+/* eslint-disable import/order */
 
 'use strict'
 
 const { registerInstrumentations } = require('@opentelemetry/instrumentation')
-
 const {
   BetterSqlite3Instrumentation,
 } = require('opentelemetry-plugin-better-sqlite3')
-
 const { TracerProvider } = require('dd-trace') // Only works with commonjs
   .init({ logInjection: true })
   .use('express', {
@@ -22,7 +21,7 @@ registerInstrumentations({
   instrumentations: [new BetterSqlite3Instrumentation()],
 })
 
-const path = require('path')
+const path = require('node:path')
 
 function maintainXrpcResource(span, req) {
   // Show actual xrpc method as resource rather than the route pattern

From 87ed907a6b96b408c02c9af819cec8380a453254 Mon Sep 17 00:00:00 2001
From: Eric Bailey <git@esb.lol>
Date: Wed, 5 Feb 2025 17:43:27 -0600
Subject: [PATCH 048/101] Add `setPostInteractionSettings` and related prefs
 (#3494)

* Add setPostInteractionSettings and related prefs

* Fix test

* Align types and implementation

* Tighten up, clarifying descriptions

* Fix test

* Format
---
 .changeset/tame-cobras-lick.md                |   5 +
 lexicons/app/bsky/actor/defs.json             |  32 +++-
 lexicons/app/bsky/feed/postgate.json          |   1 +
 lexicons/app/bsky/feed/threadgate.json        |   1 +
 packages/api/src/agent.ts                     |  55 ++++++
 packages/api/src/client/lexicons.ts           |  37 ++++
 .../src/client/types/app/bsky/actor/defs.ts   |  36 ++++
 .../client/types/app/bsky/feed/postgate.ts    |   1 +
 .../client/types/app/bsky/feed/threadgate.ts  |   1 +
 packages/api/src/types.ts                     |   1 +
 packages/api/tests/atp-agent.test.ts          | 178 ++++++++++++++++++
 packages/api/tests/moderation-prefs.test.ts   |  16 ++
 packages/bsky/src/lexicon/lexicons.ts         |  37 ++++
 .../src/lexicon/types/app/bsky/actor/defs.ts  |  36 ++++
 .../lexicon/types/app/bsky/feed/postgate.ts   |   1 +
 .../lexicon/types/app/bsky/feed/threadgate.ts |   1 +
 packages/ozone/src/lexicon/lexicons.ts        |  37 ++++
 .../src/lexicon/types/app/bsky/actor/defs.ts  |  36 ++++
 .../lexicon/types/app/bsky/feed/postgate.ts   |   1 +
 .../lexicon/types/app/bsky/feed/threadgate.ts |   1 +
 packages/pds/src/lexicon/lexicons.ts          |  37 ++++
 .../src/lexicon/types/app/bsky/actor/defs.ts  |  36 ++++
 .../lexicon/types/app/bsky/feed/postgate.ts   |   1 +
 .../lexicon/types/app/bsky/feed/threadgate.ts |   1 +
 24 files changed, 588 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/tame-cobras-lick.md

diff --git a/.changeset/tame-cobras-lick.md b/.changeset/tame-cobras-lick.md
new file mode 100644
index 00000000000..d2cb328651b
--- /dev/null
+++ b/.changeset/tame-cobras-lick.md
@@ -0,0 +1,5 @@
+---
+"@atproto/api": patch
+---
+
+Add `setPostInteractionSettings` for configuring default interaction settings for creation of posts
diff --git a/lexicons/app/bsky/actor/defs.json b/lexicons/app/bsky/actor/defs.json
index d2dd899ed57..5c1cb3ff021 100644
--- a/lexicons/app/bsky/actor/defs.json
+++ b/lexicons/app/bsky/actor/defs.json
@@ -174,7 +174,8 @@
           "#mutedWordsPref",
           "#hiddenPostsPref",
           "#bskyAppStatePref",
-          "#labelersPref"
+          "#labelersPref",
+          "#postInteractionSettingsPref"
         ]
       }
     },
@@ -468,6 +469,35 @@
           "description": "The date and time at which the NUX will expire and should be considered completed."
         }
       }
+    },
+    "postInteractionSettingsPref": {
+      "type": "object",
+      "description": "Default post interaction settings for the account. These values should be applied as default values when creating new posts. These refs should mirror the threadgate and postgate records exactly.",
+      "required": [],
+      "properties": {
+        "threadgateAllowRules": {
+          "description": "Matches threadgate record. List of rules defining who can reply to this users posts. If value is an empty array, no one can reply. If value is undefined, anyone can reply.",
+          "type": "array",
+          "maxLength": 5,
+          "items": {
+            "type": "union",
+            "refs": [
+              "app.bsky.feed.threadgate#mentionRule",
+              "app.bsky.feed.threadgate#followingRule",
+              "app.bsky.feed.threadgate#listRule"
+            ]
+          }
+        },
+        "postgateEmbeddingRules": {
+          "description": "Matches postgate record. List of rules defining who can embed this users posts. If value is an empty array or is undefined, no particular rules apply and anyone can embed.",
+          "type": "array",
+          "maxLength": 5,
+          "items": {
+            "type": "union",
+            "refs": ["app.bsky.feed.postgate#disableRule"]
+          }
+        }
+      }
     }
   }
 }
diff --git a/lexicons/app/bsky/feed/postgate.json b/lexicons/app/bsky/feed/postgate.json
index e442e10ebd8..d98a6731345 100644
--- a/lexicons/app/bsky/feed/postgate.json
+++ b/lexicons/app/bsky/feed/postgate.json
@@ -26,6 +26,7 @@
             "description": "List of AT-URIs embedding this post that the author has detached from."
           },
           "embeddingRules": {
+            "description": "List of rules defining who can embed this post. If value is an empty array or is undefined, no particular rules apply and anyone can embed.",
             "type": "array",
             "maxLength": 5,
             "items": {
diff --git a/lexicons/app/bsky/feed/threadgate.json b/lexicons/app/bsky/feed/threadgate.json
index 2da5a771db9..c3f05d168de 100644
--- a/lexicons/app/bsky/feed/threadgate.json
+++ b/lexicons/app/bsky/feed/threadgate.json
@@ -16,6 +16,7 @@
             "description": "Reference (AT-URI) to the post record."
           },
           "allow": {
+            "description": "List of rules defining who can reply to this post. If value is an empty array, no one can reply. If value is undefined, anyone can reply.",
             "type": "array",
             "maxLength": 5,
             "items": {
diff --git a/packages/api/src/agent.ts b/packages/api/src/agent.ts
index b0be3ba7946..ec4cda02fb4 100644
--- a/packages/api/src/agent.ts
+++ b/packages/api/src/agent.ts
@@ -583,6 +583,10 @@ export class Agent extends XrpcClient {
         activeProgressGuide: undefined,
         nuxs: [],
       },
+      postInteractionSettings: {
+        threadgateAllowRules: undefined,
+        postgateEmbeddingRules: undefined,
+      },
     }
     const res = await this.app.bsky.actor.getPreferences({})
     const labelPrefs: AppBskyActorDefs.ContentLabelPref[] = []
@@ -687,6 +691,14 @@ export class Agent extends XrpcClient {
         prefs.bskyAppState.queuedNudges = v.queuedNudges || []
         prefs.bskyAppState.activeProgressGuide = v.activeProgressGuide
         prefs.bskyAppState.nuxs = v.nuxs || []
+      } else if (
+        AppBskyActorDefs.isPostInteractionSettingsPref(pref) &&
+        AppBskyActorDefs.validatePostInteractionSettingsPref(pref).success
+      ) {
+        prefs.postInteractionSettings.threadgateAllowRules =
+          pref.threadgateAllowRules
+        prefs.postInteractionSettings.postgateEmbeddingRules =
+          pref.postgateEmbeddingRules
       }
     }
 
@@ -1463,6 +1475,49 @@ export class Agent extends XrpcClient {
     })
   }
 
+  async setPostInteractionSettings(
+    settings: AppBskyActorDefs.PostInteractionSettingsPref,
+  ) {
+    if (
+      !AppBskyActorDefs.validatePostInteractionSettingsPref(settings).success
+    ) {
+      throw new Error('Invalid post interaction settings')
+    }
+
+    await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
+      let prev = prefs.findLast(
+        (pref) =>
+          AppBskyActorDefs.isPostInteractionSettingsPref(pref) &&
+          AppBskyActorDefs.validatePostInteractionSettingsPref(pref).success,
+      ) as AppBskyActorDefs.PostInteractionSettingsPref
+
+      if (!prev) {
+        prev = {
+          /**
+           * Matches handling of `threadgate.allow` where `undefined` means "everyone"
+           */
+          threadgateAllowRules: undefined,
+          postgateEmbeddingRules: undefined,
+        }
+      }
+
+      /**
+       * Matches handling of `threadgate.allow` where `undefined` means "everyone"
+       */
+      prev.threadgateAllowRules = settings.threadgateAllowRules
+      prev.postgateEmbeddingRules = settings.postgateEmbeddingRules
+
+      return prefs
+        .filter((p) => !AppBskyActorDefs.isPostInteractionSettingsPref(p))
+        .concat([
+          {
+            ...prev,
+            $type: 'app.bsky.actor.defs#postInteractionSettingsPref',
+          },
+        ])
+    })
+  }
+
   //- Private methods
 
   #prefsLock = new AwaitLock()
diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
index b8f90be1cce..da60722b17a 100644
--- a/packages/api/src/client/lexicons.ts
+++ b/packages/api/src/client/lexicons.ts
@@ -4381,6 +4381,7 @@ export const schemaDict = {
             'lex:app.bsky.actor.defs#hiddenPostsPref',
             'lex:app.bsky.actor.defs#bskyAppStatePref',
             'lex:app.bsky.actor.defs#labelersPref',
+            'lex:app.bsky.actor.defs#postInteractionSettingsPref',
           ],
         },
       },
@@ -4714,6 +4715,38 @@ export const schemaDict = {
           },
         },
       },
+      postInteractionSettingsPref: {
+        type: 'object',
+        description:
+          'Default post interaction settings for the account. These values should be applied as default values when creating new posts. These refs should mirror the threadgate and postgate records exactly.',
+        required: [],
+        properties: {
+          threadgateAllowRules: {
+            description:
+              'Matches threadgate record. List of rules defining who can reply to this users posts. If value is an empty array, no one can reply. If value is undefined, anyone can reply.',
+            type: 'array',
+            maxLength: 5,
+            items: {
+              type: 'union',
+              refs: [
+                'lex:app.bsky.feed.threadgate#mentionRule',
+                'lex:app.bsky.feed.threadgate#followingRule',
+                'lex:app.bsky.feed.threadgate#listRule',
+              ],
+            },
+          },
+          postgateEmbeddingRules: {
+            description:
+              'Matches postgate record. List of rules defining who can embed this users posts. If value is an empty array or is undefined, no particular rules apply and anyone can embed.',
+            type: 'array',
+            maxLength: 5,
+            items: {
+              type: 'union',
+              refs: ['lex:app.bsky.feed.postgate#disableRule'],
+            },
+          },
+        },
+      },
     },
   },
   AppBskyActorGetPreferences: {
@@ -7120,6 +7153,8 @@ export const schemaDict = {
                 'List of AT-URIs embedding this post that the author has detached from.',
             },
             embeddingRules: {
+              description:
+                'List of rules defining who can embed this post. If value is an empty array or is undefined, no particular rules apply and anyone can embed.',
               type: 'array',
               maxLength: 5,
               items: {
@@ -7333,6 +7368,8 @@ export const schemaDict = {
               description: 'Reference (AT-URI) to the post record.',
             },
             allow: {
+              description:
+                'List of rules defining who can reply to this post. If value is an empty array, no one can reply. If value is undefined, anyone can reply.',
               type: 'array',
               maxLength: 5,
               items: {
diff --git a/packages/api/src/client/types/app/bsky/actor/defs.ts b/packages/api/src/client/types/app/bsky/actor/defs.ts
index 78cff825671..fa1dc66a0ca 100644
--- a/packages/api/src/client/types/app/bsky/actor/defs.ts
+++ b/packages/api/src/client/types/app/bsky/actor/defs.ts
@@ -8,6 +8,8 @@ import { CID } from 'multiformats/cid'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as AppBskyGraphDefs from '../graph/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import * as AppBskyFeedThreadgate from '../feed/threadgate'
+import * as AppBskyFeedPostgate from '../feed/postgate'
 
 export interface ProfileViewBasic {
   did: string
@@ -188,6 +190,7 @@ export type Preferences = (
   | HiddenPostsPref
   | BskyAppStatePref
   | LabelersPref
+  | PostInteractionSettingsPref
   | { $type: string; [k: string]: unknown }
 )[]
 
@@ -532,3 +535,36 @@ export function isNux(v: unknown): v is Nux {
 export function validateNux(v: unknown): ValidationResult {
   return lexicons.validate('app.bsky.actor.defs#nux', v)
 }
+
+/** Default post interaction settings for the account. These values should be applied as default values when creating new posts. These refs should mirror the threadgate and postgate records exactly. */
+export interface PostInteractionSettingsPref {
+  /** Matches threadgate record. List of rules defining who can reply to this users posts. If value is an empty array, no one can reply. If value is undefined, anyone can reply. */
+  threadgateAllowRules?: (
+    | AppBskyFeedThreadgate.MentionRule
+    | AppBskyFeedThreadgate.FollowingRule
+    | AppBskyFeedThreadgate.ListRule
+    | { $type: string; [k: string]: unknown }
+  )[]
+  /** Matches postgate record. List of rules defining who can embed this users posts. If value is an empty array or is undefined, no particular rules apply and anyone can embed. */
+  postgateEmbeddingRules?: (
+    | AppBskyFeedPostgate.DisableRule
+    | { $type: string; [k: string]: unknown }
+  )[]
+  [k: string]: unknown
+}
+
+export function isPostInteractionSettingsPref(
+  v: unknown,
+): v is PostInteractionSettingsPref {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'app.bsky.actor.defs#postInteractionSettingsPref'
+  )
+}
+
+export function validatePostInteractionSettingsPref(
+  v: unknown,
+): ValidationResult {
+  return lexicons.validate('app.bsky.actor.defs#postInteractionSettingsPref', v)
+}
diff --git a/packages/api/src/client/types/app/bsky/feed/postgate.ts b/packages/api/src/client/types/app/bsky/feed/postgate.ts
index aad8496699a..e3028385873 100644
--- a/packages/api/src/client/types/app/bsky/feed/postgate.ts
+++ b/packages/api/src/client/types/app/bsky/feed/postgate.ts
@@ -12,6 +12,7 @@ export interface Record {
   post: string
   /** List of AT-URIs embedding this post that the author has detached from. */
   detachedEmbeddingUris?: string[]
+  /** List of rules defining who can embed this post. If value is an empty array or is undefined, no particular rules apply and anyone can embed. */
   embeddingRules?: (DisableRule | { $type: string; [k: string]: unknown })[]
   [k: string]: unknown
 }
diff --git a/packages/api/src/client/types/app/bsky/feed/threadgate.ts b/packages/api/src/client/types/app/bsky/feed/threadgate.ts
index 558027fb8e9..4a8159e8844 100644
--- a/packages/api/src/client/types/app/bsky/feed/threadgate.ts
+++ b/packages/api/src/client/types/app/bsky/feed/threadgate.ts
@@ -9,6 +9,7 @@ import { CID } from 'multiformats/cid'
 export interface Record {
   /** Reference (AT-URI) to the post record. */
   post: string
+  /** List of rules defining who can reply to this post. If value is an empty array, no one can reply. If value is undefined, anyone can reply. */
   allow?: (
     | MentionRule
     | FollowingRule
diff --git a/packages/api/src/types.ts b/packages/api/src/types.ts
index fba5b2deebf..1bb0fa5c2ce 100644
--- a/packages/api/src/types.ts
+++ b/packages/api/src/types.ts
@@ -109,4 +109,5 @@ export interface BskyPreferences {
     activeProgressGuide: AppBskyActorDefs.BskyAppProgressGuide | undefined
     nuxs: AppBskyActorDefs.Nux[]
   }
+  postInteractionSettings: AppBskyActorDefs.PostInteractionSettingsPref
 }
diff --git a/packages/api/tests/atp-agent.test.ts b/packages/api/tests/atp-agent.test.ts
index 823faf63682..86fbd8ac18e 100644
--- a/packages/api/tests/atp-agent.test.ts
+++ b/packages/api/tests/atp-agent.test.ts
@@ -278,6 +278,10 @@ describe('agent', () => {
           queuedNudges: [],
           nuxs: [],
         },
+        postInteractionSettings: {
+          threadgateAllowRules: undefined,
+          postgateEmbeddingRules: undefined,
+        },
       })
 
       await agent.setAdultContentEnabled(true)
@@ -320,6 +324,10 @@ describe('agent', () => {
           queuedNudges: [],
           nuxs: [],
         },
+        postInteractionSettings: {
+          threadgateAllowRules: undefined,
+          postgateEmbeddingRules: undefined,
+        },
       })
 
       await agent.setAdultContentEnabled(false)
@@ -362,6 +370,10 @@ describe('agent', () => {
           queuedNudges: [],
           nuxs: [],
         },
+        postInteractionSettings: {
+          threadgateAllowRules: undefined,
+          postgateEmbeddingRules: undefined,
+        },
       })
 
       await agent.setContentLabelPref('misinfo', 'hide')
@@ -404,6 +416,10 @@ describe('agent', () => {
           queuedNudges: [],
           nuxs: [],
         },
+        postInteractionSettings: {
+          threadgateAllowRules: undefined,
+          postgateEmbeddingRules: undefined,
+        },
       })
 
       await agent.setContentLabelPref('spam', 'ignore')
@@ -450,6 +466,10 @@ describe('agent', () => {
           queuedNudges: [],
           nuxs: [],
         },
+        postInteractionSettings: {
+          threadgateAllowRules: undefined,
+          postgateEmbeddingRules: undefined,
+        },
       })
 
       await agent.addSavedFeed('at://bob.com/app.bsky.feed.generator/fake')
@@ -499,6 +519,10 @@ describe('agent', () => {
           queuedNudges: [],
           nuxs: [],
         },
+        postInteractionSettings: {
+          threadgateAllowRules: undefined,
+          postgateEmbeddingRules: undefined,
+        },
       })
 
       await agent.addPinnedFeed('at://bob.com/app.bsky.feed.generator/fake')
@@ -548,6 +572,10 @@ describe('agent', () => {
           queuedNudges: [],
           nuxs: [],
         },
+        postInteractionSettings: {
+          threadgateAllowRules: undefined,
+          postgateEmbeddingRules: undefined,
+        },
       })
 
       await agent.removePinnedFeed('at://bob.com/app.bsky.feed.generator/fake')
@@ -597,6 +625,10 @@ describe('agent', () => {
           queuedNudges: [],
           nuxs: [],
         },
+        postInteractionSettings: {
+          threadgateAllowRules: undefined,
+          postgateEmbeddingRules: undefined,
+        },
       })
 
       await agent.removeSavedFeed('at://bob.com/app.bsky.feed.generator/fake')
@@ -646,6 +678,10 @@ describe('agent', () => {
           queuedNudges: [],
           nuxs: [],
         },
+        postInteractionSettings: {
+          threadgateAllowRules: undefined,
+          postgateEmbeddingRules: undefined,
+        },
       })
 
       await agent.addPinnedFeed('at://bob.com/app.bsky.feed.generator/fake')
@@ -695,6 +731,10 @@ describe('agent', () => {
           queuedNudges: [],
           nuxs: [],
         },
+        postInteractionSettings: {
+          threadgateAllowRules: undefined,
+          postgateEmbeddingRules: undefined,
+        },
       })
 
       await agent.addPinnedFeed('at://bob.com/app.bsky.feed.generator/fake2')
@@ -750,6 +790,10 @@ describe('agent', () => {
           queuedNudges: [],
           nuxs: [],
         },
+        postInteractionSettings: {
+          threadgateAllowRules: undefined,
+          postgateEmbeddingRules: undefined,
+        },
       })
 
       await agent.removeSavedFeed('at://bob.com/app.bsky.feed.generator/fake')
@@ -799,6 +843,10 @@ describe('agent', () => {
           queuedNudges: [],
           nuxs: [],
         },
+        postInteractionSettings: {
+          threadgateAllowRules: undefined,
+          postgateEmbeddingRules: undefined,
+        },
       })
 
       await agent.setPersonalDetails({ birthDate: '2023-09-11T18:05:42.556Z' })
@@ -848,6 +896,10 @@ describe('agent', () => {
           queuedNudges: [],
           nuxs: [],
         },
+        postInteractionSettings: {
+          threadgateAllowRules: undefined,
+          postgateEmbeddingRules: undefined,
+        },
       })
 
       await agent.setFeedViewPrefs('home', { hideReplies: true })
@@ -897,6 +949,10 @@ describe('agent', () => {
           queuedNudges: [],
           nuxs: [],
         },
+        postInteractionSettings: {
+          threadgateAllowRules: undefined,
+          postgateEmbeddingRules: undefined,
+        },
       })
 
       await agent.setFeedViewPrefs('home', { hideReplies: false })
@@ -946,6 +1002,10 @@ describe('agent', () => {
           queuedNudges: [],
           nuxs: [],
         },
+        postInteractionSettings: {
+          threadgateAllowRules: undefined,
+          postgateEmbeddingRules: undefined,
+        },
       })
 
       await agent.setFeedViewPrefs('other', { hideReplies: true })
@@ -1002,6 +1062,10 @@ describe('agent', () => {
           queuedNudges: [],
           nuxs: [],
         },
+        postInteractionSettings: {
+          threadgateAllowRules: undefined,
+          postgateEmbeddingRules: undefined,
+        },
       })
 
       await agent.setThreadViewPrefs({ sort: 'random' })
@@ -1058,6 +1122,10 @@ describe('agent', () => {
           queuedNudges: [],
           nuxs: [],
         },
+        postInteractionSettings: {
+          threadgateAllowRules: undefined,
+          postgateEmbeddingRules: undefined,
+        },
       })
 
       await agent.setThreadViewPrefs({ sort: 'oldest' })
@@ -1114,6 +1182,10 @@ describe('agent', () => {
           queuedNudges: [],
           nuxs: [],
         },
+        postInteractionSettings: {
+          threadgateAllowRules: undefined,
+          postgateEmbeddingRules: undefined,
+        },
       })
 
       await agent.setInterestsPref({ tags: ['foo', 'bar'] })
@@ -1170,6 +1242,10 @@ describe('agent', () => {
           queuedNudges: [],
           nuxs: [],
         },
+        postInteractionSettings: {
+          threadgateAllowRules: undefined,
+          postgateEmbeddingRules: undefined,
+        },
       })
     })
 
@@ -1353,6 +1429,10 @@ describe('agent', () => {
           queuedNudges: ['two'],
           nuxs: [],
         },
+        postInteractionSettings: {
+          threadgateAllowRules: undefined,
+          postgateEmbeddingRules: undefined,
+        },
       })
 
       await agent.setAdultContentEnabled(false)
@@ -1411,6 +1491,10 @@ describe('agent', () => {
           queuedNudges: ['two'],
           nuxs: [],
         },
+        postInteractionSettings: {
+          threadgateAllowRules: undefined,
+          postgateEmbeddingRules: undefined,
+        },
       })
 
       await agent.setContentLabelPref('porn', 'ignore')
@@ -1470,6 +1554,10 @@ describe('agent', () => {
           queuedNudges: ['two'],
           nuxs: [],
         },
+        postInteractionSettings: {
+          threadgateAllowRules: undefined,
+          postgateEmbeddingRules: undefined,
+        },
       })
 
       await agent.removeLabeler('did:plc:other')
@@ -1525,6 +1613,10 @@ describe('agent', () => {
           queuedNudges: ['two'],
           nuxs: [],
         },
+        postInteractionSettings: {
+          threadgateAllowRules: undefined,
+          postgateEmbeddingRules: undefined,
+        },
       })
 
       await agent.addPinnedFeed('at://bob.com/app.bsky.feed.generator/fake')
@@ -1580,6 +1672,10 @@ describe('agent', () => {
           queuedNudges: ['two'],
           nuxs: [],
         },
+        postInteractionSettings: {
+          threadgateAllowRules: undefined,
+          postgateEmbeddingRules: undefined,
+        },
       })
 
       await agent.setPersonalDetails({ birthDate: '2023-09-11T18:05:42.556Z' })
@@ -1635,6 +1731,10 @@ describe('agent', () => {
           queuedNudges: ['two'],
           nuxs: [],
         },
+        postInteractionSettings: {
+          threadgateAllowRules: undefined,
+          postgateEmbeddingRules: undefined,
+        },
       })
 
       await agent.setFeedViewPrefs('home', {
@@ -1702,6 +1802,10 @@ describe('agent', () => {
           queuedNudges: ['two', 'three'],
           nuxs: [],
         },
+        postInteractionSettings: {
+          threadgateAllowRules: undefined,
+          postgateEmbeddingRules: undefined,
+        },
       })
 
       const res = await agent.app.bsky.actor.getPreferences()
@@ -3337,6 +3441,80 @@ describe('agent', () => {
       })
     })
 
+    describe('setPostInteractionSettings', () => {
+      let agent: AtpAgent
+
+      beforeAll(async () => {
+        agent = new AtpAgent({ service: network.pds.url })
+
+        await agent.createAccount({
+          handle: 'pints.test',
+          email: 'pints@test.com',
+          password: 'password',
+        })
+      })
+
+      it('works', async () => {
+        const next: AppBskyActorDefs.PostInteractionSettingsPref = {
+          threadgateAllowRules: [
+            { $type: 'app.bsky.feed.threadgate#mentionRule' },
+          ],
+          postgateEmbeddingRules: [],
+        }
+
+        await agent.setPostInteractionSettings(next)
+
+        const prefs = await agent.getPreferences()
+
+        expect(prefs.postInteractionSettings).toEqual(next)
+      })
+
+      it('clears', async () => {
+        const next: AppBskyActorDefs.PostInteractionSettingsPref = {
+          threadgateAllowRules: [],
+          postgateEmbeddingRules: [],
+        }
+
+        await agent.setPostInteractionSettings(next)
+
+        const prefs = await agent.getPreferences()
+
+        expect(prefs.postInteractionSettings).toEqual(next)
+      })
+
+      /**
+       * Logic matches threadgate `allow` logic, where `undefined` means "anyone
+       * can reply" and an empty array means "no one can reply".
+       *
+       * Postgate `embeddingRules` behaves differently, where `undefined` and
+       * an empty array both mean "no particular rules applied".
+       *
+       * Both props are optional though, so for easier sharing of types, we
+       * allow `undefined`.
+       */
+      it('clears using undefined', async () => {
+        const next: AppBskyActorDefs.PostInteractionSettingsPref = {
+          threadgateAllowRules: undefined,
+          postgateEmbeddingRules: undefined,
+        }
+
+        await agent.setPostInteractionSettings(next)
+
+        const prefs = await agent.getPreferences()
+
+        expect(prefs.postInteractionSettings).toEqual(next)
+      })
+
+      it('validates inputs', async () => {
+        expect(() =>
+          agent.setPostInteractionSettings({
+            threadgateAllowRules: [{ key: 'string' }],
+            postgateEmbeddingRules: [],
+          }),
+        ).rejects.toThrow()
+      })
+    })
+
     // end
   })
 })
diff --git a/packages/api/tests/moderation-prefs.test.ts b/packages/api/tests/moderation-prefs.test.ts
index ab980e4d567..a9ce47314c5 100644
--- a/packages/api/tests/moderation-prefs.test.ts
+++ b/packages/api/tests/moderation-prefs.test.ts
@@ -86,6 +86,10 @@ describe('agent', () => {
         queuedNudges: [],
         nuxs: [],
       },
+      postInteractionSettings: {
+        threadgateAllowRules: undefined,
+        postgateEmbeddingRules: undefined,
+      },
     })
   })
 
@@ -136,6 +140,10 @@ describe('agent', () => {
         queuedNudges: [],
         nuxs: [],
       },
+      postInteractionSettings: {
+        threadgateAllowRules: undefined,
+        postgateEmbeddingRules: undefined,
+      },
     })
     expect(agent.labelers).toStrictEqual(['did:plc:other'])
 
@@ -171,6 +179,10 @@ describe('agent', () => {
         queuedNudges: [],
         nuxs: [],
       },
+      postInteractionSettings: {
+        threadgateAllowRules: undefined,
+        postgateEmbeddingRules: undefined,
+      },
     })
     expect(agent.labelers).toStrictEqual([])
   })
@@ -228,6 +240,10 @@ describe('agent', () => {
         queuedNudges: [],
         nuxs: [],
       },
+      postInteractionSettings: {
+        threadgateAllowRules: undefined,
+        postgateEmbeddingRules: undefined,
+      },
     })
   })
 
diff --git a/packages/bsky/src/lexicon/lexicons.ts b/packages/bsky/src/lexicon/lexicons.ts
index 793a68326ba..4c92bc7f2bf 100644
--- a/packages/bsky/src/lexicon/lexicons.ts
+++ b/packages/bsky/src/lexicon/lexicons.ts
@@ -4381,6 +4381,7 @@ export const schemaDict = {
             'lex:app.bsky.actor.defs#hiddenPostsPref',
             'lex:app.bsky.actor.defs#bskyAppStatePref',
             'lex:app.bsky.actor.defs#labelersPref',
+            'lex:app.bsky.actor.defs#postInteractionSettingsPref',
           ],
         },
       },
@@ -4714,6 +4715,38 @@ export const schemaDict = {
           },
         },
       },
+      postInteractionSettingsPref: {
+        type: 'object',
+        description:
+          'Default post interaction settings for the account. These values should be applied as default values when creating new posts. These refs should mirror the threadgate and postgate records exactly.',
+        required: [],
+        properties: {
+          threadgateAllowRules: {
+            description:
+              'Matches threadgate record. List of rules defining who can reply to this users posts. If value is an empty array, no one can reply. If value is undefined, anyone can reply.',
+            type: 'array',
+            maxLength: 5,
+            items: {
+              type: 'union',
+              refs: [
+                'lex:app.bsky.feed.threadgate#mentionRule',
+                'lex:app.bsky.feed.threadgate#followingRule',
+                'lex:app.bsky.feed.threadgate#listRule',
+              ],
+            },
+          },
+          postgateEmbeddingRules: {
+            description:
+              'Matches postgate record. List of rules defining who can embed this users posts. If value is an empty array or is undefined, no particular rules apply and anyone can embed.',
+            type: 'array',
+            maxLength: 5,
+            items: {
+              type: 'union',
+              refs: ['lex:app.bsky.feed.postgate#disableRule'],
+            },
+          },
+        },
+      },
     },
   },
   AppBskyActorGetPreferences: {
@@ -7120,6 +7153,8 @@ export const schemaDict = {
                 'List of AT-URIs embedding this post that the author has detached from.',
             },
             embeddingRules: {
+              description:
+                'List of rules defining who can embed this post. If value is an empty array or is undefined, no particular rules apply and anyone can embed.',
               type: 'array',
               maxLength: 5,
               items: {
@@ -7333,6 +7368,8 @@ export const schemaDict = {
               description: 'Reference (AT-URI) to the post record.',
             },
             allow: {
+              description:
+                'List of rules defining who can reply to this post. If value is an empty array, no one can reply. If value is undefined, anyone can reply.',
               type: 'array',
               maxLength: 5,
               items: {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/defs.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/defs.ts
index d1ad4f980c2..41af221ed7c 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/defs.ts
@@ -8,6 +8,8 @@ import { CID } from 'multiformats/cid'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as AppBskyGraphDefs from '../graph/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import * as AppBskyFeedThreadgate from '../feed/threadgate'
+import * as AppBskyFeedPostgate from '../feed/postgate'
 
 export interface ProfileViewBasic {
   did: string
@@ -188,6 +190,7 @@ export type Preferences = (
   | HiddenPostsPref
   | BskyAppStatePref
   | LabelersPref
+  | PostInteractionSettingsPref
   | { $type: string; [k: string]: unknown }
 )[]
 
@@ -532,3 +535,36 @@ export function isNux(v: unknown): v is Nux {
 export function validateNux(v: unknown): ValidationResult {
   return lexicons.validate('app.bsky.actor.defs#nux', v)
 }
+
+/** Default post interaction settings for the account. These values should be applied as default values when creating new posts. These refs should mirror the threadgate and postgate records exactly. */
+export interface PostInteractionSettingsPref {
+  /** Matches threadgate record. List of rules defining who can reply to this users posts. If value is an empty array, no one can reply. If value is undefined, anyone can reply. */
+  threadgateAllowRules?: (
+    | AppBskyFeedThreadgate.MentionRule
+    | AppBskyFeedThreadgate.FollowingRule
+    | AppBskyFeedThreadgate.ListRule
+    | { $type: string; [k: string]: unknown }
+  )[]
+  /** Matches postgate record. List of rules defining who can embed this users posts. If value is an empty array or is undefined, no particular rules apply and anyone can embed. */
+  postgateEmbeddingRules?: (
+    | AppBskyFeedPostgate.DisableRule
+    | { $type: string; [k: string]: unknown }
+  )[]
+  [k: string]: unknown
+}
+
+export function isPostInteractionSettingsPref(
+  v: unknown,
+): v is PostInteractionSettingsPref {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'app.bsky.actor.defs#postInteractionSettingsPref'
+  )
+}
+
+export function validatePostInteractionSettingsPref(
+  v: unknown,
+): ValidationResult {
+  return lexicons.validate('app.bsky.actor.defs#postInteractionSettingsPref', v)
+}
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/postgate.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/postgate.ts
index dcc4c22a425..da5d6b175b2 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/postgate.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/postgate.ts
@@ -12,6 +12,7 @@ export interface Record {
   post: string
   /** List of AT-URIs embedding this post that the author has detached from. */
   detachedEmbeddingUris?: string[]
+  /** List of rules defining who can embed this post. If value is an empty array or is undefined, no particular rules apply and anyone can embed. */
   embeddingRules?: (DisableRule | { $type: string; [k: string]: unknown })[]
   [k: string]: unknown
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/threadgate.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/threadgate.ts
index c0e618c8f53..135c5ba73ec 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/threadgate.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/threadgate.ts
@@ -9,6 +9,7 @@ import { CID } from 'multiformats/cid'
 export interface Record {
   /** Reference (AT-URI) to the post record. */
   post: string
+  /** List of rules defining who can reply to this post. If value is an empty array, no one can reply. If value is undefined, anyone can reply. */
   allow?: (
     | MentionRule
     | FollowingRule
diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
index b8f90be1cce..da60722b17a 100644
--- a/packages/ozone/src/lexicon/lexicons.ts
+++ b/packages/ozone/src/lexicon/lexicons.ts
@@ -4381,6 +4381,7 @@ export const schemaDict = {
             'lex:app.bsky.actor.defs#hiddenPostsPref',
             'lex:app.bsky.actor.defs#bskyAppStatePref',
             'lex:app.bsky.actor.defs#labelersPref',
+            'lex:app.bsky.actor.defs#postInteractionSettingsPref',
           ],
         },
       },
@@ -4714,6 +4715,38 @@ export const schemaDict = {
           },
         },
       },
+      postInteractionSettingsPref: {
+        type: 'object',
+        description:
+          'Default post interaction settings for the account. These values should be applied as default values when creating new posts. These refs should mirror the threadgate and postgate records exactly.',
+        required: [],
+        properties: {
+          threadgateAllowRules: {
+            description:
+              'Matches threadgate record. List of rules defining who can reply to this users posts. If value is an empty array, no one can reply. If value is undefined, anyone can reply.',
+            type: 'array',
+            maxLength: 5,
+            items: {
+              type: 'union',
+              refs: [
+                'lex:app.bsky.feed.threadgate#mentionRule',
+                'lex:app.bsky.feed.threadgate#followingRule',
+                'lex:app.bsky.feed.threadgate#listRule',
+              ],
+            },
+          },
+          postgateEmbeddingRules: {
+            description:
+              'Matches postgate record. List of rules defining who can embed this users posts. If value is an empty array or is undefined, no particular rules apply and anyone can embed.',
+            type: 'array',
+            maxLength: 5,
+            items: {
+              type: 'union',
+              refs: ['lex:app.bsky.feed.postgate#disableRule'],
+            },
+          },
+        },
+      },
     },
   },
   AppBskyActorGetPreferences: {
@@ -7120,6 +7153,8 @@ export const schemaDict = {
                 'List of AT-URIs embedding this post that the author has detached from.',
             },
             embeddingRules: {
+              description:
+                'List of rules defining who can embed this post. If value is an empty array or is undefined, no particular rules apply and anyone can embed.',
               type: 'array',
               maxLength: 5,
               items: {
@@ -7333,6 +7368,8 @@ export const schemaDict = {
               description: 'Reference (AT-URI) to the post record.',
             },
             allow: {
+              description:
+                'List of rules defining who can reply to this post. If value is an empty array, no one can reply. If value is undefined, anyone can reply.',
               type: 'array',
               maxLength: 5,
               items: {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/defs.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/defs.ts
index d1ad4f980c2..41af221ed7c 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/defs.ts
@@ -8,6 +8,8 @@ import { CID } from 'multiformats/cid'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as AppBskyGraphDefs from '../graph/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import * as AppBskyFeedThreadgate from '../feed/threadgate'
+import * as AppBskyFeedPostgate from '../feed/postgate'
 
 export interface ProfileViewBasic {
   did: string
@@ -188,6 +190,7 @@ export type Preferences = (
   | HiddenPostsPref
   | BskyAppStatePref
   | LabelersPref
+  | PostInteractionSettingsPref
   | { $type: string; [k: string]: unknown }
 )[]
 
@@ -532,3 +535,36 @@ export function isNux(v: unknown): v is Nux {
 export function validateNux(v: unknown): ValidationResult {
   return lexicons.validate('app.bsky.actor.defs#nux', v)
 }
+
+/** Default post interaction settings for the account. These values should be applied as default values when creating new posts. These refs should mirror the threadgate and postgate records exactly. */
+export interface PostInteractionSettingsPref {
+  /** Matches threadgate record. List of rules defining who can reply to this users posts. If value is an empty array, no one can reply. If value is undefined, anyone can reply. */
+  threadgateAllowRules?: (
+    | AppBskyFeedThreadgate.MentionRule
+    | AppBskyFeedThreadgate.FollowingRule
+    | AppBskyFeedThreadgate.ListRule
+    | { $type: string; [k: string]: unknown }
+  )[]
+  /** Matches postgate record. List of rules defining who can embed this users posts. If value is an empty array or is undefined, no particular rules apply and anyone can embed. */
+  postgateEmbeddingRules?: (
+    | AppBskyFeedPostgate.DisableRule
+    | { $type: string; [k: string]: unknown }
+  )[]
+  [k: string]: unknown
+}
+
+export function isPostInteractionSettingsPref(
+  v: unknown,
+): v is PostInteractionSettingsPref {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'app.bsky.actor.defs#postInteractionSettingsPref'
+  )
+}
+
+export function validatePostInteractionSettingsPref(
+  v: unknown,
+): ValidationResult {
+  return lexicons.validate('app.bsky.actor.defs#postInteractionSettingsPref', v)
+}
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/postgate.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/postgate.ts
index dcc4c22a425..da5d6b175b2 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/postgate.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/postgate.ts
@@ -12,6 +12,7 @@ export interface Record {
   post: string
   /** List of AT-URIs embedding this post that the author has detached from. */
   detachedEmbeddingUris?: string[]
+  /** List of rules defining who can embed this post. If value is an empty array or is undefined, no particular rules apply and anyone can embed. */
   embeddingRules?: (DisableRule | { $type: string; [k: string]: unknown })[]
   [k: string]: unknown
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/threadgate.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/threadgate.ts
index c0e618c8f53..135c5ba73ec 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/threadgate.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/threadgate.ts
@@ -9,6 +9,7 @@ import { CID } from 'multiformats/cid'
 export interface Record {
   /** Reference (AT-URI) to the post record. */
   post: string
+  /** List of rules defining who can reply to this post. If value is an empty array, no one can reply. If value is undefined, anyone can reply. */
   allow?: (
     | MentionRule
     | FollowingRule
diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
index b8f90be1cce..da60722b17a 100644
--- a/packages/pds/src/lexicon/lexicons.ts
+++ b/packages/pds/src/lexicon/lexicons.ts
@@ -4381,6 +4381,7 @@ export const schemaDict = {
             'lex:app.bsky.actor.defs#hiddenPostsPref',
             'lex:app.bsky.actor.defs#bskyAppStatePref',
             'lex:app.bsky.actor.defs#labelersPref',
+            'lex:app.bsky.actor.defs#postInteractionSettingsPref',
           ],
         },
       },
@@ -4714,6 +4715,38 @@ export const schemaDict = {
           },
         },
       },
+      postInteractionSettingsPref: {
+        type: 'object',
+        description:
+          'Default post interaction settings for the account. These values should be applied as default values when creating new posts. These refs should mirror the threadgate and postgate records exactly.',
+        required: [],
+        properties: {
+          threadgateAllowRules: {
+            description:
+              'Matches threadgate record. List of rules defining who can reply to this users posts. If value is an empty array, no one can reply. If value is undefined, anyone can reply.',
+            type: 'array',
+            maxLength: 5,
+            items: {
+              type: 'union',
+              refs: [
+                'lex:app.bsky.feed.threadgate#mentionRule',
+                'lex:app.bsky.feed.threadgate#followingRule',
+                'lex:app.bsky.feed.threadgate#listRule',
+              ],
+            },
+          },
+          postgateEmbeddingRules: {
+            description:
+              'Matches postgate record. List of rules defining who can embed this users posts. If value is an empty array or is undefined, no particular rules apply and anyone can embed.',
+            type: 'array',
+            maxLength: 5,
+            items: {
+              type: 'union',
+              refs: ['lex:app.bsky.feed.postgate#disableRule'],
+            },
+          },
+        },
+      },
     },
   },
   AppBskyActorGetPreferences: {
@@ -7120,6 +7153,8 @@ export const schemaDict = {
                 'List of AT-URIs embedding this post that the author has detached from.',
             },
             embeddingRules: {
+              description:
+                'List of rules defining who can embed this post. If value is an empty array or is undefined, no particular rules apply and anyone can embed.',
               type: 'array',
               maxLength: 5,
               items: {
@@ -7333,6 +7368,8 @@ export const schemaDict = {
               description: 'Reference (AT-URI) to the post record.',
             },
             allow: {
+              description:
+                'List of rules defining who can reply to this post. If value is an empty array, no one can reply. If value is undefined, anyone can reply.',
               type: 'array',
               maxLength: 5,
               items: {
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/defs.ts b/packages/pds/src/lexicon/types/app/bsky/actor/defs.ts
index d1ad4f980c2..41af221ed7c 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/defs.ts
@@ -8,6 +8,8 @@ import { CID } from 'multiformats/cid'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as AppBskyGraphDefs from '../graph/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import * as AppBskyFeedThreadgate from '../feed/threadgate'
+import * as AppBskyFeedPostgate from '../feed/postgate'
 
 export interface ProfileViewBasic {
   did: string
@@ -188,6 +190,7 @@ export type Preferences = (
   | HiddenPostsPref
   | BskyAppStatePref
   | LabelersPref
+  | PostInteractionSettingsPref
   | { $type: string; [k: string]: unknown }
 )[]
 
@@ -532,3 +535,36 @@ export function isNux(v: unknown): v is Nux {
 export function validateNux(v: unknown): ValidationResult {
   return lexicons.validate('app.bsky.actor.defs#nux', v)
 }
+
+/** Default post interaction settings for the account. These values should be applied as default values when creating new posts. These refs should mirror the threadgate and postgate records exactly. */
+export interface PostInteractionSettingsPref {
+  /** Matches threadgate record. List of rules defining who can reply to this users posts. If value is an empty array, no one can reply. If value is undefined, anyone can reply. */
+  threadgateAllowRules?: (
+    | AppBskyFeedThreadgate.MentionRule
+    | AppBskyFeedThreadgate.FollowingRule
+    | AppBskyFeedThreadgate.ListRule
+    | { $type: string; [k: string]: unknown }
+  )[]
+  /** Matches postgate record. List of rules defining who can embed this users posts. If value is an empty array or is undefined, no particular rules apply and anyone can embed. */
+  postgateEmbeddingRules?: (
+    | AppBskyFeedPostgate.DisableRule
+    | { $type: string; [k: string]: unknown }
+  )[]
+  [k: string]: unknown
+}
+
+export function isPostInteractionSettingsPref(
+  v: unknown,
+): v is PostInteractionSettingsPref {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'app.bsky.actor.defs#postInteractionSettingsPref'
+  )
+}
+
+export function validatePostInteractionSettingsPref(
+  v: unknown,
+): ValidationResult {
+  return lexicons.validate('app.bsky.actor.defs#postInteractionSettingsPref', v)
+}
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/postgate.ts b/packages/pds/src/lexicon/types/app/bsky/feed/postgate.ts
index dcc4c22a425..da5d6b175b2 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/postgate.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/postgate.ts
@@ -12,6 +12,7 @@ export interface Record {
   post: string
   /** List of AT-URIs embedding this post that the author has detached from. */
   detachedEmbeddingUris?: string[]
+  /** List of rules defining who can embed this post. If value is an empty array or is undefined, no particular rules apply and anyone can embed. */
   embeddingRules?: (DisableRule | { $type: string; [k: string]: unknown })[]
   [k: string]: unknown
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/threadgate.ts b/packages/pds/src/lexicon/types/app/bsky/feed/threadgate.ts
index c0e618c8f53..135c5ba73ec 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/threadgate.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/threadgate.ts
@@ -9,6 +9,7 @@ import { CID } from 'multiformats/cid'
 export interface Record {
   /** Reference (AT-URI) to the post record. */
   post: string
+  /** List of rules defining who can reply to this post. If value is an empty array, no one can reply. If value is undefined, anyone can reply. */
   allow?: (
     | MentionRule
     | FollowingRule

From 799dd925e96ca3d84b8e457c2ce1601ff6edadcb Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 5 Feb 2025 17:50:10 -0600
Subject: [PATCH 049/101] Version packages (#3493)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/fair-tigers-thank.md               | 41 -------------------
 .changeset/honest-windows-appear.md           |  5 ---
 .changeset/mighty-actors-complain.md          | 22 ----------
 .changeset/olive-teachers-yawn.md             |  5 ---
 .changeset/rich-rocks-think.md                |  5 ---
 .changeset/serious-pears-sit.md               |  5 ---
 .changeset/tame-cobras-lick.md                |  5 ---
 packages/api/CHANGELOG.md                     | 14 +++++++
 packages/api/package.json                     |  2 +-
 packages/aws/CHANGELOG.md                     | 13 ++++++
 packages/aws/package.json                     |  2 +-
 packages/bsky/CHANGELOG.md                    | 24 +++++++++++
 packages/bsky/package.json                    |  2 +-
 packages/bsync/CHANGELOG.md                   | 12 ++++++
 packages/bsync/package.json                   |  2 +-
 packages/common-web/CHANGELOG.md              | 10 +++++
 packages/common-web/package.json              |  2 +-
 packages/common/CHANGELOG.md                  | 11 +++++
 packages/common/package.json                  |  2 +-
 packages/crypto/CHANGELOG.md                  |  8 ++++
 packages/crypto/package.json                  |  2 +-
 packages/dev-env/CHANGELOG.md                 | 22 ++++++++++
 packages/dev-env/package.json                 |  2 +-
 packages/did/CHANGELOG.md                     |  6 +++
 packages/did/package.json                     |  2 +-
 packages/identity/CHANGELOG.md                | 12 ++++++
 packages/identity/package.json                |  2 +-
 packages/internal/did-resolver/CHANGELOG.md   | 12 ++++++
 packages/internal/did-resolver/package.json   |  2 +-
 packages/internal/fetch-node/CHANGELOG.md     | 11 +++++
 packages/internal/fetch-node/package.json     |  2 +-
 packages/internal/fetch/CHANGELOG.md          |  6 +++
 packages/internal/fetch/package.json          |  2 +-
 .../handle-resolver-node/CHANGELOG.md         | 13 ++++++
 .../handle-resolver-node/package.json         |  2 +-
 .../internal/handle-resolver/CHANGELOG.md     | 11 +++++
 .../internal/handle-resolver/package.json     |  2 +-
 .../internal/identity-resolver/CHANGELOG.md   | 11 +++++
 .../internal/identity-resolver/package.json   |  2 +-
 .../CHANGELOG.md                              |  8 ++++
 .../package.json                              |  2 +-
 .../internal/simple-store-memory/CHANGELOG.md |  9 ++++
 .../internal/simple-store-memory/package.json |  2 +-
 packages/internal/simple-store/CHANGELOG.md   |  6 +++
 packages/internal/simple-store/package.json   |  2 +-
 packages/internal/xrpc-utils/CHANGELOG.md     |  8 ++++
 packages/internal/xrpc-utils/package.json     |  2 +-
 packages/lex-cli/CHANGELOG.md                 | 12 ++++++
 packages/lex-cli/package.json                 |  2 +-
 packages/lexicon/CHANGELOG.md                 | 10 +++++
 packages/lexicon/package.json                 |  2 +-
 packages/oauth/jwk-jose/CHANGELOG.md          |  9 ++++
 packages/oauth/jwk-jose/package.json          |  2 +-
 packages/oauth/jwk-webcrypto/CHANGELOG.md     | 10 +++++
 packages/oauth/jwk-webcrypto/package.json     |  2 +-
 packages/oauth/jwk/CHANGELOG.md               |  6 +++
 packages/oauth/jwk/package.json               |  2 +-
 .../oauth-client-browser-example/CHANGELOG.md |  7 ++++
 .../oauth-client-browser-example/package.json |  2 +-
 .../oauth/oauth-client-browser/CHANGELOG.md   | 16 ++++++++
 .../oauth/oauth-client-browser/package.json   |  2 +-
 packages/oauth/oauth-client-node/CHANGELOG.md | 19 +++++++++
 packages/oauth/oauth-client-node/package.json |  2 +-
 packages/oauth/oauth-client/CHANGELOG.md      | 18 ++++++++
 packages/oauth/oauth-client/package.json      |  2 +-
 packages/oauth/oauth-provider/CHANGELOG.md    | 18 ++++++++
 packages/oauth/oauth-provider/package.json    |  2 +-
 packages/oauth/oauth-types/CHANGELOG.md       | 11 +++++
 packages/oauth/oauth-types/package.json       |  2 +-
 packages/ozone/CHANGELOG.md                   | 18 ++++++++
 packages/ozone/package.json                   |  2 +-
 packages/pds/CHANGELOG.md                     | 25 +++++++++++
 packages/pds/package.json                     |  2 +-
 packages/repo/CHANGELOG.md                    | 14 +++++++
 packages/repo/package.json                    |  2 +-
 packages/sync/CHANGELOG.md                    | 16 ++++++++
 packages/sync/package.json                    |  2 +-
 packages/syntax/CHANGELOG.md                  |  6 +++
 packages/syntax/package.json                  |  2 +-
 packages/xrpc-server/CHANGELOG.md             | 14 +++++++
 packages/xrpc-server/package.json             |  2 +-
 packages/xrpc/CHANGELOG.md                    |  9 ++++
 packages/xrpc/package.json                    |  2 +-
 83 files changed, 503 insertions(+), 126 deletions(-)
 delete mode 100644 .changeset/fair-tigers-thank.md
 delete mode 100644 .changeset/honest-windows-appear.md
 delete mode 100644 .changeset/mighty-actors-complain.md
 delete mode 100644 .changeset/olive-teachers-yawn.md
 delete mode 100644 .changeset/rich-rocks-think.md
 delete mode 100644 .changeset/serious-pears-sit.md
 delete mode 100644 .changeset/tame-cobras-lick.md
 create mode 100644 packages/oauth/oauth-client-browser-example/CHANGELOG.md

diff --git a/.changeset/fair-tigers-thank.md b/.changeset/fair-tigers-thank.md
deleted file mode 100644
index 9491e3c47c2..00000000000
--- a/.changeset/fair-tigers-thank.md
+++ /dev/null
@@ -1,41 +0,0 @@
----
-"@atproto-labs/rollup-plugin-bundle-manifest": patch
-"@atproto/oauth-client-browser-example": patch
-"@atproto-labs/handle-resolver-node": patch
-"@atproto-labs/simple-store-memory": patch
-"@atproto-labs/identity-resolver": patch
-"@atproto/oauth-client-browser": patch
-"@atproto-labs/handle-resolver": patch
-"@atproto/oauth-client-node": patch
-"@atproto-labs/did-resolver": patch
-"@atproto-labs/simple-store": patch
-"@atproto/oauth-provider": patch
-"@atproto-labs/fetch-node": patch
-"@atproto/jwk-webcrypto": patch
-"@atproto/oauth-client": patch
-"@atproto/oauth-types": patch
-"@atproto-labs/fetch": patch
-"@atproto/jwk-jose": patch
-"@atproto/xrpc-server": patch
-"@atproto/common-web": patch
-"@atproto/jwk": patch
-"@atproto/identity": patch
-"@atproto/dev-env": patch
-"@atproto/lex-cli": patch
-"@atproto/lexicon": patch
-"@atproto/common": patch
-"@atproto/crypto": patch
-"@atproto/syntax": patch
-"@atproto/bsync": patch
-"@atproto/ozone": patch
-"@atproto/bsky": patch
-"@atproto/repo": patch
-"@atproto/sync": patch
-"@atproto/xrpc": patch
-"@atproto/api": patch
-"@atproto/aws": patch
-"@atproto/did": patch
-"@atproto/pds": patch
----
-
-Apply new linting rules regarding import order
diff --git a/.changeset/honest-windows-appear.md b/.changeset/honest-windows-appear.md
deleted file mode 100644
index 33be6073426..00000000000
--- a/.changeset/honest-windows-appear.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/common-web": minor
----
-
-Make keyBy typing stricter
diff --git a/.changeset/mighty-actors-complain.md b/.changeset/mighty-actors-complain.md
deleted file mode 100644
index 02236e7d574..00000000000
--- a/.changeset/mighty-actors-complain.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-"@atproto-labs/rollup-plugin-bundle-manifest": patch
-"@atproto-labs/handle-resolver-node": patch
-"@atproto/oauth-client-node": patch
-"@atproto/oauth-provider": patch
-"@atproto-labs/fetch-node": patch
-"@atproto/xrpc-server": patch
-"@atproto/identity": patch
-"@atproto/dev-env": patch
-"@atproto/lex-cli": patch
-"@atproto/common": patch
-"@atproto/crypto": patch
-"@atproto/bsync": patch
-"@atproto/ozone": patch
-"@atproto/bsky": patch
-"@atproto/repo": patch
-"@atproto/sync": patch
-"@atproto/aws": patch
-"@atproto/pds": patch
----
-
-Update NodeJS engine requirement to >=18.7.0
diff --git a/.changeset/olive-teachers-yawn.md b/.changeset/olive-teachers-yawn.md
deleted file mode 100644
index 2211f115909..00000000000
--- a/.changeset/olive-teachers-yawn.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/oauth-types": patch
----
-
-Support environments not providing URL.canParse
diff --git a/.changeset/rich-rocks-think.md b/.changeset/rich-rocks-think.md
deleted file mode 100644
index 330e675fb38..00000000000
--- a/.changeset/rich-rocks-think.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/bsky": patch
----
-
-Replace undefined values with empty strings in mock dataplane
diff --git a/.changeset/serious-pears-sit.md b/.changeset/serious-pears-sit.md
deleted file mode 100644
index fc3a4fb8579..00000000000
--- a/.changeset/serious-pears-sit.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/pds": patch
----
-
-Code refactor
diff --git a/.changeset/tame-cobras-lick.md b/.changeset/tame-cobras-lick.md
deleted file mode 100644
index d2cb328651b..00000000000
--- a/.changeset/tame-cobras-lick.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/api": patch
----
-
-Add `setPostInteractionSettings` for configuring default interaction settings for creation of posts
diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md
index b3ca864102f..1d80f7a2d25 100644
--- a/packages/api/CHANGELOG.md
+++ b/packages/api/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @atproto/api
 
+## 0.13.33
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
+- [#3494](https://github.com/bluesky-social/atproto/pull/3494) [`87ed907a6`](https://github.com/bluesky-social/atproto/commit/87ed907a6b96b408c02c9af819cec8380a453254) Thanks [@estrattonbailey](https://github.com/estrattonbailey)! - Add `setPostInteractionSettings` for configuring default interaction settings for creation of posts
+
+- Updated dependencies [[`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd), [`8a30e0ed9`](https://github.com/bluesky-social/atproto/commit/8a30e0ed9239cb2037d54fb98e70e8b0cfbc3e39)]:
+  - @atproto/common-web@0.4.0
+  - @atproto/lexicon@0.4.6
+  - @atproto/syntax@0.3.2
+  - @atproto/xrpc@0.6.8
+
 ## 0.13.32
 
 ### Patch Changes
diff --git a/packages/api/package.json b/packages/api/package.json
index 4960c141a1d..6c85be86f97 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/api",
-  "version": "0.13.32",
+  "version": "0.13.33",
   "license": "MIT",
   "description": "Client library for atproto and Bluesky",
   "keywords": [
diff --git a/packages/aws/CHANGELOG.md b/packages/aws/CHANGELOG.md
index b6d6739da25..5ed9649eec0 100644
--- a/packages/aws/CHANGELOG.md
+++ b/packages/aws/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @atproto/aws
 
+## 0.2.14
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Update NodeJS engine requirement to >=18.7.0
+
+- Updated dependencies [[`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd), [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd)]:
+  - @atproto/common@0.4.8
+  - @atproto/crypto@0.4.4
+  - @atproto/repo@0.6.4
+
 ## 0.2.13
 
 ### Patch Changes
diff --git a/packages/aws/package.json b/packages/aws/package.json
index 752d6850761..16febea5d8e 100644
--- a/packages/aws/package.json
+++ b/packages/aws/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/aws",
-  "version": "0.2.13",
+  "version": "0.2.14",
   "license": "MIT",
   "description": "Shared AWS cloud API helpers for atproto services",
   "keywords": [
diff --git a/packages/bsky/CHANGELOG.md b/packages/bsky/CHANGELOG.md
index 9f7f0538a17..9be6b6ab8c6 100644
--- a/packages/bsky/CHANGELOG.md
+++ b/packages/bsky/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @atproto/bsky
 
+## 0.0.114
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Update NodeJS engine requirement to >=18.7.0
+
+- [#3445](https://github.com/bluesky-social/atproto/pull/3445) [`8a30e0ed9`](https://github.com/bluesky-social/atproto/commit/8a30e0ed9239cb2037d54fb98e70e8b0cfbc3e39) Thanks [@rafaelbsky](https://github.com/rafaelbsky)! - Replace undefined values with empty strings in mock dataplane
+
+- Updated dependencies [[`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd), [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd), [`87ed907a6`](https://github.com/bluesky-social/atproto/commit/87ed907a6b96b408c02c9af819cec8380a453254)]:
+  - @atproto-labs/fetch-node@0.1.7
+  - @atproto/xrpc-server@0.7.10
+  - @atproto/identity@0.4.6
+  - @atproto/lexicon@0.4.6
+  - @atproto/common@0.4.8
+  - @atproto/crypto@0.4.4
+  - @atproto/syntax@0.3.2
+  - @atproto/repo@0.6.4
+  - @atproto/sync@0.1.13
+  - @atproto/api@0.13.33
+  - @atproto/did@0.1.5
+  - @atproto-labs/xrpc-utils@0.0.6
+
 ## 0.0.113
 
 ### Patch Changes
diff --git a/packages/bsky/package.json b/packages/bsky/package.json
index 069885e6f4e..87751b0355a 100644
--- a/packages/bsky/package.json
+++ b/packages/bsky/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.113",
+  "version": "0.0.114",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
diff --git a/packages/bsync/CHANGELOG.md b/packages/bsync/CHANGELOG.md
index b9199f5a189..4391302876f 100644
--- a/packages/bsync/CHANGELOG.md
+++ b/packages/bsync/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @atproto/bsync
 
+## 0.0.13
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Update NodeJS engine requirement to >=18.7.0
+
+- Updated dependencies [[`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd), [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd)]:
+  - @atproto/common@0.4.8
+  - @atproto/syntax@0.3.2
+
 ## 0.0.12
 
 ### Patch Changes
diff --git a/packages/bsync/package.json b/packages/bsync/package.json
index bb339cf6251..decbd546134 100644
--- a/packages/bsync/package.json
+++ b/packages/bsync/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsync",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "license": "MIT",
   "description": "Sychronizing service for app.bsky App View (Bluesky API)",
   "keywords": [
diff --git a/packages/common-web/CHANGELOG.md b/packages/common-web/CHANGELOG.md
index f1c614eeecf..16dbe9017b8 100644
--- a/packages/common-web/CHANGELOG.md
+++ b/packages/common-web/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @atproto/common-web
 
+## 0.4.0
+
+### Minor Changes
+
+- [#3445](https://github.com/bluesky-social/atproto/pull/3445) [`8a30e0ed9`](https://github.com/bluesky-social/atproto/commit/8a30e0ed9239cb2037d54fb98e70e8b0cfbc3e39) Thanks [@rafaelbsky](https://github.com/rafaelbsky)! - Make keyBy typing stricter
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
 ## 0.3.2
 
 ### Patch Changes
diff --git a/packages/common-web/package.json b/packages/common-web/package.json
index b50e8af5a91..8986a60c79b 100644
--- a/packages/common-web/package.json
+++ b/packages/common-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/common-web",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "license": "MIT",
   "description": "Shared web-platform-friendly code for atproto libraries",
   "keywords": [
diff --git a/packages/common/CHANGELOG.md b/packages/common/CHANGELOG.md
index d4f689a9837..e0090d29197 100644
--- a/packages/common/CHANGELOG.md
+++ b/packages/common/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @atproto/common
 
+## 0.4.8
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Update NodeJS engine requirement to >=18.7.0
+
+- Updated dependencies [[`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd), [`8a30e0ed9`](https://github.com/bluesky-social/atproto/commit/8a30e0ed9239cb2037d54fb98e70e8b0cfbc3e39)]:
+  - @atproto/common-web@0.4.0
+
 ## 0.4.7
 
 ### Patch Changes
diff --git a/packages/common/package.json b/packages/common/package.json
index 127817a5dee..e4eb848b6a5 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/common",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "license": "MIT",
   "description": "Shared web-platform-friendly code for atproto libraries",
   "keywords": [
diff --git a/packages/crypto/CHANGELOG.md b/packages/crypto/CHANGELOG.md
index 65a3d4bbf36..bee3f6e6c0f 100644
--- a/packages/crypto/CHANGELOG.md
+++ b/packages/crypto/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @atproto/crypto
 
+## 0.4.4
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Update NodeJS engine requirement to >=18.7.0
+
 ## 0.4.3
 
 ### Patch Changes
diff --git a/packages/crypto/package.json b/packages/crypto/package.json
index 917e570acc1..eb282930668 100644
--- a/packages/crypto/package.json
+++ b/packages/crypto/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/crypto",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "license": "MIT",
   "description": "Library for cryptographic keys and signing in atproto",
   "keywords": [
diff --git a/packages/dev-env/CHANGELOG.md b/packages/dev-env/CHANGELOG.md
index d4f01bcf4e7..a12b380856a 100644
--- a/packages/dev-env/CHANGELOG.md
+++ b/packages/dev-env/CHANGELOG.md
@@ -1,5 +1,27 @@
 # @atproto/dev-env
 
+## 0.3.84
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Update NodeJS engine requirement to >=18.7.0
+
+- Updated dependencies [[`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd), [`8a30e0ed9`](https://github.com/bluesky-social/atproto/commit/8a30e0ed9239cb2037d54fb98e70e8b0cfbc3e39), [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd), [`8a30e0ed9`](https://github.com/bluesky-social/atproto/commit/8a30e0ed9239cb2037d54fb98e70e8b0cfbc3e39), [`53a577fd4`](https://github.com/bluesky-social/atproto/commit/53a577fd4bfb1c7301e14db85b42f4758b053dee), [`87ed907a6`](https://github.com/bluesky-social/atproto/commit/87ed907a6b96b408c02c9af819cec8380a453254)]:
+  - @atproto/xrpc-server@0.7.10
+  - @atproto/common-web@0.4.0
+  - @atproto/identity@0.4.6
+  - @atproto/lexicon@0.4.6
+  - @atproto/crypto@0.4.4
+  - @atproto/syntax@0.3.2
+  - @atproto/bsync@0.0.13
+  - @atproto/ozone@0.1.75
+  - @atproto/bsky@0.0.114
+  - @atproto/sync@0.1.13
+  - @atproto/api@0.13.33
+  - @atproto/pds@0.4.92
+
 ## 0.3.83
 
 ### Patch Changes
diff --git a/packages/dev-env/package.json b/packages/dev-env/package.json
index e279d848b2c..6c2a811e7a6 100644
--- a/packages/dev-env/package.json
+++ b/packages/dev-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/dev-env",
-  "version": "0.3.83",
+  "version": "0.3.84",
   "license": "MIT",
   "description": "Local development environment helper for atproto development",
   "keywords": [
diff --git a/packages/did/CHANGELOG.md b/packages/did/CHANGELOG.md
index f2f30038474..60ef9cc1665 100644
--- a/packages/did/CHANGELOG.md
+++ b/packages/did/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @atproto/did
 
+## 0.1.5
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
 ## 0.1.4
 
 ### Patch Changes
diff --git a/packages/did/package.json b/packages/did/package.json
index b9d89b1d943..386c4f08f86 100644
--- a/packages/did/package.json
+++ b/packages/did/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/did",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "license": "MIT",
   "description": "DID resolution and verification library",
   "keywords": [
diff --git a/packages/identity/CHANGELOG.md b/packages/identity/CHANGELOG.md
index 00fcc74ac52..cfdd967ab5a 100644
--- a/packages/identity/CHANGELOG.md
+++ b/packages/identity/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @atproto/identity
 
+## 0.4.6
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Update NodeJS engine requirement to >=18.7.0
+
+- Updated dependencies [[`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd), [`8a30e0ed9`](https://github.com/bluesky-social/atproto/commit/8a30e0ed9239cb2037d54fb98e70e8b0cfbc3e39), [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd)]:
+  - @atproto/common-web@0.4.0
+  - @atproto/crypto@0.4.4
+
 ## 0.4.5
 
 ### Patch Changes
diff --git a/packages/identity/package.json b/packages/identity/package.json
index cfd1ed0fa27..e6d6adff02c 100644
--- a/packages/identity/package.json
+++ b/packages/identity/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/identity",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "license": "MIT",
   "description": "Library for decentralized identities in atproto using DIDs and handles",
   "keywords": [
diff --git a/packages/internal/did-resolver/CHANGELOG.md b/packages/internal/did-resolver/CHANGELOG.md
index a5290a84fe8..4d76e1da92f 100644
--- a/packages/internal/did-resolver/CHANGELOG.md
+++ b/packages/internal/did-resolver/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @atproto-labs/did-resolver
 
+## 0.1.10
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
+- Updated dependencies [[`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd)]:
+  - @atproto-labs/simple-store-memory@0.1.2
+  - @atproto-labs/simple-store@0.1.2
+  - @atproto-labs/fetch@0.2.1
+  - @atproto/did@0.1.5
+
 ## 0.1.9
 
 ### Patch Changes
diff --git a/packages/internal/did-resolver/package.json b/packages/internal/did-resolver/package.json
index b0717b4e995..4418651516b 100644
--- a/packages/internal/did-resolver/package.json
+++ b/packages/internal/did-resolver/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto-labs/did-resolver",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "license": "MIT",
   "description": "DID resolution and verification library",
   "keywords": [
diff --git a/packages/internal/fetch-node/CHANGELOG.md b/packages/internal/fetch-node/CHANGELOG.md
index 86840a86316..8c08c5fb633 100644
--- a/packages/internal/fetch-node/CHANGELOG.md
+++ b/packages/internal/fetch-node/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @atproto-labs/fetch-node
 
+## 0.1.7
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Update NodeJS engine requirement to >=18.7.0
+
+- Updated dependencies [[`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd)]:
+  - @atproto-labs/fetch@0.2.1
+
 ## 0.1.6
 
 ### Patch Changes
diff --git a/packages/internal/fetch-node/package.json b/packages/internal/fetch-node/package.json
index 5b612258b31..d9dfebfa57d 100644
--- a/packages/internal/fetch-node/package.json
+++ b/packages/internal/fetch-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto-labs/fetch-node",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "license": "MIT",
   "description": "SSRF protection for fetch() in Node.js",
   "keywords": [
diff --git a/packages/internal/fetch/CHANGELOG.md b/packages/internal/fetch/CHANGELOG.md
index 177ca976983..5471107d4ba 100644
--- a/packages/internal/fetch/CHANGELOG.md
+++ b/packages/internal/fetch/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @atproto-labs/fetch
 
+## 0.2.1
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
 ## 0.2.0
 
 ### Minor Changes
diff --git a/packages/internal/fetch/package.json b/packages/internal/fetch/package.json
index 5d992cd6b39..4c5b913a303 100644
--- a/packages/internal/fetch/package.json
+++ b/packages/internal/fetch/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto-labs/fetch",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "license": "MIT",
   "description": "Isomorphic wrapper utilities for fetch API",
   "keywords": [
diff --git a/packages/internal/handle-resolver-node/CHANGELOG.md b/packages/internal/handle-resolver-node/CHANGELOG.md
index 762e606b4da..c651786ad0d 100644
--- a/packages/internal/handle-resolver-node/CHANGELOG.md
+++ b/packages/internal/handle-resolver-node/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @atproto-labs/handle-resolver-node
 
+## 0.1.13
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Update NodeJS engine requirement to >=18.7.0
+
+- Updated dependencies [[`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd), [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd)]:
+  - @atproto-labs/handle-resolver@0.1.7
+  - @atproto-labs/fetch-node@0.1.7
+  - @atproto/did@0.1.5
+
 ## 0.1.12
 
 ### Patch Changes
diff --git a/packages/internal/handle-resolver-node/package.json b/packages/internal/handle-resolver-node/package.json
index ba667bae43c..6afb68f21d8 100644
--- a/packages/internal/handle-resolver-node/package.json
+++ b/packages/internal/handle-resolver-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto-labs/handle-resolver-node",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "license": "MIT",
   "description": "Node specific ATProto handle to DID resolver",
   "keywords": [
diff --git a/packages/internal/handle-resolver/CHANGELOG.md b/packages/internal/handle-resolver/CHANGELOG.md
index 672c17ff799..690a8401d85 100644
--- a/packages/internal/handle-resolver/CHANGELOG.md
+++ b/packages/internal/handle-resolver/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @atproto-labs/handle-resolver
 
+## 0.1.7
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
+- Updated dependencies [[`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd)]:
+  - @atproto-labs/simple-store-memory@0.1.2
+  - @atproto-labs/simple-store@0.1.2
+  - @atproto/did@0.1.5
+
 ## 0.1.6
 
 ### Patch Changes
diff --git a/packages/internal/handle-resolver/package.json b/packages/internal/handle-resolver/package.json
index 22efe8605ed..a49d01a2e27 100644
--- a/packages/internal/handle-resolver/package.json
+++ b/packages/internal/handle-resolver/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto-labs/handle-resolver",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "license": "MIT",
   "description": "Isomorphic ATProto handle to DID resolver",
   "keywords": [
diff --git a/packages/internal/identity-resolver/CHANGELOG.md b/packages/internal/identity-resolver/CHANGELOG.md
index a69835949fe..1d45e3b5dd4 100644
--- a/packages/internal/identity-resolver/CHANGELOG.md
+++ b/packages/internal/identity-resolver/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @atproto-labs/identity-resolver
 
+## 0.1.12
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
+- Updated dependencies [[`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd)]:
+  - @atproto-labs/handle-resolver@0.1.7
+  - @atproto-labs/did-resolver@0.1.10
+  - @atproto/syntax@0.3.2
+
 ## 0.1.11
 
 ### Patch Changes
diff --git a/packages/internal/identity-resolver/package.json b/packages/internal/identity-resolver/package.json
index da95f9e9f70..71140c9be97 100644
--- a/packages/internal/identity-resolver/package.json
+++ b/packages/internal/identity-resolver/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto-labs/identity-resolver",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "license": "MIT",
   "description": "A library resolving ATPROTO identities",
   "keywords": [
diff --git a/packages/internal/rollup-plugin-bundle-manifest/CHANGELOG.md b/packages/internal/rollup-plugin-bundle-manifest/CHANGELOG.md
index 97069e71a5a..616507a3cd6 100644
--- a/packages/internal/rollup-plugin-bundle-manifest/CHANGELOG.md
+++ b/packages/internal/rollup-plugin-bundle-manifest/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @atproto-labs/rollup-plugin-bundle-manifest
 
+## 0.1.1
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Update NodeJS engine requirement to >=18.7.0
+
 ## 0.1.0
 
 ### Minor Changes
diff --git a/packages/internal/rollup-plugin-bundle-manifest/package.json b/packages/internal/rollup-plugin-bundle-manifest/package.json
index c935b2c5132..0c99c0b0395 100644
--- a/packages/internal/rollup-plugin-bundle-manifest/package.json
+++ b/packages/internal/rollup-plugin-bundle-manifest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto-labs/rollup-plugin-bundle-manifest",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "license": "MIT",
   "description": "Library for generating a manifest of bundled files from a Rollup build",
   "keywords": [
diff --git a/packages/internal/simple-store-memory/CHANGELOG.md b/packages/internal/simple-store-memory/CHANGELOG.md
index 3c647828b77..0e029901dca 100644
--- a/packages/internal/simple-store-memory/CHANGELOG.md
+++ b/packages/internal/simple-store-memory/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @atproto-labs/simple-store-memory
 
+## 0.1.2
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
+- Updated dependencies [[`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd)]:
+  - @atproto-labs/simple-store@0.1.2
+
 ## 0.1.1
 
 ### Patch Changes
diff --git a/packages/internal/simple-store-memory/package.json b/packages/internal/simple-store-memory/package.json
index f871c6638dc..77af83be125 100644
--- a/packages/internal/simple-store-memory/package.json
+++ b/packages/internal/simple-store-memory/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto-labs/simple-store-memory",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "license": "MIT",
   "description": "Memory based simple-store implementation",
   "keywords": [
diff --git a/packages/internal/simple-store/CHANGELOG.md b/packages/internal/simple-store/CHANGELOG.md
index 7cf8dd7bc3e..d5acf334fdf 100644
--- a/packages/internal/simple-store/CHANGELOG.md
+++ b/packages/internal/simple-store/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @atproto-labs/simple-store
 
+## 0.1.2
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
 ## 0.1.1
 
 ### Patch Changes
diff --git a/packages/internal/simple-store/package.json b/packages/internal/simple-store/package.json
index 66cf78b42e7..6c78b0fa937 100644
--- a/packages/internal/simple-store/package.json
+++ b/packages/internal/simple-store/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto-labs/simple-store",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "license": "MIT",
   "description": "Simple store interfaces & utilities",
   "keywords": [
diff --git a/packages/internal/xrpc-utils/CHANGELOG.md b/packages/internal/xrpc-utils/CHANGELOG.md
index 9f68eb38da5..7bb6be2e535 100644
--- a/packages/internal/xrpc-utils/CHANGELOG.md
+++ b/packages/internal/xrpc-utils/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @atproto-labs/xrpc-utils
 
+## 0.0.6
+
+### Patch Changes
+
+- Updated dependencies [[`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd), [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd)]:
+  - @atproto/xrpc-server@0.7.10
+  - @atproto/xrpc@0.6.8
+
 ## 0.0.5
 
 ### Patch Changes
diff --git a/packages/internal/xrpc-utils/package.json b/packages/internal/xrpc-utils/package.json
index 4e4304f4457..cd440e57898 100644
--- a/packages/internal/xrpc-utils/package.json
+++ b/packages/internal/xrpc-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto-labs/xrpc-utils",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "license": "MIT",
   "description": "XRPC server utilities for Node.JS",
   "keywords": [
diff --git a/packages/lex-cli/CHANGELOG.md b/packages/lex-cli/CHANGELOG.md
index b156f3c6b68..282c296fc96 100644
--- a/packages/lex-cli/CHANGELOG.md
+++ b/packages/lex-cli/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @atproto/lex-cli
 
+## 0.5.7
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Update NodeJS engine requirement to >=18.7.0
+
+- Updated dependencies [[`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd)]:
+  - @atproto/lexicon@0.4.6
+  - @atproto/syntax@0.3.2
+
 ## 0.5.6
 
 ### Patch Changes
diff --git a/packages/lex-cli/package.json b/packages/lex-cli/package.json
index e1c3843af63..408c3161e45 100644
--- a/packages/lex-cli/package.json
+++ b/packages/lex-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/lex-cli",
-  "version": "0.5.6",
+  "version": "0.5.7",
   "license": "MIT",
   "description": "TypeScript codegen tool for atproto Lexicon schemas",
   "keywords": [
diff --git a/packages/lexicon/CHANGELOG.md b/packages/lexicon/CHANGELOG.md
index 39bdb8c48c6..f9b3746d268 100644
--- a/packages/lexicon/CHANGELOG.md
+++ b/packages/lexicon/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @atproto/lexicon
 
+## 0.4.6
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
+- Updated dependencies [[`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd), [`8a30e0ed9`](https://github.com/bluesky-social/atproto/commit/8a30e0ed9239cb2037d54fb98e70e8b0cfbc3e39)]:
+  - @atproto/common-web@0.4.0
+  - @atproto/syntax@0.3.2
+
 ## 0.4.5
 
 ### Patch Changes
diff --git a/packages/lexicon/package.json b/packages/lexicon/package.json
index bacb0aa2b61..dc5e2a925cf 100644
--- a/packages/lexicon/package.json
+++ b/packages/lexicon/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/lexicon",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "license": "MIT",
   "description": "atproto Lexicon schema language library",
   "keywords": [
diff --git a/packages/oauth/jwk-jose/CHANGELOG.md b/packages/oauth/jwk-jose/CHANGELOG.md
index 875fa48b37c..22e3f9649ff 100644
--- a/packages/oauth/jwk-jose/CHANGELOG.md
+++ b/packages/oauth/jwk-jose/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @atproto/jwk-jose
 
+## 0.1.4
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
+- Updated dependencies [[`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd)]:
+  - @atproto/jwk@0.1.3
+
 ## 0.1.3
 
 ### Patch Changes
diff --git a/packages/oauth/jwk-jose/package.json b/packages/oauth/jwk-jose/package.json
index 8eb21ecefd6..ff016b94877 100644
--- a/packages/oauth/jwk-jose/package.json
+++ b/packages/oauth/jwk-jose/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/jwk-jose",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "license": "MIT",
   "description": "`jose` based implementation of @atproto/jwk Key's",
   "keywords": [
diff --git a/packages/oauth/jwk-webcrypto/CHANGELOG.md b/packages/oauth/jwk-webcrypto/CHANGELOG.md
index 29eae3377c4..689b135f8bb 100644
--- a/packages/oauth/jwk-webcrypto/CHANGELOG.md
+++ b/packages/oauth/jwk-webcrypto/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @atproto/jwk-webcrypto
 
+## 0.1.4
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
+- Updated dependencies [[`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd)]:
+  - @atproto/jwk-jose@0.1.4
+  - @atproto/jwk@0.1.3
+
 ## 0.1.3
 
 ### Patch Changes
diff --git a/packages/oauth/jwk-webcrypto/package.json b/packages/oauth/jwk-webcrypto/package.json
index daf3aad9a2b..625314c14cf 100644
--- a/packages/oauth/jwk-webcrypto/package.json
+++ b/packages/oauth/jwk-webcrypto/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/jwk-webcrypto",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "license": "MIT",
   "description": "Webcrypto based implementation of @atproto/jwk Key's",
   "keywords": [
diff --git a/packages/oauth/jwk/CHANGELOG.md b/packages/oauth/jwk/CHANGELOG.md
index 7343b312cf0..e63d1aa2d30 100644
--- a/packages/oauth/jwk/CHANGELOG.md
+++ b/packages/oauth/jwk/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @atproto/jwk
 
+## 0.1.3
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
 ## 0.1.2
 
 ### Patch Changes
diff --git a/packages/oauth/jwk/package.json b/packages/oauth/jwk/package.json
index 33a333c7bdd..6679f0fc6ad 100644
--- a/packages/oauth/jwk/package.json
+++ b/packages/oauth/jwk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/jwk",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "license": "MIT",
   "description": "A library for working with JSON Web Keys (JWKs) in TypeScript. This is meant to be extended by environment-specific libraries like @atproto/jwk-jose.",
   "keywords": [
diff --git a/packages/oauth/oauth-client-browser-example/CHANGELOG.md b/packages/oauth/oauth-client-browser-example/CHANGELOG.md
new file mode 100644
index 00000000000..2446a72cb0b
--- /dev/null
+++ b/packages/oauth/oauth-client-browser-example/CHANGELOG.md
@@ -0,0 +1,7 @@
+# @atproto/oauth-client-browser-example
+
+## 0.0.1
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
diff --git a/packages/oauth/oauth-client-browser-example/package.json b/packages/oauth/oauth-client-browser-example/package.json
index e24803d1e5a..ba383a705fa 100644
--- a/packages/oauth/oauth-client-browser-example/package.json
+++ b/packages/oauth/oauth-client-browser-example/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/oauth-client-browser-example",
-  "version": "0.0.0",
+  "version": "0.0.1",
   "license": "MIT",
   "description": "Example single page application app using ATPROTO OAuth",
   "keywords": [
diff --git a/packages/oauth/oauth-client-browser/CHANGELOG.md b/packages/oauth/oauth-client-browser/CHANGELOG.md
index f0f0722c01a..2422ffb9089 100644
--- a/packages/oauth/oauth-client-browser/CHANGELOG.md
+++ b/packages/oauth/oauth-client-browser/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @atproto/oauth-client-browser
 
+## 0.3.9
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
+- Updated dependencies [[`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd), [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd)]:
+  - @atproto-labs/handle-resolver@0.1.7
+  - @atproto-labs/did-resolver@0.1.10
+  - @atproto-labs/simple-store@0.1.2
+  - @atproto/jwk-webcrypto@0.1.4
+  - @atproto/oauth-client@0.3.9
+  - @atproto/oauth-types@0.2.3
+  - @atproto/jwk@0.1.3
+  - @atproto/did@0.1.5
+
 ## 0.3.8
 
 ### Patch Changes
diff --git a/packages/oauth/oauth-client-browser/package.json b/packages/oauth/oauth-client-browser/package.json
index 6f258e8227a..b34ee4d9de8 100644
--- a/packages/oauth/oauth-client-browser/package.json
+++ b/packages/oauth/oauth-client-browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/oauth-client-browser",
-  "version": "0.3.8",
+  "version": "0.3.9",
   "license": "MIT",
   "description": "ATPROTO OAuth client for the browser (relies on WebCrypto & Indexed DB)",
   "keywords": [
diff --git a/packages/oauth/oauth-client-node/CHANGELOG.md b/packages/oauth/oauth-client-node/CHANGELOG.md
index 7b9ee7d32ab..4b57a36282e 100644
--- a/packages/oauth/oauth-client-node/CHANGELOG.md
+++ b/packages/oauth/oauth-client-node/CHANGELOG.md
@@ -1,5 +1,24 @@
 # @atproto/oauth-client-node
 
+## 0.2.10
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Update NodeJS engine requirement to >=18.7.0
+
+- Updated dependencies [[`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd), [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd), [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd)]:
+  - @atproto-labs/handle-resolver-node@0.1.13
+  - @atproto-labs/did-resolver@0.1.10
+  - @atproto-labs/simple-store@0.1.2
+  - @atproto/jwk-webcrypto@0.1.4
+  - @atproto/oauth-client@0.3.9
+  - @atproto/oauth-types@0.2.3
+  - @atproto/jwk-jose@0.1.4
+  - @atproto/jwk@0.1.3
+  - @atproto/did@0.1.5
+
 ## 0.2.9
 
 ### Patch Changes
diff --git a/packages/oauth/oauth-client-node/package.json b/packages/oauth/oauth-client-node/package.json
index ceed5b92b38..6c3e192e74d 100644
--- a/packages/oauth/oauth-client-node/package.json
+++ b/packages/oauth/oauth-client-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/oauth-client-node",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "license": "MIT",
   "description": "ATPROTO OAuth client for the NodeJS",
   "keywords": [
diff --git a/packages/oauth/oauth-client/CHANGELOG.md b/packages/oauth/oauth-client/CHANGELOG.md
index bd1abda094b..76033774fe7 100644
--- a/packages/oauth/oauth-client/CHANGELOG.md
+++ b/packages/oauth/oauth-client/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @atproto/oauth-client
 
+## 0.3.9
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
+- Updated dependencies [[`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd), [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd)]:
+  - @atproto-labs/simple-store-memory@0.1.2
+  - @atproto-labs/identity-resolver@0.1.12
+  - @atproto-labs/handle-resolver@0.1.7
+  - @atproto-labs/did-resolver@0.1.10
+  - @atproto-labs/simple-store@0.1.2
+  - @atproto/oauth-types@0.2.3
+  - @atproto-labs/fetch@0.2.1
+  - @atproto/jwk@0.1.3
+  - @atproto/xrpc@0.6.8
+  - @atproto/did@0.1.5
+
 ## 0.3.8
 
 ### Patch Changes
diff --git a/packages/oauth/oauth-client/package.json b/packages/oauth/oauth-client/package.json
index 04d7dea7e33..3ea8f8f7496 100644
--- a/packages/oauth/oauth-client/package.json
+++ b/packages/oauth/oauth-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/oauth-client",
-  "version": "0.3.8",
+  "version": "0.3.9",
   "license": "MIT",
   "description": "OAuth client for ATPROTO PDS. This package serves as common base for environment-specific implementations (NodeJS, Browser, React-Native).",
   "keywords": [
diff --git a/packages/oauth/oauth-provider/CHANGELOG.md b/packages/oauth/oauth-provider/CHANGELOG.md
index 8026c2e2f81..3f470db43d1 100644
--- a/packages/oauth/oauth-provider/CHANGELOG.md
+++ b/packages/oauth/oauth-provider/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @atproto/oauth-provider
 
+## 0.2.17
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Update NodeJS engine requirement to >=18.7.0
+
+- Updated dependencies [[`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd), [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd), [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd)]:
+  - @atproto-labs/simple-store-memory@0.1.2
+  - @atproto-labs/simple-store@0.1.2
+  - @atproto-labs/fetch-node@0.1.7
+  - @atproto/oauth-types@0.2.3
+  - @atproto-labs/fetch@0.2.1
+  - @atproto/jwk-jose@0.1.4
+  - @atproto/jwk@0.1.3
+  - @atproto/common@0.4.8
+
 ## 0.2.16
 
 ### Patch Changes
diff --git a/packages/oauth/oauth-provider/package.json b/packages/oauth/oauth-provider/package.json
index 66cc156f389..248bb61a394 100644
--- a/packages/oauth/oauth-provider/package.json
+++ b/packages/oauth/oauth-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/oauth-provider",
-  "version": "0.2.16",
+  "version": "0.2.17",
   "license": "MIT",
   "description": "Generic OAuth2 and OpenID Connect provider for Node.js. Currently only supports features needed for Atproto.",
   "keywords": [
diff --git a/packages/oauth/oauth-types/CHANGELOG.md b/packages/oauth/oauth-types/CHANGELOG.md
index 854b297560b..3c60233afed 100644
--- a/packages/oauth/oauth-types/CHANGELOG.md
+++ b/packages/oauth/oauth-types/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @atproto/oauth-types
 
+## 0.2.3
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Support environments not providing URL.canParse
+
+- Updated dependencies [[`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd)]:
+  - @atproto/jwk@0.1.3
+
 ## 0.2.2
 
 ### Patch Changes
diff --git a/packages/oauth/oauth-types/package.json b/packages/oauth/oauth-types/package.json
index 7e4b08bb4f0..e03df40a967 100644
--- a/packages/oauth/oauth-types/package.json
+++ b/packages/oauth/oauth-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/oauth-types",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "license": "MIT",
   "description": "OAuth typing & validation library",
   "keywords": [
diff --git a/packages/ozone/CHANGELOG.md b/packages/ozone/CHANGELOG.md
index d57ad6a54de..abdedf182be 100644
--- a/packages/ozone/CHANGELOG.md
+++ b/packages/ozone/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @atproto/ozone
 
+## 0.1.75
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Update NodeJS engine requirement to >=18.7.0
+
+- Updated dependencies [[`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd), [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd), [`87ed907a6`](https://github.com/bluesky-social/atproto/commit/87ed907a6b96b408c02c9af819cec8380a453254)]:
+  - @atproto/xrpc-server@0.7.10
+  - @atproto/identity@0.4.6
+  - @atproto/lexicon@0.4.6
+  - @atproto/common@0.4.8
+  - @atproto/crypto@0.4.4
+  - @atproto/syntax@0.3.2
+  - @atproto/xrpc@0.6.8
+  - @atproto/api@0.13.33
+
 ## 0.1.74
 
 ### Patch Changes
diff --git a/packages/ozone/package.json b/packages/ozone/package.json
index 196e69ae7e3..06f64d3eb86 100644
--- a/packages/ozone/package.json
+++ b/packages/ozone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.1.74",
+  "version": "0.1.75",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
diff --git a/packages/pds/CHANGELOG.md b/packages/pds/CHANGELOG.md
index 9d013841fab..b2f35e11684 100644
--- a/packages/pds/CHANGELOG.md
+++ b/packages/pds/CHANGELOG.md
@@ -1,5 +1,30 @@
 # @atproto/pds
 
+## 0.4.92
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Update NodeJS engine requirement to >=18.7.0
+
+- [#3492](https://github.com/bluesky-social/atproto/pull/3492) [`53a577fd4`](https://github.com/bluesky-social/atproto/commit/53a577fd4bfb1c7301e14db85b42f4758b053dee) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Code refactor
+
+- Updated dependencies [[`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd), [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd), [`87ed907a6`](https://github.com/bluesky-social/atproto/commit/87ed907a6b96b408c02c9af819cec8380a453254)]:
+  - @atproto/oauth-provider@0.2.17
+  - @atproto-labs/fetch-node@0.1.7
+  - @atproto/xrpc-server@0.7.10
+  - @atproto/identity@0.4.6
+  - @atproto/lexicon@0.4.6
+  - @atproto/common@0.4.8
+  - @atproto/crypto@0.4.4
+  - @atproto/syntax@0.3.2
+  - @atproto/repo@0.6.4
+  - @atproto/xrpc@0.6.8
+  - @atproto/api@0.13.33
+  - @atproto/aws@0.2.14
+  - @atproto-labs/xrpc-utils@0.0.6
+
 ## 0.4.91
 
 ### Patch Changes
diff --git a/packages/pds/package.json b/packages/pds/package.json
index 3939e453f07..3bfba166322 100644
--- a/packages/pds/package.json
+++ b/packages/pds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/pds",
-  "version": "0.4.91",
+  "version": "0.4.92",
   "license": "MIT",
   "description": "Reference implementation of atproto Personal Data Server (PDS)",
   "keywords": [
diff --git a/packages/repo/CHANGELOG.md b/packages/repo/CHANGELOG.md
index 4ce908fac26..f972303de06 100644
--- a/packages/repo/CHANGELOG.md
+++ b/packages/repo/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @atproto/repo
 
+## 0.6.4
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Update NodeJS engine requirement to >=18.7.0
+
+- Updated dependencies [[`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd), [`8a30e0ed9`](https://github.com/bluesky-social/atproto/commit/8a30e0ed9239cb2037d54fb98e70e8b0cfbc3e39), [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd)]:
+  - @atproto/common-web@0.4.0
+  - @atproto/lexicon@0.4.6
+  - @atproto/common@0.4.8
+  - @atproto/crypto@0.4.4
+
 ## 0.6.3
 
 ### Patch Changes
diff --git a/packages/repo/package.json b/packages/repo/package.json
index 8abc3d13128..06a3cc4f585 100644
--- a/packages/repo/package.json
+++ b/packages/repo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/repo",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "license": "MIT",
   "description": "atproto repo and MST implementation",
   "keywords": [
diff --git a/packages/sync/CHANGELOG.md b/packages/sync/CHANGELOG.md
index 5a9f659f7ad..806ae256a19 100644
--- a/packages/sync/CHANGELOG.md
+++ b/packages/sync/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @atproto/sync
 
+## 0.1.13
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Update NodeJS engine requirement to >=18.7.0
+
+- Updated dependencies [[`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd), [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd)]:
+  - @atproto/xrpc-server@0.7.10
+  - @atproto/identity@0.4.6
+  - @atproto/lexicon@0.4.6
+  - @atproto/common@0.4.8
+  - @atproto/syntax@0.3.2
+  - @atproto/repo@0.6.4
+
 ## 0.1.12
 
 ### Patch Changes
diff --git a/packages/sync/package.json b/packages/sync/package.json
index 0a7eef8dbae..3c14022e625 100644
--- a/packages/sync/package.json
+++ b/packages/sync/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/sync",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "license": "MIT",
   "description": "atproto sync library",
   "keywords": [
diff --git a/packages/syntax/CHANGELOG.md b/packages/syntax/CHANGELOG.md
index ba2708d0b74..ee1a46ceb05 100644
--- a/packages/syntax/CHANGELOG.md
+++ b/packages/syntax/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @atproto/syntax
 
+## 0.3.2
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
 ## 0.3.1
 
 ### Patch Changes
diff --git a/packages/syntax/package.json b/packages/syntax/package.json
index dad2f8fb3e5..5c49ed335a6 100644
--- a/packages/syntax/package.json
+++ b/packages/syntax/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/syntax",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "license": "MIT",
   "description": "Validation for atproto identifiers and formats: DID, handle, NSID, AT URI, etc",
   "keywords": [
diff --git a/packages/xrpc-server/CHANGELOG.md b/packages/xrpc-server/CHANGELOG.md
index 78578a49a90..04fb0b013c2 100644
--- a/packages/xrpc-server/CHANGELOG.md
+++ b/packages/xrpc-server/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @atproto/xrpc-server
 
+## 0.7.10
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Update NodeJS engine requirement to >=18.7.0
+
+- Updated dependencies [[`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd), [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd)]:
+  - @atproto/lexicon@0.4.6
+  - @atproto/common@0.4.8
+  - @atproto/crypto@0.4.4
+  - @atproto/xrpc@0.6.8
+
 ## 0.7.9
 
 ### Patch Changes
diff --git a/packages/xrpc-server/package.json b/packages/xrpc-server/package.json
index 1ffa7f0b613..76529d04835 100644
--- a/packages/xrpc-server/package.json
+++ b/packages/xrpc-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/xrpc-server",
-  "version": "0.7.9",
+  "version": "0.7.10",
   "license": "MIT",
   "description": "atproto HTTP API (XRPC) server library",
   "keywords": [
diff --git a/packages/xrpc/CHANGELOG.md b/packages/xrpc/CHANGELOG.md
index d5f666eff40..b0f307427d2 100644
--- a/packages/xrpc/CHANGELOG.md
+++ b/packages/xrpc/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @atproto/xrpc
 
+## 0.6.8
+
+### Patch Changes
+
+- [#3220](https://github.com/bluesky-social/atproto/pull/3220) [`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply new linting rules regarding import order
+
+- Updated dependencies [[`61dc0d60e`](https://github.com/bluesky-social/atproto/commit/61dc0d60e19b88c6427a54c6d95a391b5f4da7bd)]:
+  - @atproto/lexicon@0.4.6
+
 ## 0.6.7
 
 ### Patch Changes
diff --git a/packages/xrpc/package.json b/packages/xrpc/package.json
index c3a2ecb8996..8e67dad33a3 100644
--- a/packages/xrpc/package.json
+++ b/packages/xrpc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/xrpc",
-  "version": "0.6.7",
+  "version": "0.6.8",
   "license": "MIT",
   "description": "atproto HTTP API (XRPC) client library",
   "keywords": [

From dc8a7842e67f5f3709e88310d2a60d384453b486 Mon Sep 17 00:00:00 2001
From: rafael <rafael@blueskyweb.xyz>
Date: Thu, 6 Feb 2025 06:52:21 -0800
Subject: [PATCH 050/101] Add followerRule threadgate (#3496)

* Add followerRule threadgate

* changeset
---
 .changeset/angry-glasses-sin.md               |   5 +
 .changeset/silver-horses-rush.md              |   5 +
 lexicons/app/bsky/feed/threadgate.json        |  12 +-
 packages/api/src/client/lexicons.ts           |   6 +
 .../client/types/app/bsky/feed/threadgate.ts  |  18 +++
 packages/bsky/src/data-plane/server/util.ts   |  13 +-
 packages/bsky/src/lexicon/lexicons.ts         |   6 +
 .../lexicon/types/app/bsky/feed/threadgate.ts |  18 +++
 packages/bsky/src/views/index.ts              |   4 +
 packages/bsky/src/views/util.ts               |  13 +-
 .../__snapshots__/threadgating.test.ts.snap   |  21 ++++
 .../bsky/tests/views/threadgating.test.ts     | 116 ++++++++++++++++--
 packages/ozone/src/lexicon/lexicons.ts        |   6 +
 .../lexicon/types/app/bsky/feed/threadgate.ts |  18 +++
 packages/pds/src/lexicon/lexicons.ts          |   6 +
 .../lexicon/types/app/bsky/feed/threadgate.ts |  18 +++
 16 files changed, 273 insertions(+), 12 deletions(-)
 create mode 100644 .changeset/angry-glasses-sin.md
 create mode 100644 .changeset/silver-horses-rush.md

diff --git a/.changeset/angry-glasses-sin.md b/.changeset/angry-glasses-sin.md
new file mode 100644
index 00000000000..3d477db0544
--- /dev/null
+++ b/.changeset/angry-glasses-sin.md
@@ -0,0 +1,5 @@
+---
+"@atproto/api": patch
+---
+
+Add followerRule threadgate
diff --git a/.changeset/silver-horses-rush.md b/.changeset/silver-horses-rush.md
new file mode 100644
index 00000000000..4f0163a9988
--- /dev/null
+++ b/.changeset/silver-horses-rush.md
@@ -0,0 +1,5 @@
+---
+"@atproto/bsky": patch
+---
+
+Add followerRule threadgate
diff --git a/lexicons/app/bsky/feed/threadgate.json b/lexicons/app/bsky/feed/threadgate.json
index c3f05d168de..f1a869999fc 100644
--- a/lexicons/app/bsky/feed/threadgate.json
+++ b/lexicons/app/bsky/feed/threadgate.json
@@ -21,7 +21,12 @@
             "maxLength": 5,
             "items": {
               "type": "union",
-              "refs": ["#mentionRule", "#followingRule", "#listRule"]
+              "refs": [
+                "#mentionRule",
+                "#followerRule",
+                "#followingRule",
+                "#listRule"
+              ]
             }
           },
           "createdAt": { "type": "string", "format": "datetime" },
@@ -42,6 +47,11 @@
       "description": "Allow replies from actors mentioned in your post.",
       "properties": {}
     },
+    "followerRule": {
+      "type": "object",
+      "description": "Allow replies from actors who follow you.",
+      "properties": {}
+    },
     "followingRule": {
       "type": "object",
       "description": "Allow replies from actors you follow.",
diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
index da60722b17a..cd5db7cf588 100644
--- a/packages/api/src/client/lexicons.ts
+++ b/packages/api/src/client/lexicons.ts
@@ -7376,6 +7376,7 @@ export const schemaDict = {
                 type: 'union',
                 refs: [
                   'lex:app.bsky.feed.threadgate#mentionRule',
+                  'lex:app.bsky.feed.threadgate#followerRule',
                   'lex:app.bsky.feed.threadgate#followingRule',
                   'lex:app.bsky.feed.threadgate#listRule',
                 ],
@@ -7402,6 +7403,11 @@ export const schemaDict = {
         description: 'Allow replies from actors mentioned in your post.',
         properties: {},
       },
+      followerRule: {
+        type: 'object',
+        description: 'Allow replies from actors who follow you.',
+        properties: {},
+      },
       followingRule: {
         type: 'object',
         description: 'Allow replies from actors you follow.',
diff --git a/packages/api/src/client/types/app/bsky/feed/threadgate.ts b/packages/api/src/client/types/app/bsky/feed/threadgate.ts
index 4a8159e8844..1fe87016dce 100644
--- a/packages/api/src/client/types/app/bsky/feed/threadgate.ts
+++ b/packages/api/src/client/types/app/bsky/feed/threadgate.ts
@@ -12,6 +12,7 @@ export interface Record {
   /** List of rules defining who can reply to this post. If value is an empty array, no one can reply. If value is undefined, anyone can reply. */
   allow?: (
     | MentionRule
+    | FollowerRule
     | FollowingRule
     | ListRule
     | { $type: string; [k: string]: unknown }
@@ -52,6 +53,23 @@ export function validateMentionRule(v: unknown): ValidationResult {
   return lexicons.validate('app.bsky.feed.threadgate#mentionRule', v)
 }
 
+/** Allow replies from actors who follow you. */
+export interface FollowerRule {
+  [k: string]: unknown
+}
+
+export function isFollowerRule(v: unknown): v is FollowerRule {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'app.bsky.feed.threadgate#followerRule'
+  )
+}
+
+export function validateFollowerRule(v: unknown): ValidationResult {
+  return lexicons.validate('app.bsky.feed.threadgate#followerRule', v)
+}
+
 /** Allow replies from actors you follow. */
 export interface FollowingRule {
   [k: string]: unknown
diff --git a/packages/bsky/src/data-plane/server/util.ts b/packages/bsky/src/data-plane/server/util.ts
index 55d090cbae8..67a7209d875 100644
--- a/packages/bsky/src/data-plane/server/util.ts
+++ b/packages/bsky/src/data-plane/server/util.ts
@@ -100,13 +100,14 @@ export const violatesThreadGate = async (
 ) => {
   const {
     canReply,
+    allowFollower,
     allowFollowing,
     allowListUris = [],
   } = parseThreadGate(replierDid, ownerDid, rootPost, gate)
   if (canReply) {
     return false
   }
-  if (!allowFollowing && !allowListUris?.length) {
+  if (!allowFollower && !allowFollowing && !allowListUris?.length) {
     return true
   }
   const { ref } = db.dynamic
@@ -114,6 +115,14 @@ export const violatesThreadGate = async (
   const check = await db
     .selectFrom(valuesList([replierDid]).as(sql`subject (did)`))
     .select([
+      allowFollower
+        ? db
+            .selectFrom('follow')
+            .where('subjectDid', '=', ownerDid)
+            .whereRef('creator', '=', ref('subject.did'))
+            .select('subjectDid')
+            .as('isFollower')
+        : nullResult.as('isFollower'),
       allowFollowing
         ? db
             .selectFrom('follow')
@@ -136,6 +145,8 @@ export const violatesThreadGate = async (
 
   if (allowFollowing && check?.isFollowed) {
     return false
+  } else if (allowFollower && check?.isFollower) {
+    return false
   } else if (allowListUris.length && check?.isInList) {
     return false
   }
diff --git a/packages/bsky/src/lexicon/lexicons.ts b/packages/bsky/src/lexicon/lexicons.ts
index 4c92bc7f2bf..02f3daa30cd 100644
--- a/packages/bsky/src/lexicon/lexicons.ts
+++ b/packages/bsky/src/lexicon/lexicons.ts
@@ -7376,6 +7376,7 @@ export const schemaDict = {
                 type: 'union',
                 refs: [
                   'lex:app.bsky.feed.threadgate#mentionRule',
+                  'lex:app.bsky.feed.threadgate#followerRule',
                   'lex:app.bsky.feed.threadgate#followingRule',
                   'lex:app.bsky.feed.threadgate#listRule',
                 ],
@@ -7402,6 +7403,11 @@ export const schemaDict = {
         description: 'Allow replies from actors mentioned in your post.',
         properties: {},
       },
+      followerRule: {
+        type: 'object',
+        description: 'Allow replies from actors who follow you.',
+        properties: {},
+      },
       followingRule: {
         type: 'object',
         description: 'Allow replies from actors you follow.',
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/threadgate.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/threadgate.ts
index 135c5ba73ec..869b8d51d64 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/threadgate.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/threadgate.ts
@@ -12,6 +12,7 @@ export interface Record {
   /** List of rules defining who can reply to this post. If value is an empty array, no one can reply. If value is undefined, anyone can reply. */
   allow?: (
     | MentionRule
+    | FollowerRule
     | FollowingRule
     | ListRule
     | { $type: string; [k: string]: unknown }
@@ -52,6 +53,23 @@ export function validateMentionRule(v: unknown): ValidationResult {
   return lexicons.validate('app.bsky.feed.threadgate#mentionRule', v)
 }
 
+/** Allow replies from actors who follow you. */
+export interface FollowerRule {
+  [k: string]: unknown
+}
+
+export function isFollowerRule(v: unknown): v is FollowerRule {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'app.bsky.feed.threadgate#followerRule'
+  )
+}
+
+export function validateFollowerRule(v: unknown): ValidationResult {
+  return lexicons.validate('app.bsky.feed.threadgate#followerRule', v)
+}
+
 /** Allow replies from actors you follow. */
 export interface FollowingRule {
   [k: string]: unknown
diff --git a/packages/bsky/src/views/index.ts b/packages/bsky/src/views/index.ts
index 78273ad2331..d28b1bc7cb2 100644
--- a/packages/bsky/src/views/index.ts
+++ b/packages/bsky/src/views/index.ts
@@ -1163,12 +1163,16 @@ export class Views {
     const ownerDid = creatorFromUri(rootUriStr)
     const {
       canReply,
+      allowFollower,
       allowFollowing,
       allowListUris = [],
     } = parseThreadGate(viewer, ownerDid, rootPost ?? null, gate)
     if (canReply) {
       return false
     }
+    if (allowFollower && state.profileViewers?.get(ownerDid)?.following) {
+      return false
+    }
     if (allowFollowing && state.profileViewers?.get(ownerDid)?.followedBy) {
       return false
     }
diff --git a/packages/bsky/src/views/util.ts b/packages/bsky/src/views/util.ts
index 2ec393d53a0..de595c840a1 100644
--- a/packages/bsky/src/views/util.ts
+++ b/packages/bsky/src/views/util.ts
@@ -7,6 +7,7 @@ import {
 } from '../lexicon/types/app/bsky/feed/postgate'
 import {
   Record as GateRecord,
+  isFollowerRule,
   isFollowingRule,
   isListRule,
   isMentionRule,
@@ -28,6 +29,7 @@ export const parseThreadGate = (
   }
 
   const allowMentions = gate.allow.some(isMentionRule)
+  const allowFollower = gate.allow.some(isFollowerRule)
   const allowFollowing = gate.allow.some(isFollowingRule)
   const allowListUris = gate.allow?.filter(isListRule).map((item) => item.list)
 
@@ -39,15 +41,22 @@ export const parseThreadGate = (
       )
     })
     if (isMentioned) {
-      return { canReply: true, allowMentions, allowFollowing, allowListUris }
+      return {
+        canReply: true,
+        allowMentions,
+        allowFollower,
+        allowFollowing,
+        allowListUris,
+      }
     }
   }
-  return { allowMentions, allowFollowing, allowListUris }
+  return { allowMentions, allowFollower, allowFollowing, allowListUris }
 }
 
 type ParsedThreadGate = {
   canReply?: boolean
   allowMentions?: boolean
+  allowFollower?: boolean
   allowFollowing?: boolean
   allowListUris?: string[]
 }
diff --git a/packages/bsky/tests/views/__snapshots__/threadgating.test.ts.snap b/packages/bsky/tests/views/__snapshots__/threadgating.test.ts.snap
index fddc2ff9291..46279d965ed 100644
--- a/packages/bsky/tests/views/__snapshots__/threadgating.test.ts.snap
+++ b/packages/bsky/tests/views/__snapshots__/threadgating.test.ts.snap
@@ -16,6 +16,24 @@ Object {
 }
 `;
 
+exports[`views with thread gating applies gate for follower rule. 1`] = `
+Object {
+  "cid": "cids(0)",
+  "lists": Array [],
+  "record": Object {
+    "$type": "app.bsky.feed.threadgate",
+    "allow": Array [
+      Object {
+        "$type": "app.bsky.feed.threadgate#followerRule",
+      },
+    ],
+    "createdAt": "1970-01-01T00:00:00.000Z",
+    "post": "record(1)",
+  },
+  "uri": "record(0)",
+}
+`;
+
 exports[`views with thread gating applies gate for following rule. 1`] = `
 Object {
   "cid": "cids(0)",
@@ -123,6 +141,9 @@ Object {
       Object {
         "$type": "app.bsky.feed.threadgate#mentionRule",
       },
+      Object {
+        "$type": "app.bsky.feed.threadgate#followerRule",
+      },
       Object {
         "$type": "app.bsky.feed.threadgate#followingRule",
       },
diff --git a/packages/bsky/tests/views/threadgating.test.ts b/packages/bsky/tests/views/threadgating.test.ts
index 260c1b8af21..74fb91c8452 100644
--- a/packages/bsky/tests/views/threadgating.test.ts
+++ b/packages/bsky/tests/views/threadgating.test.ts
@@ -22,6 +22,11 @@ describe('views with thread gating', () => {
     pdsAgent = network.pds.getClient()
     sc = network.getSeedClient()
     await basicSeed(sc)
+    await sc.createAccount('eve', {
+      handle: 'eve.test',
+      email: 'eve@eve.com',
+      password: 'hunter2',
+    })
     await network.processAll()
   })
 
@@ -242,8 +247,72 @@ describe('views with thread gating', () => {
     expect(reply.post.uri).toEqual(aliceReply.ref.uriStr)
   })
 
+  it('applies gate for follower rule.', async () => {
+    const post = await sc.post(sc.dids.carol, 'follower rule')
+    await pdsAgent.api.app.bsky.feed.threadgate.create(
+      { repo: sc.dids.carol, rkey: post.ref.uri.rkey },
+      {
+        post: post.ref.uriStr,
+        createdAt: iso(),
+        allow: [{ $type: 'app.bsky.feed.threadgate#followerRule' }],
+      },
+      sc.getHeaders(sc.dids.carol),
+    )
+    await network.processAll()
+
+    // dan does not follow carol, can't reply
+    await sc.reply(
+      sc.dids.dan,
+      post.ref,
+      post.ref,
+      'follower rule reply disallow',
+    )
+
+    // alice follows carol, can reply
+    const aliceReply = await sc.reply(
+      sc.dids.alice,
+      post.ref,
+      post.ref,
+      'follower rule reply allow',
+    )
+    await network.processAll()
+    const {
+      data: { thread: danThread },
+    } = await agent.api.app.bsky.feed.getPostThread(
+      { uri: post.ref.uriStr },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.dan,
+          ids.AppBskyFeedGetPostThread,
+        ),
+      },
+    )
+    assert(isThreadViewPost(danThread))
+    expect(danThread.post.viewer?.replyDisabled).toBe(true)
+    await checkReplyDisabled(post.ref.uriStr, sc.dids.dan, true)
+    const {
+      data: { thread: aliceThread },
+    } = await agent.api.app.bsky.feed.getPostThread(
+      { uri: post.ref.uriStr },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.alice,
+          ids.AppBskyFeedGetPostThread,
+        ),
+      },
+    )
+    assert(isThreadViewPost(aliceThread))
+    expect(forSnapshot(aliceThread.post.threadgate)).toMatchSnapshot()
+    expect(aliceThread.post.viewer?.replyDisabled).toBe(false)
+    await checkReplyDisabled(post.ref.uriStr, sc.dids.alice, false)
+    const [reply, ...otherReplies] = aliceThread.replies ?? []
+    assert(isThreadViewPost(reply))
+    expect(otherReplies.length).toEqual(0)
+    expect(reply.post.uri).toEqual(aliceReply.ref.uriStr)
+  })
+
   it('applies gate for list rule.', async () => {
-    const post = await sc.post(sc.dids.carol, 'following rule')
+    const post = await sc.post(sc.dids.carol, 'list rule')
     // setup lists to allow alice and dan
     const listA = await pdsAgent.api.app.bsky.graph.list.create(
       { repo: sc.dids.carol },
@@ -419,14 +488,21 @@ describe('views with thread gating', () => {
         createdAt: iso(),
         allow: [
           { $type: 'app.bsky.feed.threadgate#mentionRule' },
+          { $type: 'app.bsky.feed.threadgate#followerRule' },
           { $type: 'app.bsky.feed.threadgate#followingRule' },
         ],
       },
       sc.getHeaders(sc.dids.carol),
     )
     await network.processAll()
-    // carol only follows alice, and the post mentions dan.
-    await sc.reply(sc.dids.bob, post.ref, post.ref, 'multi rule reply disallow')
+
+    await sc.reply(sc.dids.eve, post.ref, post.ref, 'multi rule reply disallow')
+    const bobReply = await sc.reply(
+      sc.dids.bob,
+      post.ref,
+      post.ref,
+      'multi rule reply allow (follower)',
+    )
     const aliceReply = await sc.reply(
       sc.dids.alice,
       post.ref,
@@ -440,6 +516,23 @@ describe('views with thread gating', () => {
       'multi rule reply allow (mention)',
     )
     await network.processAll()
+
+    const {
+      data: { thread: eveThread },
+    } = await agent.api.app.bsky.feed.getPostThread(
+      { uri: post.ref.uriStr },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.eve,
+          ids.AppBskyFeedGetPostThread,
+        ),
+      },
+    )
+    assert(isThreadViewPost(eveThread))
+    // eve cannot interact
+    expect(eveThread.post.viewer?.replyDisabled).toBe(true)
+    await checkReplyDisabled(post.ref.uriStr, sc.dids.eve, true)
+
     const {
       data: { thread: bobThread },
     } = await agent.api.app.bsky.feed.getPostThread(
@@ -452,8 +545,10 @@ describe('views with thread gating', () => {
       },
     )
     assert(isThreadViewPost(bobThread))
-    expect(bobThread.post.viewer?.replyDisabled).toBe(true)
-    await checkReplyDisabled(post.ref.uriStr, sc.dids.bob, true)
+    // bob follows carol, followers can reply
+    expect(bobThread.post.viewer?.replyDisabled).toBe(false)
+    await checkReplyDisabled(post.ref.uriStr, sc.dids.bob, false)
+
     const {
       data: { thread: aliceThread },
     } = await agent.api.app.bsky.feed.getPostThread(
@@ -466,8 +561,10 @@ describe('views with thread gating', () => {
       },
     )
     assert(isThreadViewPost(aliceThread))
+    // carol follows alice, followed users can reply
     expect(aliceThread.post.viewer?.replyDisabled).toBe(false)
     await checkReplyDisabled(post.ref.uriStr, sc.dids.alice, false)
+
     const {
       data: { thread: danThread },
     } = await agent.api.app.bsky.feed.getPostThread(
@@ -481,14 +578,17 @@ describe('views with thread gating', () => {
     )
     assert(isThreadViewPost(danThread))
     expect(forSnapshot(danThread.post.threadgate)).toMatchSnapshot()
+    // dan was mentioned, mentioned users can reply
     expect(danThread.post.viewer?.replyDisabled).toBe(false)
     await checkReplyDisabled(post.ref.uriStr, sc.dids.dan, false)
-    const [reply1, reply2, ...otherReplies] = aliceThread.replies ?? []
+
+    const [reply1, reply2, reply3, ...otherReplies] = aliceThread.replies ?? []
     assert(isThreadViewPost(reply1))
     assert(isThreadViewPost(reply2))
+    assert(isThreadViewPost(reply3))
     expect(otherReplies.length).toEqual(0)
-    expect([reply1.post.uri, reply2.post.uri].sort()).toEqual(
-      [aliceReply.ref.uriStr, danReply.ref.uriStr].sort(),
+    expect([reply1.post.uri, reply2.post.uri, reply3.post.uri].sort()).toEqual(
+      [aliceReply.ref.uriStr, danReply.ref.uriStr, bobReply.ref.uriStr].sort(),
     )
   })
 
diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
index da60722b17a..cd5db7cf588 100644
--- a/packages/ozone/src/lexicon/lexicons.ts
+++ b/packages/ozone/src/lexicon/lexicons.ts
@@ -7376,6 +7376,7 @@ export const schemaDict = {
                 type: 'union',
                 refs: [
                   'lex:app.bsky.feed.threadgate#mentionRule',
+                  'lex:app.bsky.feed.threadgate#followerRule',
                   'lex:app.bsky.feed.threadgate#followingRule',
                   'lex:app.bsky.feed.threadgate#listRule',
                 ],
@@ -7402,6 +7403,11 @@ export const schemaDict = {
         description: 'Allow replies from actors mentioned in your post.',
         properties: {},
       },
+      followerRule: {
+        type: 'object',
+        description: 'Allow replies from actors who follow you.',
+        properties: {},
+      },
       followingRule: {
         type: 'object',
         description: 'Allow replies from actors you follow.',
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/threadgate.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/threadgate.ts
index 135c5ba73ec..869b8d51d64 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/threadgate.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/threadgate.ts
@@ -12,6 +12,7 @@ export interface Record {
   /** List of rules defining who can reply to this post. If value is an empty array, no one can reply. If value is undefined, anyone can reply. */
   allow?: (
     | MentionRule
+    | FollowerRule
     | FollowingRule
     | ListRule
     | { $type: string; [k: string]: unknown }
@@ -52,6 +53,23 @@ export function validateMentionRule(v: unknown): ValidationResult {
   return lexicons.validate('app.bsky.feed.threadgate#mentionRule', v)
 }
 
+/** Allow replies from actors who follow you. */
+export interface FollowerRule {
+  [k: string]: unknown
+}
+
+export function isFollowerRule(v: unknown): v is FollowerRule {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'app.bsky.feed.threadgate#followerRule'
+  )
+}
+
+export function validateFollowerRule(v: unknown): ValidationResult {
+  return lexicons.validate('app.bsky.feed.threadgate#followerRule', v)
+}
+
 /** Allow replies from actors you follow. */
 export interface FollowingRule {
   [k: string]: unknown
diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
index da60722b17a..cd5db7cf588 100644
--- a/packages/pds/src/lexicon/lexicons.ts
+++ b/packages/pds/src/lexicon/lexicons.ts
@@ -7376,6 +7376,7 @@ export const schemaDict = {
                 type: 'union',
                 refs: [
                   'lex:app.bsky.feed.threadgate#mentionRule',
+                  'lex:app.bsky.feed.threadgate#followerRule',
                   'lex:app.bsky.feed.threadgate#followingRule',
                   'lex:app.bsky.feed.threadgate#listRule',
                 ],
@@ -7402,6 +7403,11 @@ export const schemaDict = {
         description: 'Allow replies from actors mentioned in your post.',
         properties: {},
       },
+      followerRule: {
+        type: 'object',
+        description: 'Allow replies from actors who follow you.',
+        properties: {},
+      },
       followingRule: {
         type: 'object',
         description: 'Allow replies from actors you follow.',
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/threadgate.ts b/packages/pds/src/lexicon/types/app/bsky/feed/threadgate.ts
index 135c5ba73ec..869b8d51d64 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/threadgate.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/threadgate.ts
@@ -12,6 +12,7 @@ export interface Record {
   /** List of rules defining who can reply to this post. If value is an empty array, no one can reply. If value is undefined, anyone can reply. */
   allow?: (
     | MentionRule
+    | FollowerRule
     | FollowingRule
     | ListRule
     | { $type: string; [k: string]: unknown }
@@ -52,6 +53,23 @@ export function validateMentionRule(v: unknown): ValidationResult {
   return lexicons.validate('app.bsky.feed.threadgate#mentionRule', v)
 }
 
+/** Allow replies from actors who follow you. */
+export interface FollowerRule {
+  [k: string]: unknown
+}
+
+export function isFollowerRule(v: unknown): v is FollowerRule {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'app.bsky.feed.threadgate#followerRule'
+  )
+}
+
+export function validateFollowerRule(v: unknown): ValidationResult {
+  return lexicons.validate('app.bsky.feed.threadgate#followerRule', v)
+}
+
 /** Allow replies from actors you follow. */
 export interface FollowingRule {
   [k: string]: unknown

From 636951e4728cd52c2e5355eb93b47d7e869b67e9 Mon Sep 17 00:00:00 2001
From: Eric Bailey <git@esb.lol>
Date: Thu, 6 Feb 2025 12:17:14 -0600
Subject: [PATCH 051/101] Include new `followerRule` as valid setting in
 `postInteractionSettings` pref (#3501)

Include new followerRule as valid setting in postInteractionSettings pref
---
 .changeset/cool-yaks-change.md                          | 5 +++++
 lexicons/app/bsky/actor/defs.json                       | 1 +
 packages/api/src/client/lexicons.ts                     | 1 +
 packages/api/src/client/types/app/bsky/actor/defs.ts    | 1 +
 packages/bsky/src/lexicon/lexicons.ts                   | 1 +
 packages/bsky/src/lexicon/types/app/bsky/actor/defs.ts  | 1 +
 packages/ozone/src/lexicon/lexicons.ts                  | 1 +
 packages/ozone/src/lexicon/types/app/bsky/actor/defs.ts | 1 +
 packages/pds/src/lexicon/lexicons.ts                    | 1 +
 packages/pds/src/lexicon/types/app/bsky/actor/defs.ts   | 1 +
 10 files changed, 14 insertions(+)
 create mode 100644 .changeset/cool-yaks-change.md

diff --git a/.changeset/cool-yaks-change.md b/.changeset/cool-yaks-change.md
new file mode 100644
index 00000000000..d64e6dbda74
--- /dev/null
+++ b/.changeset/cool-yaks-change.md
@@ -0,0 +1,5 @@
+---
+"@atproto/api": patch
+---
+
+Include `followerRule` as valid setting in `postInteractionSettings` pref
diff --git a/lexicons/app/bsky/actor/defs.json b/lexicons/app/bsky/actor/defs.json
index 5c1cb3ff021..1a26ee09c30 100644
--- a/lexicons/app/bsky/actor/defs.json
+++ b/lexicons/app/bsky/actor/defs.json
@@ -483,6 +483,7 @@
             "type": "union",
             "refs": [
               "app.bsky.feed.threadgate#mentionRule",
+              "app.bsky.feed.threadgate#followerRule",
               "app.bsky.feed.threadgate#followingRule",
               "app.bsky.feed.threadgate#listRule"
             ]
diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
index cd5db7cf588..3723fedd186 100644
--- a/packages/api/src/client/lexicons.ts
+++ b/packages/api/src/client/lexicons.ts
@@ -4730,6 +4730,7 @@ export const schemaDict = {
               type: 'union',
               refs: [
                 'lex:app.bsky.feed.threadgate#mentionRule',
+                'lex:app.bsky.feed.threadgate#followerRule',
                 'lex:app.bsky.feed.threadgate#followingRule',
                 'lex:app.bsky.feed.threadgate#listRule',
               ],
diff --git a/packages/api/src/client/types/app/bsky/actor/defs.ts b/packages/api/src/client/types/app/bsky/actor/defs.ts
index fa1dc66a0ca..84234ed2d08 100644
--- a/packages/api/src/client/types/app/bsky/actor/defs.ts
+++ b/packages/api/src/client/types/app/bsky/actor/defs.ts
@@ -541,6 +541,7 @@ export interface PostInteractionSettingsPref {
   /** Matches threadgate record. List of rules defining who can reply to this users posts. If value is an empty array, no one can reply. If value is undefined, anyone can reply. */
   threadgateAllowRules?: (
     | AppBskyFeedThreadgate.MentionRule
+    | AppBskyFeedThreadgate.FollowerRule
     | AppBskyFeedThreadgate.FollowingRule
     | AppBskyFeedThreadgate.ListRule
     | { $type: string; [k: string]: unknown }
diff --git a/packages/bsky/src/lexicon/lexicons.ts b/packages/bsky/src/lexicon/lexicons.ts
index 02f3daa30cd..f0392dccfde 100644
--- a/packages/bsky/src/lexicon/lexicons.ts
+++ b/packages/bsky/src/lexicon/lexicons.ts
@@ -4730,6 +4730,7 @@ export const schemaDict = {
               type: 'union',
               refs: [
                 'lex:app.bsky.feed.threadgate#mentionRule',
+                'lex:app.bsky.feed.threadgate#followerRule',
                 'lex:app.bsky.feed.threadgate#followingRule',
                 'lex:app.bsky.feed.threadgate#listRule',
               ],
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/defs.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/defs.ts
index 41af221ed7c..730b979dcea 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/defs.ts
@@ -541,6 +541,7 @@ export interface PostInteractionSettingsPref {
   /** Matches threadgate record. List of rules defining who can reply to this users posts. If value is an empty array, no one can reply. If value is undefined, anyone can reply. */
   threadgateAllowRules?: (
     | AppBskyFeedThreadgate.MentionRule
+    | AppBskyFeedThreadgate.FollowerRule
     | AppBskyFeedThreadgate.FollowingRule
     | AppBskyFeedThreadgate.ListRule
     | { $type: string; [k: string]: unknown }
diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
index cd5db7cf588..3723fedd186 100644
--- a/packages/ozone/src/lexicon/lexicons.ts
+++ b/packages/ozone/src/lexicon/lexicons.ts
@@ -4730,6 +4730,7 @@ export const schemaDict = {
               type: 'union',
               refs: [
                 'lex:app.bsky.feed.threadgate#mentionRule',
+                'lex:app.bsky.feed.threadgate#followerRule',
                 'lex:app.bsky.feed.threadgate#followingRule',
                 'lex:app.bsky.feed.threadgate#listRule',
               ],
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/defs.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/defs.ts
index 41af221ed7c..730b979dcea 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/defs.ts
@@ -541,6 +541,7 @@ export interface PostInteractionSettingsPref {
   /** Matches threadgate record. List of rules defining who can reply to this users posts. If value is an empty array, no one can reply. If value is undefined, anyone can reply. */
   threadgateAllowRules?: (
     | AppBskyFeedThreadgate.MentionRule
+    | AppBskyFeedThreadgate.FollowerRule
     | AppBskyFeedThreadgate.FollowingRule
     | AppBskyFeedThreadgate.ListRule
     | { $type: string; [k: string]: unknown }
diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
index cd5db7cf588..3723fedd186 100644
--- a/packages/pds/src/lexicon/lexicons.ts
+++ b/packages/pds/src/lexicon/lexicons.ts
@@ -4730,6 +4730,7 @@ export const schemaDict = {
               type: 'union',
               refs: [
                 'lex:app.bsky.feed.threadgate#mentionRule',
+                'lex:app.bsky.feed.threadgate#followerRule',
                 'lex:app.bsky.feed.threadgate#followingRule',
                 'lex:app.bsky.feed.threadgate#listRule',
               ],
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/defs.ts b/packages/pds/src/lexicon/types/app/bsky/actor/defs.ts
index 41af221ed7c..730b979dcea 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/defs.ts
@@ -541,6 +541,7 @@ export interface PostInteractionSettingsPref {
   /** Matches threadgate record. List of rules defining who can reply to this users posts. If value is an empty array, no one can reply. If value is undefined, anyone can reply. */
   threadgateAllowRules?: (
     | AppBskyFeedThreadgate.MentionRule
+    | AppBskyFeedThreadgate.FollowerRule
     | AppBskyFeedThreadgate.FollowingRule
     | AppBskyFeedThreadgate.ListRule
     | { $type: string; [k: string]: unknown }

From 526bcf8cba941aab84868f5996bef719e5ca23dc Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 6 Feb 2025 12:21:42 -0600
Subject: [PATCH 052/101] Version packages (#3499)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/angry-glasses-sin.md  |  5 -----
 .changeset/cool-yaks-change.md   |  5 -----
 .changeset/silver-horses-rush.md |  5 -----
 packages/api/CHANGELOG.md        |  8 ++++++++
 packages/api/package.json        |  2 +-
 packages/bsky/CHANGELOG.md       |  9 +++++++++
 packages/bsky/package.json       |  2 +-
 packages/dev-env/CHANGELOG.md    | 10 ++++++++++
 packages/dev-env/package.json    |  2 +-
 packages/ozone/CHANGELOG.md      |  7 +++++++
 packages/ozone/package.json      |  2 +-
 packages/pds/CHANGELOG.md        |  7 +++++++
 packages/pds/package.json        |  2 +-
 13 files changed, 46 insertions(+), 20 deletions(-)
 delete mode 100644 .changeset/angry-glasses-sin.md
 delete mode 100644 .changeset/cool-yaks-change.md
 delete mode 100644 .changeset/silver-horses-rush.md

diff --git a/.changeset/angry-glasses-sin.md b/.changeset/angry-glasses-sin.md
deleted file mode 100644
index 3d477db0544..00000000000
--- a/.changeset/angry-glasses-sin.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/api": patch
----
-
-Add followerRule threadgate
diff --git a/.changeset/cool-yaks-change.md b/.changeset/cool-yaks-change.md
deleted file mode 100644
index d64e6dbda74..00000000000
--- a/.changeset/cool-yaks-change.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/api": patch
----
-
-Include `followerRule` as valid setting in `postInteractionSettings` pref
diff --git a/.changeset/silver-horses-rush.md b/.changeset/silver-horses-rush.md
deleted file mode 100644
index 4f0163a9988..00000000000
--- a/.changeset/silver-horses-rush.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/bsky": patch
----
-
-Add followerRule threadgate
diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md
index 1d80f7a2d25..c05624b1c37 100644
--- a/packages/api/CHANGELOG.md
+++ b/packages/api/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @atproto/api
 
+## 0.13.34
+
+### Patch Changes
+
+- [#3496](https://github.com/bluesky-social/atproto/pull/3496) [`dc8a7842e`](https://github.com/bluesky-social/atproto/commit/dc8a7842e67f5f3709e88310d2a60d384453b486) Thanks [@rafaelbsky](https://github.com/rafaelbsky)! - Add followerRule threadgate
+
+- [#3501](https://github.com/bluesky-social/atproto/pull/3501) [`636951e47`](https://github.com/bluesky-social/atproto/commit/636951e4728cd52c2e5355eb93b47d7e869b67e9) Thanks [@estrattonbailey](https://github.com/estrattonbailey)! - Include `followerRule` as valid setting in `postInteractionSettings` pref
+
 ## 0.13.33
 
 ### Patch Changes
diff --git a/packages/api/package.json b/packages/api/package.json
index 6c85be86f97..ecd77ab7226 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/api",
-  "version": "0.13.33",
+  "version": "0.13.34",
   "license": "MIT",
   "description": "Client library for atproto and Bluesky",
   "keywords": [
diff --git a/packages/bsky/CHANGELOG.md b/packages/bsky/CHANGELOG.md
index 9be6b6ab8c6..08a4c621be9 100644
--- a/packages/bsky/CHANGELOG.md
+++ b/packages/bsky/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @atproto/bsky
 
+## 0.0.115
+
+### Patch Changes
+
+- [#3496](https://github.com/bluesky-social/atproto/pull/3496) [`dc8a7842e`](https://github.com/bluesky-social/atproto/commit/dc8a7842e67f5f3709e88310d2a60d384453b486) Thanks [@rafaelbsky](https://github.com/rafaelbsky)! - Add followerRule threadgate
+
+- Updated dependencies [[`dc8a7842e`](https://github.com/bluesky-social/atproto/commit/dc8a7842e67f5f3709e88310d2a60d384453b486), [`636951e47`](https://github.com/bluesky-social/atproto/commit/636951e4728cd52c2e5355eb93b47d7e869b67e9)]:
+  - @atproto/api@0.13.34
+
 ## 0.0.114
 
 ### Patch Changes
diff --git a/packages/bsky/package.json b/packages/bsky/package.json
index 87751b0355a..ecb21e3f266 100644
--- a/packages/bsky/package.json
+++ b/packages/bsky/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.114",
+  "version": "0.0.115",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
diff --git a/packages/dev-env/CHANGELOG.md b/packages/dev-env/CHANGELOG.md
index a12b380856a..35faff323bd 100644
--- a/packages/dev-env/CHANGELOG.md
+++ b/packages/dev-env/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @atproto/dev-env
 
+## 0.3.85
+
+### Patch Changes
+
+- Updated dependencies [[`dc8a7842e`](https://github.com/bluesky-social/atproto/commit/dc8a7842e67f5f3709e88310d2a60d384453b486), [`636951e47`](https://github.com/bluesky-social/atproto/commit/636951e4728cd52c2e5355eb93b47d7e869b67e9), [`dc8a7842e`](https://github.com/bluesky-social/atproto/commit/dc8a7842e67f5f3709e88310d2a60d384453b486)]:
+  - @atproto/api@0.13.34
+  - @atproto/bsky@0.0.115
+  - @atproto/ozone@0.1.76
+  - @atproto/pds@0.4.93
+
 ## 0.3.84
 
 ### Patch Changes
diff --git a/packages/dev-env/package.json b/packages/dev-env/package.json
index 6c2a811e7a6..5d3bf313c1f 100644
--- a/packages/dev-env/package.json
+++ b/packages/dev-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/dev-env",
-  "version": "0.3.84",
+  "version": "0.3.85",
   "license": "MIT",
   "description": "Local development environment helper for atproto development",
   "keywords": [
diff --git a/packages/ozone/CHANGELOG.md b/packages/ozone/CHANGELOG.md
index abdedf182be..47d0e5fe528 100644
--- a/packages/ozone/CHANGELOG.md
+++ b/packages/ozone/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/ozone
 
+## 0.1.76
+
+### Patch Changes
+
+- Updated dependencies [[`dc8a7842e`](https://github.com/bluesky-social/atproto/commit/dc8a7842e67f5f3709e88310d2a60d384453b486), [`636951e47`](https://github.com/bluesky-social/atproto/commit/636951e4728cd52c2e5355eb93b47d7e869b67e9)]:
+  - @atproto/api@0.13.34
+
 ## 0.1.75
 
 ### Patch Changes
diff --git a/packages/ozone/package.json b/packages/ozone/package.json
index 06f64d3eb86..af1e3bd6fb8 100644
--- a/packages/ozone/package.json
+++ b/packages/ozone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.1.75",
+  "version": "0.1.76",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
diff --git a/packages/pds/CHANGELOG.md b/packages/pds/CHANGELOG.md
index b2f35e11684..9389b9434eb 100644
--- a/packages/pds/CHANGELOG.md
+++ b/packages/pds/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/pds
 
+## 0.4.93
+
+### Patch Changes
+
+- Updated dependencies [[`dc8a7842e`](https://github.com/bluesky-social/atproto/commit/dc8a7842e67f5f3709e88310d2a60d384453b486), [`636951e47`](https://github.com/bluesky-social/atproto/commit/636951e4728cd52c2e5355eb93b47d7e869b67e9)]:
+  - @atproto/api@0.13.34
+
 ## 0.4.92
 
 ### Patch Changes
diff --git a/packages/pds/package.json b/packages/pds/package.json
index 3bfba166322..3c70e7786f4 100644
--- a/packages/pds/package.json
+++ b/packages/pds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/pds",
-  "version": "0.4.92",
+  "version": "0.4.93",
   "license": "MIT",
   "description": "Reference implementation of atproto Personal Data Server (PDS)",
   "keywords": [

From 709a85b0b633b5483b7161db64b429c746239153 Mon Sep 17 00:00:00 2001
From: Foysal Ahamed <foysal@blueskyweb.xyz>
Date: Thu, 6 Feb 2025 20:54:27 +0000
Subject: [PATCH 053/101] :sparkles: Add a priority score value for ozone
 subjects (#3495)

* :sparkles: Add a priority score value for ozone subjects

* :rotating_light: Bring back lock file

* :white_check_mark: Update snapshot for pds proxied tests

* :white_check_mark: Update takedown appeal snapshot

* :white_check_mark: Update takedown appeal snapshot

* :white_check_mark: Update repo and record snapshots

* :rotating_lights: Fix lint issue

* :white_check_mark: Update moderation events snapshot

* :white_check_mark: Update moderation statuses snapshot

* :broom: Cleanup unnecessary durationInHours field

* :sparkles: Allow filtering by priority score

* :sparkles: Add test for priorityScore filter

* :rotating_light: Fix import order

* :sparkles: Allow 0 priority score filter

* :memo: Add changeset
---
 .changeset/fifty-seals-prove.md               |  7 ++
 lexicons/tools/ozone/moderation/defs.json     | 27 +++++-
 .../tools/ozone/moderation/emitEvent.json     |  3 +-
 .../tools/ozone/moderation/queryStatuses.json |  9 +-
 packages/api/src/client/lexicons.ts           | 34 +++++++
 .../types/tools/ozone/moderation/defs.ts      | 28 ++++++
 .../types/tools/ozone/moderation/emitEvent.ts |  1 +
 .../tools/ozone/moderation/queryStatuses.ts   |  3 +
 packages/ozone/src/api/util.ts                |  1 +
 ...4T003647759Z-add-subject-priority-score.ts | 22 +++++
 packages/ozone/src/db/migrations/index.ts     |  1 +
 .../ozone/src/db/schema/moderation_event.ts   |  3 +-
 .../db/schema/moderation_subject_status.ts    |  1 +
 packages/ozone/src/lexicon/lexicons.ts        | 34 +++++++
 .../types/tools/ozone/moderation/defs.ts      | 28 ++++++
 .../types/tools/ozone/moderation/emitEvent.ts |  1 +
 .../tools/ozone/moderation/queryStatuses.ts   |  3 +
 packages/ozone/src/mod-service/index.ts       | 20 +++-
 packages/ozone/src/mod-service/status.ts      |  8 ++
 packages/ozone/src/mod-service/types.ts       |  1 +
 packages/ozone/src/mod-service/views.ts       |  9 ++
 .../__snapshots__/get-record.test.ts.snap     |  2 +
 .../__snapshots__/get-records.test.ts.snap    |  1 +
 .../tests/__snapshots__/get-repo.test.ts.snap |  1 +
 .../__snapshots__/get-repos.test.ts.snap      |  1 +
 .../moderation-events.test.ts.snap            |  1 +
 .../moderation-statuses.test.ts.snap          |  6 ++
 .../tests/subject-priority-score.test.ts      | 96 +++++++++++++++++++
 packages/pds/src/db/tables/moderation.ts      |  4 +
 packages/pds/src/lexicon/lexicons.ts          | 34 +++++++
 .../types/tools/ozone/moderation/defs.ts      | 28 ++++++
 .../types/tools/ozone/moderation/emitEvent.ts |  1 +
 .../tools/ozone/moderation/queryStatuses.ts   |  3 +
 .../takedown-appeal.test.ts.snap              |  1 +
 .../proxied/__snapshots__/admin.test.ts.snap  |  3 +
 35 files changed, 419 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/fifty-seals-prove.md
 create mode 100644 packages/ozone/src/db/migrations/20250204T003647759Z-add-subject-priority-score.ts
 create mode 100644 packages/ozone/tests/subject-priority-score.test.ts

diff --git a/.changeset/fifty-seals-prove.md b/.changeset/fifty-seals-prove.md
new file mode 100644
index 00000000000..4b52914ec00
--- /dev/null
+++ b/.changeset/fifty-seals-prove.md
@@ -0,0 +1,7 @@
+---
+"@atproto/ozone": patch
+"@atproto/api": patch
+"@atproto/pds": patch
+---
+
+Add a priority score to ozone subjects
diff --git a/lexicons/tools/ozone/moderation/defs.json b/lexicons/tools/ozone/moderation/defs.json
index daa0c4e8a68..4a2e8fa9415 100644
--- a/lexicons/tools/ozone/moderation/defs.json
+++ b/lexicons/tools/ozone/moderation/defs.json
@@ -34,7 +34,8 @@
             "#modEventTag",
             "#accountEvent",
             "#identityEvent",
-            "#recordEvent"
+            "#recordEvent",
+            "#modEventPriorityScore"
           ]
         },
         "subject": {
@@ -84,7 +85,8 @@
             "#modEventTag",
             "#accountEvent",
             "#identityEvent",
-            "#recordEvent"
+            "#recordEvent",
+            "#modEventPriorityScore"
           ]
         },
         "subject": {
@@ -143,6 +145,12 @@
           "type": "string",
           "description": "Sticky comment on the subject."
         },
+        "priorityScore": {
+          "type": "integer",
+          "description": "Numeric value representing the level of priority. Higher score means higher priority.",
+          "minimum": 0,
+          "maximum": 100
+        },
         "muteUntil": {
           "type": "string",
           "format": "datetime"
@@ -381,6 +389,21 @@
         }
       }
     },
+    "modEventPriorityScore": {
+      "type": "object",
+      "description": "Set priority score of the subject. Higher score means higher priority.",
+      "required": ["score"],
+      "properties": {
+        "comment": {
+          "type": "string"
+        },
+        "score": {
+          "type": "integer",
+          "minimum": 0,
+          "maximum": 100
+        }
+      }
+    },
     "modEventAcknowledge": {
       "type": "object",
       "properties": {
diff --git a/lexicons/tools/ozone/moderation/emitEvent.json b/lexicons/tools/ozone/moderation/emitEvent.json
index 2e85bbfc9b6..63335d06cd9 100644
--- a/lexicons/tools/ozone/moderation/emitEvent.json
+++ b/lexicons/tools/ozone/moderation/emitEvent.json
@@ -30,7 +30,8 @@
                 "tools.ozone.moderation.defs#modEventTag",
                 "tools.ozone.moderation.defs#accountEvent",
                 "tools.ozone.moderation.defs#identityEvent",
-                "tools.ozone.moderation.defs#recordEvent"
+                "tools.ozone.moderation.defs#recordEvent",
+                "tools.ozone.moderation.defs#modEventPriorityScore"
               ]
             },
             "subject": {
diff --git a/lexicons/tools/ozone/moderation/queryStatuses.json b/lexicons/tools/ozone/moderation/queryStatuses.json
index c280b2ed61e..533885c3337 100644
--- a/lexicons/tools/ozone/moderation/queryStatuses.json
+++ b/lexicons/tools/ozone/moderation/queryStatuses.json
@@ -111,7 +111,8 @@
               "lastReviewedAt",
               "lastReportedAt",
               "reportedRecordsCount",
-              "takendownRecordsCount"
+              "takendownRecordsCount",
+              "priorityScore"
             ]
           },
           "sortDirection": {
@@ -175,6 +176,12 @@
           "minTakendownRecordsCount": {
             "type": "integer",
             "description": "If specified, only subjects that belong to an account that has at least this many taken down records will be returned."
+          },
+          "minPriorityScore": {
+            "minimum": 0,
+            "maximum": 100,
+            "type": "integer",
+            "description": "If specified, only subjects that have priority score value above the given value will be returned."
           }
         }
       },
diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
index 3723fedd186..6e709774761 100644
--- a/packages/api/src/client/lexicons.ts
+++ b/packages/api/src/client/lexicons.ts
@@ -11192,6 +11192,7 @@ export const schemaDict = {
               'lex:tools.ozone.moderation.defs#accountEvent',
               'lex:tools.ozone.moderation.defs#identityEvent',
               'lex:tools.ozone.moderation.defs#recordEvent',
+              'lex:tools.ozone.moderation.defs#modEventPriorityScore',
             ],
           },
           subject: {
@@ -11259,6 +11260,7 @@ export const schemaDict = {
               'lex:tools.ozone.moderation.defs#accountEvent',
               'lex:tools.ozone.moderation.defs#identityEvent',
               'lex:tools.ozone.moderation.defs#recordEvent',
+              'lex:tools.ozone.moderation.defs#modEventPriorityScore',
             ],
           },
           subject: {
@@ -11338,6 +11340,13 @@ export const schemaDict = {
             type: 'string',
             description: 'Sticky comment on the subject.',
           },
+          priorityScore: {
+            type: 'integer',
+            description:
+              'Numeric value representing the level of priority. Higher score means higher priority.',
+            minimum: 0,
+            maximum: 100,
+          },
           muteUntil: {
             type: 'string',
             format: 'datetime',
@@ -11600,6 +11609,22 @@ export const schemaDict = {
           },
         },
       },
+      modEventPriorityScore: {
+        type: 'object',
+        description:
+          'Set priority score of the subject. Higher score means higher priority.',
+        required: ['score'],
+        properties: {
+          comment: {
+            type: 'string',
+          },
+          score: {
+            type: 'integer',
+            minimum: 0,
+            maximum: 100,
+          },
+        },
+      },
       modEventAcknowledge: {
         type: 'object',
         properties: {
@@ -12223,6 +12248,7 @@ export const schemaDict = {
                   'lex:tools.ozone.moderation.defs#accountEvent',
                   'lex:tools.ozone.moderation.defs#identityEvent',
                   'lex:tools.ozone.moderation.defs#recordEvent',
+                  'lex:tools.ozone.moderation.defs#modEventPriorityScore',
                 ],
               },
               subject: {
@@ -12719,6 +12745,7 @@ export const schemaDict = {
                 'lastReportedAt',
                 'reportedRecordsCount',
                 'takendownRecordsCount',
+                'priorityScore',
               ],
             },
             sortDirection: {
@@ -12789,6 +12816,13 @@ export const schemaDict = {
               description:
                 'If specified, only subjects that belong to an account that has at least this many taken down records will be returned.',
             },
+            minPriorityScore: {
+              minimum: 0,
+              maximum: 100,
+              type: 'integer',
+              description:
+                'If specified, only subjects that have priority score value above the given value will be returned.',
+            },
           },
         },
         output: {
diff --git a/packages/api/src/client/types/tools/ozone/moderation/defs.ts b/packages/api/src/client/types/tools/ozone/moderation/defs.ts
index 796e32d5749..4135a248961 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/defs.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/defs.ts
@@ -33,6 +33,7 @@ export interface ModEventView {
     | AccountEvent
     | IdentityEvent
     | RecordEvent
+    | ModEventPriorityScore
     | { $type: string; [k: string]: unknown }
   subject:
     | ComAtprotoAdminDefs.RepoRef
@@ -80,6 +81,7 @@ export interface ModEventViewDetail {
     | AccountEvent
     | IdentityEvent
     | RecordEvent
+    | ModEventPriorityScore
     | { $type: string; [k: string]: unknown }
   subject:
     | RepoView
@@ -124,6 +126,8 @@ export interface SubjectStatusView {
   reviewState: SubjectReviewState
   /** Sticky comment on the subject. */
   comment?: string
+  /** Numeric value representing the level of priority. Higher score means higher priority. */
+  priorityScore?: number
   muteUntil?: string
   muteReportingUntil?: string
   lastReviewedBy?: string
@@ -364,6 +368,30 @@ export function validateModEventLabel(v: unknown): ValidationResult {
   return lexicons.validate('tools.ozone.moderation.defs#modEventLabel', v)
 }
 
+/** Set priority score of the subject. Higher score means higher priority. */
+export interface ModEventPriorityScore {
+  comment?: string
+  score: number
+  [k: string]: unknown
+}
+
+export function isModEventPriorityScore(
+  v: unknown,
+): v is ModEventPriorityScore {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'tools.ozone.moderation.defs#modEventPriorityScore'
+  )
+}
+
+export function validateModEventPriorityScore(v: unknown): ValidationResult {
+  return lexicons.validate(
+    'tools.ozone.moderation.defs#modEventPriorityScore',
+    v,
+  )
+}
+
 export interface ModEventAcknowledge {
   comment?: string
   /** If true, all other reports on content authored by this account will be resolved (acknowledged). */
diff --git a/packages/api/src/client/types/tools/ozone/moderation/emitEvent.ts b/packages/api/src/client/types/tools/ozone/moderation/emitEvent.ts
index 56cf9279f0b..bea857d0f0c 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/emitEvent.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/emitEvent.ts
@@ -31,6 +31,7 @@ export interface InputSchema {
     | ToolsOzoneModerationDefs.AccountEvent
     | ToolsOzoneModerationDefs.IdentityEvent
     | ToolsOzoneModerationDefs.RecordEvent
+    | ToolsOzoneModerationDefs.ModEventPriorityScore
     | { $type: string; [k: string]: unknown }
   subject:
     | ComAtprotoAdminDefs.RepoRef
diff --git a/packages/api/src/client/types/tools/ozone/moderation/queryStatuses.ts b/packages/api/src/client/types/tools/ozone/moderation/queryStatuses.ts
index 97e22ff240c..14626255fbf 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/queryStatuses.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/queryStatuses.ts
@@ -53,6 +53,7 @@ export interface QueryParams {
     | 'lastReportedAt'
     | 'reportedRecordsCount'
     | 'takendownRecordsCount'
+    | 'priorityScore'
   sortDirection?: 'asc' | 'desc'
   /** Get subjects that were taken down */
   takendown?: boolean
@@ -72,6 +73,8 @@ export interface QueryParams {
   minReportedRecordsCount?: number
   /** If specified, only subjects that belong to an account that has at least this many taken down records will be returned. */
   minTakendownRecordsCount?: number
+  /** If specified, only subjects that have priority score value above the given value will be returned. */
+  minPriorityScore?: number
 }
 
 export type InputSchema = undefined
diff --git a/packages/ozone/src/api/util.ts b/packages/ozone/src/api/util.ts
index 11aba4ad5bf..089ed3838eb 100644
--- a/packages/ozone/src/api/util.ts
+++ b/packages/ozone/src/api/util.ts
@@ -157,6 +157,7 @@ const eventTypes = new Set([
   'tools.ozone.moderation.defs#accountEvent',
   'tools.ozone.moderation.defs#identityEvent',
   'tools.ozone.moderation.defs#recordEvent',
+  'tools.ozone.moderation.defs#modEventPriorityScore',
 ])
 
 export const getMemberRole = (role: string) => {
diff --git a/packages/ozone/src/db/migrations/20250204T003647759Z-add-subject-priority-score.ts b/packages/ozone/src/db/migrations/20250204T003647759Z-add-subject-priority-score.ts
new file mode 100644
index 00000000000..e55443dda4f
--- /dev/null
+++ b/packages/ozone/src/db/migrations/20250204T003647759Z-add-subject-priority-score.ts
@@ -0,0 +1,22 @@
+import { Kysely } from 'kysely'
+
+export async function up(db: Kysely<unknown>): Promise<void> {
+  await db.schema
+    .alterTable('moderation_subject_status')
+    .addColumn('priorityScore', 'integer', (col) =>
+      col.notNull().defaultTo('0'),
+    )
+    .execute()
+  await db.schema
+    .createIndex('moderation_subject_status_priority_score_index')
+    .on('moderation_subject_status')
+    .column('priorityScore')
+    .execute()
+}
+
+export async function down(db: Kysely<unknown>): Promise<void> {
+  await db.schema
+    .alterTable('moderation_subject_status')
+    .dropColumn('priorityScore')
+    .execute()
+}
diff --git a/packages/ozone/src/db/migrations/index.ts b/packages/ozone/src/db/migrations/index.ts
index 08103249701..609f4366572 100644
--- a/packages/ozone/src/db/migrations/index.ts
+++ b/packages/ozone/src/db/migrations/index.ts
@@ -18,3 +18,4 @@ export * as _20241008T205730722Z from './20241008T205730722Z-sets'
 export * as _20241018T205730722Z from './20241018T205730722Z-setting'
 export * as _20241026T205730722Z from './20241026T205730722Z-add-hosting-status-to-subject-status'
 export * as _20241220T144630860Z from './20241220T144630860Z-stats-materialized-views'
+export * as _20250204T003647759Z from './20250204T003647759Z-add-subject-priority-score'
diff --git a/packages/ozone/src/db/schema/moderation_event.ts b/packages/ozone/src/db/schema/moderation_event.ts
index c6d7dc132a2..341b8cc4a75 100644
--- a/packages/ozone/src/db/schema/moderation_event.ts
+++ b/packages/ozone/src/db/schema/moderation_event.ts
@@ -22,6 +22,7 @@ export interface ModerationEvent {
     | 'tools.ozone.moderation.defs#accountEvent'
     | 'tools.ozone.moderation.defs#identityEvent'
     | 'tools.ozone.moderation.defs#recordEvent'
+    | 'tools.ozone.moderation.defs#modEventPriorityScore'
   subjectType:
     | 'com.atproto.admin.defs#repoRef'
     | 'com.atproto.repo.strongRef'
@@ -38,7 +39,7 @@ export interface ModerationEvent {
   createdBy: string
   durationInHours: number | null
   expiresAt: string | null
-  meta: Record<string, string | boolean> | null
+  meta: Record<string, string | boolean | number> | null
   addedTags: string[] | null
   removedTags: string[] | null
   legacyRefId: number | null
diff --git a/packages/ozone/src/db/schema/moderation_subject_status.ts b/packages/ozone/src/db/schema/moderation_subject_status.ts
index 5869d863028..806a0d48cf5 100644
--- a/packages/ozone/src/db/schema/moderation_subject_status.ts
+++ b/packages/ozone/src/db/schema/moderation_subject_status.ts
@@ -38,6 +38,7 @@ export interface ModerationSubjectStatus {
   appealed: boolean | null
   comment: string | null
   tags: string[] | null
+  priorityScore?: number
 }
 
 export type PartialDB = {
diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
index 3723fedd186..6e709774761 100644
--- a/packages/ozone/src/lexicon/lexicons.ts
+++ b/packages/ozone/src/lexicon/lexicons.ts
@@ -11192,6 +11192,7 @@ export const schemaDict = {
               'lex:tools.ozone.moderation.defs#accountEvent',
               'lex:tools.ozone.moderation.defs#identityEvent',
               'lex:tools.ozone.moderation.defs#recordEvent',
+              'lex:tools.ozone.moderation.defs#modEventPriorityScore',
             ],
           },
           subject: {
@@ -11259,6 +11260,7 @@ export const schemaDict = {
               'lex:tools.ozone.moderation.defs#accountEvent',
               'lex:tools.ozone.moderation.defs#identityEvent',
               'lex:tools.ozone.moderation.defs#recordEvent',
+              'lex:tools.ozone.moderation.defs#modEventPriorityScore',
             ],
           },
           subject: {
@@ -11338,6 +11340,13 @@ export const schemaDict = {
             type: 'string',
             description: 'Sticky comment on the subject.',
           },
+          priorityScore: {
+            type: 'integer',
+            description:
+              'Numeric value representing the level of priority. Higher score means higher priority.',
+            minimum: 0,
+            maximum: 100,
+          },
           muteUntil: {
             type: 'string',
             format: 'datetime',
@@ -11600,6 +11609,22 @@ export const schemaDict = {
           },
         },
       },
+      modEventPriorityScore: {
+        type: 'object',
+        description:
+          'Set priority score of the subject. Higher score means higher priority.',
+        required: ['score'],
+        properties: {
+          comment: {
+            type: 'string',
+          },
+          score: {
+            type: 'integer',
+            minimum: 0,
+            maximum: 100,
+          },
+        },
+      },
       modEventAcknowledge: {
         type: 'object',
         properties: {
@@ -12223,6 +12248,7 @@ export const schemaDict = {
                   'lex:tools.ozone.moderation.defs#accountEvent',
                   'lex:tools.ozone.moderation.defs#identityEvent',
                   'lex:tools.ozone.moderation.defs#recordEvent',
+                  'lex:tools.ozone.moderation.defs#modEventPriorityScore',
                 ],
               },
               subject: {
@@ -12719,6 +12745,7 @@ export const schemaDict = {
                 'lastReportedAt',
                 'reportedRecordsCount',
                 'takendownRecordsCount',
+                'priorityScore',
               ],
             },
             sortDirection: {
@@ -12789,6 +12816,13 @@ export const schemaDict = {
               description:
                 'If specified, only subjects that belong to an account that has at least this many taken down records will be returned.',
             },
+            minPriorityScore: {
+              minimum: 0,
+              maximum: 100,
+              type: 'integer',
+              description:
+                'If specified, only subjects that have priority score value above the given value will be returned.',
+            },
           },
         },
         output: {
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts
index e31a6d03dba..1fb7bf8e25e 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts
@@ -33,6 +33,7 @@ export interface ModEventView {
     | AccountEvent
     | IdentityEvent
     | RecordEvent
+    | ModEventPriorityScore
     | { $type: string; [k: string]: unknown }
   subject:
     | ComAtprotoAdminDefs.RepoRef
@@ -80,6 +81,7 @@ export interface ModEventViewDetail {
     | AccountEvent
     | IdentityEvent
     | RecordEvent
+    | ModEventPriorityScore
     | { $type: string; [k: string]: unknown }
   subject:
     | RepoView
@@ -124,6 +126,8 @@ export interface SubjectStatusView {
   reviewState: SubjectReviewState
   /** Sticky comment on the subject. */
   comment?: string
+  /** Numeric value representing the level of priority. Higher score means higher priority. */
+  priorityScore?: number
   muteUntil?: string
   muteReportingUntil?: string
   lastReviewedBy?: string
@@ -364,6 +368,30 @@ export function validateModEventLabel(v: unknown): ValidationResult {
   return lexicons.validate('tools.ozone.moderation.defs#modEventLabel', v)
 }
 
+/** Set priority score of the subject. Higher score means higher priority. */
+export interface ModEventPriorityScore {
+  comment?: string
+  score: number
+  [k: string]: unknown
+}
+
+export function isModEventPriorityScore(
+  v: unknown,
+): v is ModEventPriorityScore {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'tools.ozone.moderation.defs#modEventPriorityScore'
+  )
+}
+
+export function validateModEventPriorityScore(v: unknown): ValidationResult {
+  return lexicons.validate(
+    'tools.ozone.moderation.defs#modEventPriorityScore',
+    v,
+  )
+}
+
 export interface ModEventAcknowledge {
   comment?: string
   /** If true, all other reports on content authored by this account will be resolved (acknowledged). */
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/emitEvent.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
index d409858ec7b..8f0f00e98f8 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
@@ -32,6 +32,7 @@ export interface InputSchema {
     | ToolsOzoneModerationDefs.AccountEvent
     | ToolsOzoneModerationDefs.IdentityEvent
     | ToolsOzoneModerationDefs.RecordEvent
+    | ToolsOzoneModerationDefs.ModEventPriorityScore
     | { $type: string; [k: string]: unknown }
   subject:
     | ComAtprotoAdminDefs.RepoRef
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
index 73a953e5176..8e79b023c4c 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
@@ -54,6 +54,7 @@ export interface QueryParams {
     | 'lastReportedAt'
     | 'reportedRecordsCount'
     | 'takendownRecordsCount'
+    | 'priorityScore'
   sortDirection: 'asc' | 'desc'
   /** Get subjects that were taken down */
   takendown?: boolean
@@ -73,6 +74,8 @@ export interface QueryParams {
   minReportedRecordsCount?: number
   /** If specified, only subjects that belong to an account that has at least this many taken down records will be returned. */
   minTakendownRecordsCount?: number
+  /** If specified, only subjects that have priority score value above the given value will be returned. */
+  minPriorityScore?: number
 }
 
 export type InputSchema = undefined
diff --git a/packages/ozone/src/mod-service/index.ts b/packages/ozone/src/mod-service/index.ts
index 044e65e58d5..59e9588223d 100644
--- a/packages/ozone/src/mod-service/index.ts
+++ b/packages/ozone/src/mod-service/index.ts
@@ -32,6 +32,7 @@ import {
   isModEventEmail,
   isModEventLabel,
   isModEventMute,
+  isModEventPriorityScore,
   isModEventReport,
   isModEventTag,
   isModEventTakedown,
@@ -403,7 +404,7 @@ export class ModerationService {
         ? event.negateLabelVals.join(' ')
         : undefined
 
-    const meta: Record<string, string | boolean> = {}
+    const meta: Record<string, string | number | boolean> = {}
 
     const addedTags = isModEventTag(event) ? jsonb(event.add) : null
     const removedTags = isModEventTag(event) ? jsonb(event.remove) : null
@@ -429,6 +430,10 @@ export class ModerationService {
       if (event.status) meta.status = event.status
     }
 
+    if (isModEventPriorityScore(event)) {
+      meta.priorityScore = event.score
+    }
+
     if (isIdentityEvent(event)) {
       meta.timestamp = event.timestamp
       if (event.handle) meta.handle = event.handle
@@ -842,6 +847,7 @@ export class ModerationService {
     minAccountSuspendCount,
     minReportedRecordsCount,
     minTakendownRecordsCount,
+    minPriorityScore,
   }: QueryStatusParams): Promise<{
     statuses: ModerationSubjectStatusRowWithHandle[]
     cursor?: string
@@ -1098,12 +1104,22 @@ export class ModerationService {
       )
     }
 
+    if (minPriorityScore != null && minPriorityScore >= 0) {
+      builder = builder.where(
+        'moderation_subject_status.priorityScore',
+        '>=',
+        minPriorityScore,
+      )
+    }
+
     const keyset = new StatusKeyset(
       sortField === 'reportedRecordsCount'
         ? ref(`account_record_events_stats.reportedCount`)
         : sortField === 'takendownRecordsCount'
           ? ref(`account_record_status_stats.takendownCount`)
-          : ref(`moderation_subject_status.${sortField}`),
+          : sortField === 'priorityScore'
+            ? ref(`moderation_subject_status.priorityScore`)
+            : ref(`moderation_subject_status.${sortField}`),
       ref('moderation_subject_status.id'),
     )
     const paginatedBuilder = paginate(builder, {
diff --git a/packages/ozone/src/mod-service/status.ts b/packages/ozone/src/mod-service/status.ts
index 2886a54659e..7663f930736 100644
--- a/packages/ozone/src/mod-service/status.ts
+++ b/packages/ozone/src/mod-service/status.ts
@@ -372,6 +372,14 @@ export const adjustModerationSubjectStatus = async (
     ...subjectStatus,
   }
 
+  if (
+    action === 'tools.ozone.moderation.defs#modEventPriorityScore' &&
+    typeof meta?.priorityScore === 'number'
+  ) {
+    newStatus.priorityScore = meta?.priorityScore
+    subjectStatus.priorityScore = meta?.priorityScore
+  }
+
   if (
     action === 'tools.ozone.moderation.defs#modEventReverseTakedown' &&
     !subjectStatus.takendown
diff --git a/packages/ozone/src/mod-service/types.ts b/packages/ozone/src/mod-service/types.ts
index 76123bc7fe7..6e620307f45 100644
--- a/packages/ozone/src/mod-service/types.ts
+++ b/packages/ozone/src/mod-service/types.ts
@@ -55,6 +55,7 @@ export type ModEventType =
   | ToolsOzoneModerationDefs.AccountEvent
   | ToolsOzoneModerationDefs.IdentityEvent
   | ToolsOzoneModerationDefs.RecordEvent
+  | ToolsOzoneModerationDefs.ModEventPriorityScore
 
 type AccountHostingView = {
   $type: 'tools.ozone.moderation.defs#accountHosting'
diff --git a/packages/ozone/src/mod-service/views.ts b/packages/ozone/src/mod-service/views.ts
index 5c28d5bfd4e..7cf7e4775e2 100644
--- a/packages/ozone/src/mod-service/views.ts
+++ b/packages/ozone/src/mod-service/views.ts
@@ -114,6 +114,7 @@ export class ModerationViews {
         'tools.ozone.moderation.defs#modEventTakedown',
         'tools.ozone.moderation.defs#modEventLabel',
         'tools.ozone.moderation.defs#modEventMute',
+        'tools.ozone.moderation.defs#modEventPriorityScore',
       ].includes(event.action)
     ) {
       eventView.event = {
@@ -122,6 +123,13 @@ export class ModerationViews {
       }
     }
 
+    if (event.action === 'tools.ozone.moderation.defs#modEventPriorityScore') {
+      eventView.event = {
+        ...eventView.event,
+        score: event.meta?.priorityScore ?? 0,
+      }
+    }
+
     if (
       (event.action === 'tools.ozone.moderation.defs#modEventTakedown' ||
         event.action === 'tools.ozone.moderation.defs#modEventAcknowledge') &&
@@ -612,6 +620,7 @@ export class ModerationViews {
       subjectRepoHandle: status.handle ?? undefined,
       subjectBlobCids: status.blobCids || [],
       tags: status.tags || [],
+      priorityScore: status.priorityScore,
       subject: subjectFromStatusRow(status).lex(),
 
       accountStats: {
diff --git a/packages/ozone/tests/__snapshots__/get-record.test.ts.snap b/packages/ozone/tests/__snapshots__/get-record.test.ts.snap
index 43eb46abd6b..5ceeadb268c 100644
--- a/packages/ozone/tests/__snapshots__/get-record.test.ts.snap
+++ b/packages/ozone/tests/__snapshots__/get-record.test.ts.snap
@@ -40,6 +40,7 @@ Object {
       "lastReportedAt": "1970-01-01T00:00:00.000Z",
       "lastReviewedAt": "1970-01-01T00:00:00.000Z",
       "lastReviewedBy": "user(1)",
+      "priorityScore": 0,
       "recordsStats": Object {
         "$type": "tools.ozone.moderation.defs#recordsStats",
         "appealedCount": 0,
@@ -160,6 +161,7 @@ Object {
       "lastReportedAt": "1970-01-01T00:00:00.000Z",
       "lastReviewedAt": "1970-01-01T00:00:00.000Z",
       "lastReviewedBy": "user(1)",
+      "priorityScore": 0,
       "recordsStats": Object {
         "$type": "tools.ozone.moderation.defs#recordsStats",
         "appealedCount": 0,
diff --git a/packages/ozone/tests/__snapshots__/get-records.test.ts.snap b/packages/ozone/tests/__snapshots__/get-records.test.ts.snap
index 4c95700ffe3..aaaad159e64 100644
--- a/packages/ozone/tests/__snapshots__/get-records.test.ts.snap
+++ b/packages/ozone/tests/__snapshots__/get-records.test.ts.snap
@@ -43,6 +43,7 @@ Object {
           "lastReportedAt": "1970-01-01T00:00:00.000Z",
           "lastReviewedAt": "1970-01-01T00:00:00.000Z",
           "lastReviewedBy": "user(1)",
+          "priorityScore": 0,
           "recordsStats": Object {
             "$type": "tools.ozone.moderation.defs#recordsStats",
             "appealedCount": 0,
diff --git a/packages/ozone/tests/__snapshots__/get-repo.test.ts.snap b/packages/ozone/tests/__snapshots__/get-repo.test.ts.snap
index 87c9000dbc0..f991da46fd3 100644
--- a/packages/ozone/tests/__snapshots__/get-repo.test.ts.snap
+++ b/packages/ozone/tests/__snapshots__/get-repo.test.ts.snap
@@ -39,6 +39,7 @@ Object {
       "lastReportedAt": "1970-01-01T00:00:00.000Z",
       "lastReviewedAt": "1970-01-01T00:00:00.000Z",
       "lastReviewedBy": "user(1)",
+      "priorityScore": 0,
       "recordsStats": Object {
         "$type": "tools.ozone.moderation.defs#recordsStats",
       },
diff --git a/packages/ozone/tests/__snapshots__/get-repos.test.ts.snap b/packages/ozone/tests/__snapshots__/get-repos.test.ts.snap
index 2f6c4f81fb0..3e1eb9e6f10 100644
--- a/packages/ozone/tests/__snapshots__/get-repos.test.ts.snap
+++ b/packages/ozone/tests/__snapshots__/get-repos.test.ts.snap
@@ -42,6 +42,7 @@ Object {
           "lastReportedAt": "1970-01-01T00:00:00.000Z",
           "lastReviewedAt": "1970-01-01T00:00:00.000Z",
           "lastReviewedBy": "user(1)",
+          "priorityScore": 0,
           "recordsStats": Object {
             "$type": "tools.ozone.moderation.defs#recordsStats",
           },
diff --git a/packages/ozone/tests/__snapshots__/moderation-events.test.ts.snap b/packages/ozone/tests/__snapshots__/moderation-events.test.ts.snap
index cca025f41b3..d4988121159 100644
--- a/packages/ozone/tests/__snapshots__/moderation-events.test.ts.snap
+++ b/packages/ozone/tests/__snapshots__/moderation-events.test.ts.snap
@@ -35,6 +35,7 @@ Object {
         "lastReportedAt": "1970-01-01T00:00:00.000Z",
         "lastReviewedAt": "1970-01-01T00:00:00.000Z",
         "lastReviewedBy": "user(1)",
+        "priorityScore": 0,
         "recordsStats": Object {
           "$type": "tools.ozone.moderation.defs#recordsStats",
           "appealedCount": 0,
diff --git a/packages/ozone/tests/__snapshots__/moderation-statuses.test.ts.snap b/packages/ozone/tests/__snapshots__/moderation-statuses.test.ts.snap
index cc145f6bf2f..47352910382 100644
--- a/packages/ozone/tests/__snapshots__/moderation-statuses.test.ts.snap
+++ b/packages/ozone/tests/__snapshots__/moderation-statuses.test.ts.snap
@@ -18,6 +18,7 @@ Array [
     },
     "id": 7,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
+    "priorityScore": 0,
     "recordsStats": Object {
       "$type": "tools.ozone.moderation.defs#recordsStats",
       "appealedCount": 0,
@@ -61,6 +62,7 @@ Array [
     },
     "id": 5,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
+    "priorityScore": 0,
     "recordsStats": Object {
       "$type": "tools.ozone.moderation.defs#recordsStats",
       "appealedCount": 0,
@@ -108,6 +110,7 @@ Array [
     },
     "id": 7,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
+    "priorityScore": 0,
     "recordsStats": Object {
       "$type": "tools.ozone.moderation.defs#recordsStats",
       "appealedCount": 0,
@@ -151,6 +154,7 @@ Array [
     },
     "id": 5,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
+    "priorityScore": 0,
     "recordsStats": Object {
       "$type": "tools.ozone.moderation.defs#recordsStats",
       "appealedCount": 0,
@@ -193,6 +197,7 @@ Array [
     },
     "id": 3,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
+    "priorityScore": 0,
     "recordsStats": Object {
       "$type": "tools.ozone.moderation.defs#recordsStats",
       "appealedCount": 0,
@@ -235,6 +240,7 @@ Array [
     },
     "id": 1,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
+    "priorityScore": 0,
     "recordsStats": Object {
       "$type": "tools.ozone.moderation.defs#recordsStats",
       "appealedCount": 0,
diff --git a/packages/ozone/tests/subject-priority-score.test.ts b/packages/ozone/tests/subject-priority-score.test.ts
new file mode 100644
index 00000000000..1fb67aef317
--- /dev/null
+++ b/packages/ozone/tests/subject-priority-score.test.ts
@@ -0,0 +1,96 @@
+import {
+  ModeratorClient,
+  SeedClient,
+  TestNetwork,
+  basicSeed,
+} from '@atproto/dev-env'
+import { REASONSPAM } from '../dist/lexicon/types/com/atproto/moderation/defs'
+
+describe('moderation', () => {
+  let network: TestNetwork
+  let sc: SeedClient
+  let modClient: ModeratorClient
+
+  beforeAll(async () => {
+    network = await TestNetwork.create({
+      dbPostgresSchema: 'ozone_priority_score',
+    })
+    sc = network.getSeedClient()
+    modClient = network.ozone.getModClient()
+    await basicSeed(sc)
+    await Promise.all([
+      sc.createReport({
+        reasonType: REASONSPAM,
+        subject: {
+          $type: 'com.atproto.admin.defs#repoRef',
+          did: sc.dids.bob,
+        },
+        reportedBy: sc.dids.carol,
+      }),
+      sc.createReport({
+        reasonType: REASONSPAM,
+        subject: {
+          $type: 'com.atproto.admin.defs#repoRef',
+          did: sc.dids.alice,
+        },
+        reportedBy: sc.dids.carol,
+      }),
+      sc.createReport({
+        reasonType: REASONSPAM,
+        subject: {
+          $type: 'com.atproto.repo.strongRef',
+          uri: sc.posts[sc.dids.bob][0].ref.uriStr,
+          cid: sc.posts[sc.dids.bob][0].ref.cidStr,
+        },
+        reportedBy: sc.dids.carol,
+      }),
+    ])
+    await network.processAll()
+  })
+
+  afterAll(async () => {
+    await network.close()
+  })
+
+  it('allows setting a priority score.', async () => {
+    const { subjectStatuses: before } = await modClient.queryStatuses({})
+    await Promise.all([
+      modClient.emitEvent({
+        subject: before[before.length - 1].subject,
+        event: {
+          $type: 'tools.ozone.moderation.defs#modEventPriorityScore',
+          score: 10,
+        },
+      }),
+      modClient.emitEvent({
+        subject: before[before.length - 2].subject,
+        event: {
+          $type: 'tools.ozone.moderation.defs#modEventPriorityScore',
+          score: 5,
+        },
+      }),
+    ])
+    const { subjectStatuses: after } = await modClient.queryStatuses({
+      sortDirection: 'desc',
+      sortField: 'priorityScore',
+    })
+
+    // Verify that highest priority score item is first
+    expect(after[0].priorityScore).toBe(10)
+    expect(after[1].priorityScore).toBe(5)
+    expect(after[0].subject).toMatchObject(before[before.length - 1].subject)
+    expect(after[1].subject).toMatchObject(before[before.length - 2].subject)
+  })
+
+  it('allows setting a priority score.', async () => {
+    const { subjectStatuses } = await modClient.queryStatuses({
+      minPriorityScore: 6,
+      sortDirection: 'desc',
+      sortField: 'priorityScore',
+    })
+
+    // Verify that highest priority score item is first
+    expect(subjectStatuses[0].priorityScore).toBe(10)
+    expect(subjectStatuses.length).toBe(1)
+  })
+})
diff --git a/packages/pds/src/db/tables/moderation.ts b/packages/pds/src/db/tables/moderation.ts
index bc67eda3e25..6520853714f 100644
--- a/packages/pds/src/db/tables/moderation.ts
+++ b/packages/pds/src/db/tables/moderation.ts
@@ -30,6 +30,10 @@ export interface ModerationAction {
     | 'tools.ozone.moderation.defs#modEventEmail'
     | 'tools.ozone.moderation.defs#modEventResolveAppeal'
     | 'tools.ozone.moderation.defs#modEventDivert'
+    | 'tools.ozone.moderation.defs#accountEvent'
+    | 'tools.ozone.moderation.defs#identityEvent'
+    | 'tools.ozone.moderation.defs#recordEvent'
+    | 'tools.ozone.moderation.defs#modEventPriorityScore'
   subjectType: 'com.atproto.admin.defs#repoRef' | 'com.atproto.repo.strongRef'
   subjectDid: string
   subjectUri: string | null
diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
index 3723fedd186..6e709774761 100644
--- a/packages/pds/src/lexicon/lexicons.ts
+++ b/packages/pds/src/lexicon/lexicons.ts
@@ -11192,6 +11192,7 @@ export const schemaDict = {
               'lex:tools.ozone.moderation.defs#accountEvent',
               'lex:tools.ozone.moderation.defs#identityEvent',
               'lex:tools.ozone.moderation.defs#recordEvent',
+              'lex:tools.ozone.moderation.defs#modEventPriorityScore',
             ],
           },
           subject: {
@@ -11259,6 +11260,7 @@ export const schemaDict = {
               'lex:tools.ozone.moderation.defs#accountEvent',
               'lex:tools.ozone.moderation.defs#identityEvent',
               'lex:tools.ozone.moderation.defs#recordEvent',
+              'lex:tools.ozone.moderation.defs#modEventPriorityScore',
             ],
           },
           subject: {
@@ -11338,6 +11340,13 @@ export const schemaDict = {
             type: 'string',
             description: 'Sticky comment on the subject.',
           },
+          priorityScore: {
+            type: 'integer',
+            description:
+              'Numeric value representing the level of priority. Higher score means higher priority.',
+            minimum: 0,
+            maximum: 100,
+          },
           muteUntil: {
             type: 'string',
             format: 'datetime',
@@ -11600,6 +11609,22 @@ export const schemaDict = {
           },
         },
       },
+      modEventPriorityScore: {
+        type: 'object',
+        description:
+          'Set priority score of the subject. Higher score means higher priority.',
+        required: ['score'],
+        properties: {
+          comment: {
+            type: 'string',
+          },
+          score: {
+            type: 'integer',
+            minimum: 0,
+            maximum: 100,
+          },
+        },
+      },
       modEventAcknowledge: {
         type: 'object',
         properties: {
@@ -12223,6 +12248,7 @@ export const schemaDict = {
                   'lex:tools.ozone.moderation.defs#accountEvent',
                   'lex:tools.ozone.moderation.defs#identityEvent',
                   'lex:tools.ozone.moderation.defs#recordEvent',
+                  'lex:tools.ozone.moderation.defs#modEventPriorityScore',
                 ],
               },
               subject: {
@@ -12719,6 +12745,7 @@ export const schemaDict = {
                 'lastReportedAt',
                 'reportedRecordsCount',
                 'takendownRecordsCount',
+                'priorityScore',
               ],
             },
             sortDirection: {
@@ -12789,6 +12816,13 @@ export const schemaDict = {
               description:
                 'If specified, only subjects that belong to an account that has at least this many taken down records will be returned.',
             },
+            minPriorityScore: {
+              minimum: 0,
+              maximum: 100,
+              type: 'integer',
+              description:
+                'If specified, only subjects that have priority score value above the given value will be returned.',
+            },
           },
         },
         output: {
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts
index e31a6d03dba..1fb7bf8e25e 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts
@@ -33,6 +33,7 @@ export interface ModEventView {
     | AccountEvent
     | IdentityEvent
     | RecordEvent
+    | ModEventPriorityScore
     | { $type: string; [k: string]: unknown }
   subject:
     | ComAtprotoAdminDefs.RepoRef
@@ -80,6 +81,7 @@ export interface ModEventViewDetail {
     | AccountEvent
     | IdentityEvent
     | RecordEvent
+    | ModEventPriorityScore
     | { $type: string; [k: string]: unknown }
   subject:
     | RepoView
@@ -124,6 +126,8 @@ export interface SubjectStatusView {
   reviewState: SubjectReviewState
   /** Sticky comment on the subject. */
   comment?: string
+  /** Numeric value representing the level of priority. Higher score means higher priority. */
+  priorityScore?: number
   muteUntil?: string
   muteReportingUntil?: string
   lastReviewedBy?: string
@@ -364,6 +368,30 @@ export function validateModEventLabel(v: unknown): ValidationResult {
   return lexicons.validate('tools.ozone.moderation.defs#modEventLabel', v)
 }
 
+/** Set priority score of the subject. Higher score means higher priority. */
+export interface ModEventPriorityScore {
+  comment?: string
+  score: number
+  [k: string]: unknown
+}
+
+export function isModEventPriorityScore(
+  v: unknown,
+): v is ModEventPriorityScore {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'tools.ozone.moderation.defs#modEventPriorityScore'
+  )
+}
+
+export function validateModEventPriorityScore(v: unknown): ValidationResult {
+  return lexicons.validate(
+    'tools.ozone.moderation.defs#modEventPriorityScore',
+    v,
+  )
+}
+
 export interface ModEventAcknowledge {
   comment?: string
   /** If true, all other reports on content authored by this account will be resolved (acknowledged). */
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/emitEvent.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
index d409858ec7b..8f0f00e98f8 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
@@ -32,6 +32,7 @@ export interface InputSchema {
     | ToolsOzoneModerationDefs.AccountEvent
     | ToolsOzoneModerationDefs.IdentityEvent
     | ToolsOzoneModerationDefs.RecordEvent
+    | ToolsOzoneModerationDefs.ModEventPriorityScore
     | { $type: string; [k: string]: unknown }
   subject:
     | ComAtprotoAdminDefs.RepoRef
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
index 73a953e5176..8e79b023c4c 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
@@ -54,6 +54,7 @@ export interface QueryParams {
     | 'lastReportedAt'
     | 'reportedRecordsCount'
     | 'takendownRecordsCount'
+    | 'priorityScore'
   sortDirection: 'asc' | 'desc'
   /** Get subjects that were taken down */
   takendown?: boolean
@@ -73,6 +74,8 @@ export interface QueryParams {
   minReportedRecordsCount?: number
   /** If specified, only subjects that belong to an account that has at least this many taken down records will be returned. */
   minTakendownRecordsCount?: number
+  /** If specified, only subjects that have priority score value above the given value will be returned. */
+  minPriorityScore?: number
 }
 
 export type InputSchema = undefined
diff --git a/packages/pds/tests/__snapshots__/takedown-appeal.test.ts.snap b/packages/pds/tests/__snapshots__/takedown-appeal.test.ts.snap
index cb103a8defa..29a36f68a0f 100644
--- a/packages/pds/tests/__snapshots__/takedown-appeal.test.ts.snap
+++ b/packages/pds/tests/__snapshots__/takedown-appeal.test.ts.snap
@@ -21,6 +21,7 @@ Object {
   "lastReportedAt": "1970-01-01T00:00:00.000Z",
   "lastReviewedAt": "1970-01-01T00:00:00.000Z",
   "lastReviewedBy": "user(0)",
+  "priorityScore": 0,
   "recordsStats": Object {
     "$type": "tools.ozone.moderation.defs#recordsStats",
   },
diff --git a/packages/pds/tests/proxied/__snapshots__/admin.test.ts.snap b/packages/pds/tests/proxied/__snapshots__/admin.test.ts.snap
index 1886696a4ac..9edd80cd413 100644
--- a/packages/pds/tests/proxied/__snapshots__/admin.test.ts.snap
+++ b/packages/pds/tests/proxied/__snapshots__/admin.test.ts.snap
@@ -159,6 +159,7 @@ Object {
         "lastReportedAt": "1970-01-01T00:00:00.000Z",
         "lastReviewedAt": "1970-01-01T00:00:00.000Z",
         "lastReviewedBy": "user(1)",
+        "priorityScore": 0,
         "recordsStats": Object {
           "$type": "tools.ozone.moderation.defs#recordsStats",
           "appealedCount": 0,
@@ -275,6 +276,7 @@ Object {
       "id": 5,
       "lastReviewedAt": "1970-01-01T00:00:00.000Z",
       "lastReviewedBy": "user(1)",
+      "priorityScore": 0,
       "recordsStats": Object {
         "$type": "tools.ozone.moderation.defs#recordsStats",
         "appealedCount": 0,
@@ -356,6 +358,7 @@ Object {
         "lastReportedAt": "1970-01-01T00:00:00.000Z",
         "lastReviewedAt": "1970-01-01T00:00:00.000Z",
         "lastReviewedBy": "user(1)",
+        "priorityScore": 0,
         "recordsStats": Object {
           "$type": "tools.ozone.moderation.defs#recordsStats",
           "appealedCount": 0,

From f90eedc865136f50a9daee72c52b275d26310aa3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 6 Feb 2025 21:03:25 +0000
Subject: [PATCH 054/101] Version packages (#3505)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/fifty-seals-prove.md |  7 -------
 packages/api/CHANGELOG.md       |  6 ++++++
 packages/api/package.json       |  2 +-
 packages/bsky/CHANGELOG.md      |  7 +++++++
 packages/bsky/package.json      |  2 +-
 packages/dev-env/CHANGELOG.md   | 10 ++++++++++
 packages/dev-env/package.json   |  2 +-
 packages/ozone/CHANGELOG.md     |  9 +++++++++
 packages/ozone/package.json     |  2 +-
 packages/pds/CHANGELOG.md       |  9 +++++++++
 packages/pds/package.json       |  2 +-
 11 files changed, 46 insertions(+), 12 deletions(-)
 delete mode 100644 .changeset/fifty-seals-prove.md

diff --git a/.changeset/fifty-seals-prove.md b/.changeset/fifty-seals-prove.md
deleted file mode 100644
index 4b52914ec00..00000000000
--- a/.changeset/fifty-seals-prove.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-"@atproto/ozone": patch
-"@atproto/api": patch
-"@atproto/pds": patch
----
-
-Add a priority score to ozone subjects
diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md
index c05624b1c37..c0054b021da 100644
--- a/packages/api/CHANGELOG.md
+++ b/packages/api/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @atproto/api
 
+## 0.13.35
+
+### Patch Changes
+
+- [#3495](https://github.com/bluesky-social/atproto/pull/3495) [`709a85b0b`](https://github.com/bluesky-social/atproto/commit/709a85b0b633b5483b7161db64b429c746239153) Thanks [@foysalit](https://github.com/foysalit)! - Add a priority score to ozone subjects
+
 ## 0.13.34
 
 ### Patch Changes
diff --git a/packages/api/package.json b/packages/api/package.json
index ecd77ab7226..9d35bae35c2 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/api",
-  "version": "0.13.34",
+  "version": "0.13.35",
   "license": "MIT",
   "description": "Client library for atproto and Bluesky",
   "keywords": [
diff --git a/packages/bsky/CHANGELOG.md b/packages/bsky/CHANGELOG.md
index 08a4c621be9..f4909155352 100644
--- a/packages/bsky/CHANGELOG.md
+++ b/packages/bsky/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/bsky
 
+## 0.0.116
+
+### Patch Changes
+
+- Updated dependencies [[`709a85b0b`](https://github.com/bluesky-social/atproto/commit/709a85b0b633b5483b7161db64b429c746239153)]:
+  - @atproto/api@0.13.35
+
 ## 0.0.115
 
 ### Patch Changes
diff --git a/packages/bsky/package.json b/packages/bsky/package.json
index ecb21e3f266..fee7c0d0d07 100644
--- a/packages/bsky/package.json
+++ b/packages/bsky/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.115",
+  "version": "0.0.116",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
diff --git a/packages/dev-env/CHANGELOG.md b/packages/dev-env/CHANGELOG.md
index 35faff323bd..3e369cc578d 100644
--- a/packages/dev-env/CHANGELOG.md
+++ b/packages/dev-env/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @atproto/dev-env
 
+## 0.3.86
+
+### Patch Changes
+
+- Updated dependencies [[`709a85b0b`](https://github.com/bluesky-social/atproto/commit/709a85b0b633b5483b7161db64b429c746239153)]:
+  - @atproto/ozone@0.1.77
+  - @atproto/api@0.13.35
+  - @atproto/pds@0.4.94
+  - @atproto/bsky@0.0.116
+
 ## 0.3.85
 
 ### Patch Changes
diff --git a/packages/dev-env/package.json b/packages/dev-env/package.json
index 5d3bf313c1f..5c4966bac59 100644
--- a/packages/dev-env/package.json
+++ b/packages/dev-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/dev-env",
-  "version": "0.3.85",
+  "version": "0.3.86",
   "license": "MIT",
   "description": "Local development environment helper for atproto development",
   "keywords": [
diff --git a/packages/ozone/CHANGELOG.md b/packages/ozone/CHANGELOG.md
index 47d0e5fe528..084bac4a2c0 100644
--- a/packages/ozone/CHANGELOG.md
+++ b/packages/ozone/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @atproto/ozone
 
+## 0.1.77
+
+### Patch Changes
+
+- [#3495](https://github.com/bluesky-social/atproto/pull/3495) [`709a85b0b`](https://github.com/bluesky-social/atproto/commit/709a85b0b633b5483b7161db64b429c746239153) Thanks [@foysalit](https://github.com/foysalit)! - Add a priority score to ozone subjects
+
+- Updated dependencies [[`709a85b0b`](https://github.com/bluesky-social/atproto/commit/709a85b0b633b5483b7161db64b429c746239153)]:
+  - @atproto/api@0.13.35
+
 ## 0.1.76
 
 ### Patch Changes
diff --git a/packages/ozone/package.json b/packages/ozone/package.json
index af1e3bd6fb8..bbc547f5b18 100644
--- a/packages/ozone/package.json
+++ b/packages/ozone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.1.76",
+  "version": "0.1.77",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
diff --git a/packages/pds/CHANGELOG.md b/packages/pds/CHANGELOG.md
index 9389b9434eb..5d57baf2af5 100644
--- a/packages/pds/CHANGELOG.md
+++ b/packages/pds/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @atproto/pds
 
+## 0.4.94
+
+### Patch Changes
+
+- [#3495](https://github.com/bluesky-social/atproto/pull/3495) [`709a85b0b`](https://github.com/bluesky-social/atproto/commit/709a85b0b633b5483b7161db64b429c746239153) Thanks [@foysalit](https://github.com/foysalit)! - Add a priority score to ozone subjects
+
+- Updated dependencies [[`709a85b0b`](https://github.com/bluesky-social/atproto/commit/709a85b0b633b5483b7161db64b429c746239153)]:
+  - @atproto/api@0.13.35
+
 ## 0.4.93
 
 ### Patch Changes
diff --git a/packages/pds/package.json b/packages/pds/package.json
index 3c70e7786f4..ed1d3a5fb42 100644
--- a/packages/pds/package.json
+++ b/packages/pds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/pds",
-  "version": "0.4.93",
+  "version": "0.4.94",
   "license": "MIT",
   "description": "Reference implementation of atproto Personal Data Server (PDS)",
   "keywords": [

From c53d943c8be5b8886254e020970a68c0f745b14c Mon Sep 17 00:00:00 2001
From: Matthieu Sieben <matthieusieben@users.noreply.github.com>
Date: Thu, 13 Feb 2025 15:21:00 +0100
Subject: [PATCH 055/101] Improve codegen typings (#2999)

* Make codegen types stricter
* Add .js file extension to import statements in generated code
* Fixes a bug that would clear interests prefs when updating hidden posts prefs.
---
 .changeset/beige-trees-float.md               |    5 +
 .changeset/brown-flies-stare.md               |   10 +
 .changeset/fast-points-walk.md                |    5 +
 .changeset/fast-waves-jog.md                  |    5 +
 .changeset/green-cherries-shave.md            |    5 +
 .changeset/green-forks-lie.md                 |    5 +
 .changeset/late-worms-travel.md               |    5 +
 .changeset/popular-shirts-rescue.md           |    5 +
 .changeset/shiny-suns-walk.md                 |    5 +
 .changeset/silly-starfishes-pay.md            |    5 +
 .changeset/spotty-bottles-march.md            |    5 +
 .changeset/tiny-carpets-impress.md            |    5 +
 .prettierignore                               |    6 +
 packages/api/jest.config.js                   |    1 +
 packages/api/src/agent.ts                     |  757 +++------
 packages/api/src/client/index.ts              | 1150 ++++++-------
 packages/api/src/client/lexicons.ts           |   41 +-
 .../src/client/types/app/bsky/actor/defs.ts   |  468 +++---
 .../types/app/bsky/actor/getPreferences.ts    |   11 +-
 .../client/types/app/bsky/actor/getProfile.ts |   10 +-
 .../types/app/bsky/actor/getProfiles.ts       |   11 +-
 .../types/app/bsky/actor/getSuggestions.ts    |   11 +-
 .../client/types/app/bsky/actor/profile.ts    |   32 +-
 .../types/app/bsky/actor/putPreferences.ts    |   11 +-
 .../types/app/bsky/actor/searchActors.ts      |   11 +-
 .../app/bsky/actor/searchActorsTypeahead.ts   |   11 +-
 .../src/client/types/app/bsky/embed/defs.ts   |   24 +-
 .../client/types/app/bsky/embed/external.ts   |   73 +-
 .../src/client/types/app/bsky/embed/images.ts |   71 +-
 .../src/client/types/app/bsky/embed/record.ts |  155 +-
 .../types/app/bsky/embed/recordWithMedia.ts   |   65 +-
 .../src/client/types/app/bsky/embed/video.ts  |   57 +-
 .../src/client/types/app/bsky/feed/defs.ts    |  395 ++---
 .../app/bsky/feed/describeFeedGenerator.ts    |   41 +-
 .../client/types/app/bsky/feed/generator.ts   |   32 +-
 .../types/app/bsky/feed/getActorFeeds.ts      |   11 +-
 .../types/app/bsky/feed/getActorLikes.ts      |   11 +-
 .../types/app/bsky/feed/getAuthorFeed.ts      |   11 +-
 .../src/client/types/app/bsky/feed/getFeed.ts |   11 +-
 .../types/app/bsky/feed/getFeedGenerator.ts   |   11 +-
 .../types/app/bsky/feed/getFeedGenerators.ts  |   11 +-
 .../types/app/bsky/feed/getFeedSkeleton.ts    |   11 +-
 .../client/types/app/bsky/feed/getLikes.ts    |   25 +-
 .../client/types/app/bsky/feed/getListFeed.ts |   11 +-
 .../types/app/bsky/feed/getPostThread.ts      |   19 +-
 .../client/types/app/bsky/feed/getPosts.ts    |   11 +-
 .../client/types/app/bsky/feed/getQuotes.ts   |   11 +-
 .../types/app/bsky/feed/getRepostedBy.ts      |   11 +-
 .../types/app/bsky/feed/getSuggestedFeeds.ts  |   11 +-
 .../client/types/app/bsky/feed/getTimeline.ts |   11 +-
 .../src/client/types/app/bsky/feed/like.ts    |   25 +-
 .../src/client/types/app/bsky/feed/post.ts    |   99 +-
 .../client/types/app/bsky/feed/postgate.ts    |   42 +-
 .../src/client/types/app/bsky/feed/repost.ts  |   26 +-
 .../client/types/app/bsky/feed/searchPosts.ts |   11 +-
 .../types/app/bsky/feed/sendInteractions.ts   |   15 +-
 .../client/types/app/bsky/feed/threadgate.ts  |   98 +-
 .../src/client/types/app/bsky/graph/block.ts  |   24 +-
 .../src/client/types/app/bsky/graph/defs.ts   |  154 +-
 .../src/client/types/app/bsky/graph/follow.ts |   24 +-
 .../app/bsky/graph/getActorStarterPacks.ts    |   11 +-
 .../client/types/app/bsky/graph/getBlocks.ts  |   11 +-
 .../types/app/bsky/graph/getFollowers.ts      |   11 +-
 .../client/types/app/bsky/graph/getFollows.ts |   11 +-
 .../types/app/bsky/graph/getKnownFollowers.ts |   11 +-
 .../client/types/app/bsky/graph/getList.ts    |   11 +-
 .../types/app/bsky/graph/getListBlocks.ts     |   11 +-
 .../types/app/bsky/graph/getListMutes.ts      |   11 +-
 .../client/types/app/bsky/graph/getLists.ts   |   11 +-
 .../client/types/app/bsky/graph/getMutes.ts   |   11 +-
 .../types/app/bsky/graph/getRelationships.ts  |   17 +-
 .../types/app/bsky/graph/getStarterPack.ts    |   11 +-
 .../types/app/bsky/graph/getStarterPacks.ts   |   11 +-
 .../bsky/graph/getSuggestedFollowsByActor.ts  |   11 +-
 .../src/client/types/app/bsky/graph/list.ts   |   34 +-
 .../client/types/app/bsky/graph/listblock.ts  |   24 +-
 .../client/types/app/bsky/graph/listitem.ts   |   24 +-
 .../client/types/app/bsky/graph/muteActor.ts  |    9 +-
 .../types/app/bsky/graph/muteActorList.ts     |    9 +-
 .../client/types/app/bsky/graph/muteThread.ts |    9 +-
 .../app/bsky/graph/searchStarterPacks.ts      |   11 +-
 .../types/app/bsky/graph/starterpack.ts       |   42 +-
 .../types/app/bsky/graph/unmuteActor.ts       |    9 +-
 .../types/app/bsky/graph/unmuteActorList.ts   |    9 +-
 .../types/app/bsky/graph/unmuteThread.ts      |    9 +-
 .../src/client/types/app/bsky/labeler/defs.ts |   76 +-
 .../types/app/bsky/labeler/getServices.ts     |   17 +-
 .../client/types/app/bsky/labeler/service.ts  |   32 +-
 .../app/bsky/notification/getUnreadCount.ts   |    9 +-
 .../bsky/notification/listNotifications.ts    |   34 +-
 .../app/bsky/notification/putPreferences.ts   |    9 +-
 .../app/bsky/notification/registerPush.ts     |    9 +-
 .../types/app/bsky/notification/updateSeen.ts |    9 +-
 .../client/types/app/bsky/richtext/facet.ts   |   89 +-
 .../client/types/app/bsky/unspecced/defs.ts   |   79 +-
 .../types/app/bsky/unspecced/getConfig.ts     |    9 +-
 .../unspecced/getPopularFeedGenerators.ts     |   11 +-
 .../bsky/unspecced/getSuggestionsSkeleton.ts  |   11 +-
 .../bsky/unspecced/getTaggedSuggestions.ts    |   28 +-
 .../app/bsky/unspecced/getTrendingTopics.ts   |   11 +-
 .../bsky/unspecced/searchActorsSkeleton.ts    |   11 +-
 .../app/bsky/unspecced/searchPostsSkeleton.ts |   11 +-
 .../unspecced/searchStarterPacksSkeleton.ts   |   11 +-
 .../src/client/types/app/bsky/video/defs.ts   |   24 +-
 .../types/app/bsky/video/getJobStatus.ts      |   11 +-
 .../types/app/bsky/video/getUploadLimits.ts   |    9 +-
 .../types/app/bsky/video/uploadVideo.ts       |   11 +-
 .../types/chat/bsky/actor/declaration.ts      |   24 +-
 .../src/client/types/chat/bsky/actor/defs.ts  |   28 +-
 .../types/chat/bsky/actor/deleteAccount.ts    |   12 +-
 .../chat/bsky/actor/exportAccountData.ts      |    8 +-
 .../src/client/types/chat/bsky/convo/defs.ts  |  194 +--
 .../chat/bsky/convo/deleteMessageForSelf.ts   |   11 +-
 .../client/types/chat/bsky/convo/getConvo.ts  |   11 +-
 .../chat/bsky/convo/getConvoForMembers.ts     |   11 +-
 .../client/types/chat/bsky/convo/getLog.ts    |   21 +-
 .../types/chat/bsky/convo/getMessages.ts      |   17 +-
 .../types/chat/bsky/convo/leaveConvo.ts       |   10 +-
 .../types/chat/bsky/convo/listConvos.ts       |   11 +-
 .../client/types/chat/bsky/convo/muteConvo.ts |   12 +-
 .../types/chat/bsky/convo/sendMessage.ts      |   11 +-
 .../types/chat/bsky/convo/sendMessageBatch.ts |   28 +-
 .../types/chat/bsky/convo/unmuteConvo.ts      |   12 +-
 .../types/chat/bsky/convo/updateRead.ts       |   12 +-
 .../chat/bsky/moderation/getActorMetadata.ts  |   25 +-
 .../chat/bsky/moderation/getMessageContext.ts |   17 +-
 .../chat/bsky/moderation/updateActorAccess.ts |    9 +-
 .../client/types/com/atproto/admin/defs.ts    |   92 +-
 .../types/com/atproto/admin/deleteAccount.ts  |    9 +-
 .../atproto/admin/disableAccountInvites.ts    |    9 +-
 .../com/atproto/admin/disableInviteCodes.ts   |    9 +-
 .../com/atproto/admin/enableAccountInvites.ts |    9 +-
 .../types/com/atproto/admin/getAccountInfo.ts |   10 +-
 .../com/atproto/admin/getAccountInfos.ts      |   11 +-
 .../types/com/atproto/admin/getInviteCodes.ts |   11 +-
 .../com/atproto/admin/getSubjectStatus.ts     |   21 +-
 .../types/com/atproto/admin/searchAccounts.ts |   11 +-
 .../types/com/atproto/admin/sendEmail.ts      |   10 +-
 .../com/atproto/admin/updateAccountEmail.ts   |    9 +-
 .../com/atproto/admin/updateAccountHandle.ts  |    9 +-
 .../atproto/admin/updateAccountPassword.ts    |    9 +-
 .../com/atproto/admin/updateSubjectStatus.ts  |   30 +-
 .../identity/getRecommendedDidCredentials.ts  |   13 +-
 .../identity/requestPlcOperationSignature.ts  |    8 +-
 .../com/atproto/identity/resolveHandle.ts     |    9 +-
 .../com/atproto/identity/signPlcOperation.ts  |   16 +-
 .../atproto/identity/submitPlcOperation.ts    |   11 +-
 .../com/atproto/identity/updateHandle.ts      |    9 +-
 .../client/types/com/atproto/label/defs.ts    |   95 +-
 .../types/com/atproto/label/queryLabels.ts    |   11 +-
 .../com/atproto/label/subscribeLabels.ts      |   42 +-
 .../types/com/atproto/lexicon/schema.ts       |   24 +-
 .../com/atproto/moderation/createReport.ts    |   28 +-
 .../types/com/atproto/moderation/defs.ts      |   22 +-
 .../types/com/atproto/repo/applyWrites.ts     |  120 +-
 .../types/com/atproto/repo/createRecord.ts    |   14 +-
 .../src/client/types/com/atproto/repo/defs.ts |   24 +-
 .../types/com/atproto/repo/deleteRecord.ts    |   12 +-
 .../types/com/atproto/repo/describeRepo.ts    |   11 +-
 .../types/com/atproto/repo/getRecord.ts       |   11 +-
 .../types/com/atproto/repo/importRepo.ts      |    8 +-
 .../com/atproto/repo/listMissingBlobs.ts      |   25 +-
 .../types/com/atproto/repo/listRecords.ts     |   27 +-
 .../types/com/atproto/repo/putRecord.ts       |   14 +-
 .../types/com/atproto/repo/strongRef.ts       |   25 +-
 .../types/com/atproto/repo/uploadBlob.ts      |    9 +-
 .../com/atproto/server/activateAccount.ts     |    8 +-
 .../com/atproto/server/checkAccountStatus.ts  |    9 +-
 .../types/com/atproto/server/confirmEmail.ts  |    9 +-
 .../types/com/atproto/server/createAccount.ts |   14 +-
 .../com/atproto/server/createAppPassword.ts   |   28 +-
 .../com/atproto/server/createInviteCode.ts    |   10 +-
 .../com/atproto/server/createInviteCodes.ts   |   29 +-
 .../types/com/atproto/server/createSession.ts |   12 +-
 .../com/atproto/server/deactivateAccount.ts   |    9 +-
 .../client/types/com/atproto/server/defs.ts   |   40 +-
 .../types/com/atproto/server/deleteAccount.ts |    9 +-
 .../types/com/atproto/server/deleteSession.ts |    8 +-
 .../com/atproto/server/describeServer.ts      |   41 +-
 .../atproto/server/getAccountInviteCodes.ts   |   11 +-
 .../com/atproto/server/getServiceAuth.ts      |    9 +-
 .../types/com/atproto/server/getSession.ts    |   11 +-
 .../com/atproto/server/listAppPasswords.ts    |   25 +-
 .../com/atproto/server/refreshSession.ts      |   11 +-
 .../atproto/server/requestAccountDelete.ts    |    8 +-
 .../server/requestEmailConfirmation.ts        |    8 +-
 .../com/atproto/server/requestEmailUpdate.ts  |    9 +-
 .../atproto/server/requestPasswordReset.ts    |    9 +-
 .../com/atproto/server/reserveSigningKey.ts   |   10 +-
 .../types/com/atproto/server/resetPassword.ts |    9 +-
 .../com/atproto/server/revokeAppPassword.ts   |    9 +-
 .../types/com/atproto/server/updateEmail.ts   |    9 +-
 .../client/types/com/atproto/sync/getBlob.ts  |    8 +-
 .../types/com/atproto/sync/getBlocks.ts       |    8 +-
 .../types/com/atproto/sync/getCheckout.ts     |    8 +-
 .../client/types/com/atproto/sync/getHead.ts  |    9 +-
 .../types/com/atproto/sync/getLatestCommit.ts |    9 +-
 .../types/com/atproto/sync/getRecord.ts       |    8 +-
 .../client/types/com/atproto/sync/getRepo.ts  |    8 +-
 .../types/com/atproto/sync/getRepoStatus.ts   |    9 +-
 .../types/com/atproto/sync/listBlobs.ts       |    9 +-
 .../types/com/atproto/sync/listRepos.ts       |   25 +-
 .../types/com/atproto/sync/notifyOfUpdate.ts  |    9 +-
 .../types/com/atproto/sync/requestCrawl.ts    |    9 +-
 .../types/com/atproto/sync/subscribeRepos.ts  |  136 +-
 .../com/atproto/temp/addReservedHandle.ts     |   13 +-
 .../com/atproto/temp/checkSignupQueue.ts      |    9 +-
 .../types/com/atproto/temp/fetchLabels.ts     |   11 +-
 .../atproto/temp/requestPhoneVerification.ts  |    9 +-
 .../ozone/communication/createTemplate.ts     |   11 +-
 .../types/tools/ozone/communication/defs.ts   |   24 +-
 .../ozone/communication/deleteTemplate.ts     |    9 +-
 .../ozone/communication/listTemplates.ts      |   11 +-
 .../ozone/communication/updateTemplate.ts     |   11 +-
 .../types/tools/ozone/moderation/defs.ts      |  765 ++++-----
 .../types/tools/ozone/moderation/emitEvent.ts |   59 +-
 .../types/tools/ozone/moderation/getEvent.ts  |   10 +-
 .../types/tools/ozone/moderation/getRecord.ts |   10 +-
 .../tools/ozone/moderation/getRecords.ts      |   17 +-
 .../types/tools/ozone/moderation/getRepo.ts   |   10 +-
 .../types/tools/ozone/moderation/getRepos.ts  |   17 +-
 .../tools/ozone/moderation/queryEvents.ts     |   11 +-
 .../tools/ozone/moderation/queryStatuses.ts   |   11 +-
 .../tools/ozone/moderation/searchRepos.ts     |   11 +-
 .../types/tools/ozone/server/getConfig.ts     |   41 +-
 .../client/types/tools/ozone/set/addValues.ts |    9 +-
 .../src/client/types/tools/ozone/set/defs.ts  |   38 +-
 .../client/types/tools/ozone/set/deleteSet.ts |   13 +-
 .../types/tools/ozone/set/deleteValues.ts     |    9 +-
 .../client/types/tools/ozone/set/getValues.ts |   11 +-
 .../client/types/tools/ozone/set/querySets.ts |   11 +-
 .../client/types/tools/ozone/set/upsertSet.ts |   10 +-
 .../client/types/tools/ozone/setting/defs.ts  |   26 +-
 .../types/tools/ozone/setting/listOptions.ts  |   11 +-
 .../tools/ozone/setting/removeOptions.ts      |   13 +-
 .../types/tools/ozone/setting/upsertOption.ts |   14 +-
 .../types/tools/ozone/signature/defs.ts       |   24 +-
 .../tools/ozone/signature/findCorrelation.ts  |   11 +-
 .../ozone/signature/findRelatedAccounts.ts    |   32 +-
 .../tools/ozone/signature/searchAccounts.ts   |   11 +-
 .../types/tools/ozone/team/addMember.ts       |   11 +-
 .../src/client/types/tools/ozone/team/defs.ts |   32 +-
 .../types/tools/ozone/team/deleteMember.ts    |    9 +-
 .../types/tools/ozone/team/listMembers.ts     |   11 +-
 .../types/tools/ozone/team/updateMember.ts    |   11 +-
 packages/api/src/client/util.ts               |   83 +-
 packages/api/src/index.ts                     |    2 +
 packages/api/src/mocker.ts                    |   14 +-
 packages/api/src/moderation/decision.ts       |    4 +-
 packages/api/src/moderation/mutewords.ts      |    2 +-
 packages/api/src/moderation/subjects/post.ts  |  120 +-
 .../api/src/moderation/subjects/user-list.ts  |    6 +-
 packages/api/src/moderation/types.ts          |    2 +
 packages/api/src/moderation/util.ts           |    6 +-
 packages/api/src/predicate.ts                 |   43 +
 packages/api/src/rich-text/rich-text.ts       |   18 +-
 packages/api/tests/atp-agent.test.ts          |   39 +-
 .../tests/moderation-custom-labels.test.ts    |    1 +
 .../api/tests/moderation-mutewords.test.ts    |    1 +
 packages/api/tests/moderation-prefs.test.ts   |    3 +-
 .../api/tests/moderation-quoteposts.test.ts   |    1 +
 packages/api/tests/moderation.test.ts         |   10 +
 .../api/tests/rich-text-detection.test.ts     |   14 +-
 packages/bsky/jest.config.js                  |    1 +
 .../bsky/src/api/app/bsky/feed/getFeed.ts     |   14 +-
 .../src/api/app/bsky/labeler/getServices.ts   |    4 +-
 .../server/indexing/plugins/post.ts           |   10 +-
 packages/bsky/src/hydration/graph.ts          |    5 +-
 packages/bsky/src/hydration/hydrator.ts       |   10 +-
 packages/bsky/src/hydration/util.ts           |    6 +-
 packages/bsky/src/lexicon/index.ts            |  312 ++--
 packages/bsky/src/lexicon/lexicons.ts         |   41 +-
 .../src/lexicon/types/app/bsky/actor/defs.ts  |  468 +++---
 .../types/app/bsky/actor/getPreferences.ts    |   11 +-
 .../types/app/bsky/actor/getProfile.ts        |   10 +-
 .../types/app/bsky/actor/getProfiles.ts       |   11 +-
 .../types/app/bsky/actor/getSuggestions.ts    |   11 +-
 .../lexicon/types/app/bsky/actor/profile.ts   |   32 +-
 .../types/app/bsky/actor/putPreferences.ts    |   11 +-
 .../types/app/bsky/actor/searchActors.ts      |   11 +-
 .../app/bsky/actor/searchActorsTypeahead.ts   |   11 +-
 .../src/lexicon/types/app/bsky/embed/defs.ts  |   24 +-
 .../lexicon/types/app/bsky/embed/external.ts  |   73 +-
 .../lexicon/types/app/bsky/embed/images.ts    |   71 +-
 .../lexicon/types/app/bsky/embed/record.ts    |  155 +-
 .../types/app/bsky/embed/recordWithMedia.ts   |   65 +-
 .../src/lexicon/types/app/bsky/embed/video.ts |   57 +-
 .../src/lexicon/types/app/bsky/feed/defs.ts   |  395 ++---
 .../app/bsky/feed/describeFeedGenerator.ts    |   41 +-
 .../lexicon/types/app/bsky/feed/generator.ts  |   32 +-
 .../types/app/bsky/feed/getActorFeeds.ts      |   11 +-
 .../types/app/bsky/feed/getActorLikes.ts      |   11 +-
 .../types/app/bsky/feed/getAuthorFeed.ts      |   11 +-
 .../lexicon/types/app/bsky/feed/getFeed.ts    |   11 +-
 .../types/app/bsky/feed/getFeedGenerator.ts   |   11 +-
 .../types/app/bsky/feed/getFeedGenerators.ts  |   11 +-
 .../types/app/bsky/feed/getFeedSkeleton.ts    |   11 +-
 .../lexicon/types/app/bsky/feed/getLikes.ts   |   25 +-
 .../types/app/bsky/feed/getListFeed.ts        |   11 +-
 .../types/app/bsky/feed/getPostThread.ts      |   19 +-
 .../lexicon/types/app/bsky/feed/getPosts.ts   |   11 +-
 .../lexicon/types/app/bsky/feed/getQuotes.ts  |   11 +-
 .../types/app/bsky/feed/getRepostedBy.ts      |   11 +-
 .../types/app/bsky/feed/getSuggestedFeeds.ts  |   11 +-
 .../types/app/bsky/feed/getTimeline.ts        |   11 +-
 .../src/lexicon/types/app/bsky/feed/like.ts   |   25 +-
 .../src/lexicon/types/app/bsky/feed/post.ts   |   99 +-
 .../lexicon/types/app/bsky/feed/postgate.ts   |   42 +-
 .../src/lexicon/types/app/bsky/feed/repost.ts |   26 +-
 .../types/app/bsky/feed/searchPosts.ts        |   11 +-
 .../types/app/bsky/feed/sendInteractions.ts   |   15 +-
 .../lexicon/types/app/bsky/feed/threadgate.ts |   98 +-
 .../src/lexicon/types/app/bsky/graph/block.ts |   24 +-
 .../src/lexicon/types/app/bsky/graph/defs.ts  |  154 +-
 .../lexicon/types/app/bsky/graph/follow.ts    |   24 +-
 .../app/bsky/graph/getActorStarterPacks.ts    |   11 +-
 .../lexicon/types/app/bsky/graph/getBlocks.ts |   11 +-
 .../types/app/bsky/graph/getFollowers.ts      |   11 +-
 .../types/app/bsky/graph/getFollows.ts        |   11 +-
 .../types/app/bsky/graph/getKnownFollowers.ts |   11 +-
 .../lexicon/types/app/bsky/graph/getList.ts   |   11 +-
 .../types/app/bsky/graph/getListBlocks.ts     |   11 +-
 .../types/app/bsky/graph/getListMutes.ts      |   11 +-
 .../lexicon/types/app/bsky/graph/getLists.ts  |   11 +-
 .../lexicon/types/app/bsky/graph/getMutes.ts  |   11 +-
 .../types/app/bsky/graph/getRelationships.ts  |   17 +-
 .../types/app/bsky/graph/getStarterPack.ts    |   11 +-
 .../types/app/bsky/graph/getStarterPacks.ts   |   11 +-
 .../bsky/graph/getSuggestedFollowsByActor.ts  |   11 +-
 .../src/lexicon/types/app/bsky/graph/list.ts  |   34 +-
 .../lexicon/types/app/bsky/graph/listblock.ts |   24 +-
 .../lexicon/types/app/bsky/graph/listitem.ts  |   24 +-
 .../lexicon/types/app/bsky/graph/muteActor.ts |    9 +-
 .../types/app/bsky/graph/muteActorList.ts     |    9 +-
 .../types/app/bsky/graph/muteThread.ts        |    9 +-
 .../app/bsky/graph/searchStarterPacks.ts      |   11 +-
 .../types/app/bsky/graph/starterpack.ts       |   42 +-
 .../types/app/bsky/graph/unmuteActor.ts       |    9 +-
 .../types/app/bsky/graph/unmuteActorList.ts   |    9 +-
 .../types/app/bsky/graph/unmuteThread.ts      |    9 +-
 .../lexicon/types/app/bsky/labeler/defs.ts    |   76 +-
 .../types/app/bsky/labeler/getServices.ts     |   17 +-
 .../lexicon/types/app/bsky/labeler/service.ts |   32 +-
 .../app/bsky/notification/getUnreadCount.ts   |    9 +-
 .../bsky/notification/listNotifications.ts    |   34 +-
 .../app/bsky/notification/putPreferences.ts   |    9 +-
 .../app/bsky/notification/registerPush.ts     |    9 +-
 .../types/app/bsky/notification/updateSeen.ts |    9 +-
 .../lexicon/types/app/bsky/richtext/facet.ts  |   89 +-
 .../lexicon/types/app/bsky/unspecced/defs.ts  |   79 +-
 .../types/app/bsky/unspecced/getConfig.ts     |    9 +-
 .../unspecced/getPopularFeedGenerators.ts     |   11 +-
 .../bsky/unspecced/getSuggestionsSkeleton.ts  |   11 +-
 .../bsky/unspecced/getTaggedSuggestions.ts    |   28 +-
 .../app/bsky/unspecced/getTrendingTopics.ts   |   11 +-
 .../bsky/unspecced/searchActorsSkeleton.ts    |   11 +-
 .../app/bsky/unspecced/searchPostsSkeleton.ts |   11 +-
 .../unspecced/searchStarterPacksSkeleton.ts   |   11 +-
 .../src/lexicon/types/app/bsky/video/defs.ts  |   24 +-
 .../types/app/bsky/video/getJobStatus.ts      |   11 +-
 .../types/app/bsky/video/getUploadLimits.ts   |    9 +-
 .../types/app/bsky/video/uploadVideo.ts       |   13 +-
 .../types/chat/bsky/actor/declaration.ts      |   24 +-
 .../src/lexicon/types/chat/bsky/actor/defs.ts |   28 +-
 .../types/chat/bsky/actor/deleteAccount.ts    |   12 +-
 .../chat/bsky/actor/exportAccountData.ts      |   10 +-
 .../src/lexicon/types/chat/bsky/convo/defs.ts |  194 +--
 .../chat/bsky/convo/deleteMessageForSelf.ts   |   11 +-
 .../lexicon/types/chat/bsky/convo/getConvo.ts |   11 +-
 .../chat/bsky/convo/getConvoForMembers.ts     |   11 +-
 .../lexicon/types/chat/bsky/convo/getLog.ts   |   21 +-
 .../types/chat/bsky/convo/getMessages.ts      |   17 +-
 .../types/chat/bsky/convo/leaveConvo.ts       |   10 +-
 .../types/chat/bsky/convo/listConvos.ts       |   11 +-
 .../types/chat/bsky/convo/muteConvo.ts        |   12 +-
 .../types/chat/bsky/convo/sendMessage.ts      |   11 +-
 .../types/chat/bsky/convo/sendMessageBatch.ts |   28 +-
 .../types/chat/bsky/convo/unmuteConvo.ts      |   12 +-
 .../types/chat/bsky/convo/updateRead.ts       |   12 +-
 .../chat/bsky/moderation/getActorMetadata.ts  |   25 +-
 .../chat/bsky/moderation/getMessageContext.ts |   17 +-
 .../chat/bsky/moderation/updateActorAccess.ts |    9 +-
 .../lexicon/types/com/atproto/admin/defs.ts   |   92 +-
 .../types/com/atproto/admin/deleteAccount.ts  |    9 +-
 .../atproto/admin/disableAccountInvites.ts    |    9 +-
 .../com/atproto/admin/disableInviteCodes.ts   |    9 +-
 .../com/atproto/admin/enableAccountInvites.ts |    9 +-
 .../types/com/atproto/admin/getAccountInfo.ts |   10 +-
 .../com/atproto/admin/getAccountInfos.ts      |   11 +-
 .../types/com/atproto/admin/getInviteCodes.ts |   11 +-
 .../com/atproto/admin/getSubjectStatus.ts     |   21 +-
 .../types/com/atproto/admin/searchAccounts.ts |   11 +-
 .../types/com/atproto/admin/sendEmail.ts      |   10 +-
 .../com/atproto/admin/updateAccountEmail.ts   |    9 +-
 .../com/atproto/admin/updateAccountHandle.ts  |    9 +-
 .../atproto/admin/updateAccountPassword.ts    |    9 +-
 .../com/atproto/admin/updateSubjectStatus.ts  |   30 +-
 .../identity/getRecommendedDidCredentials.ts  |   13 +-
 .../identity/requestPlcOperationSignature.ts  |    8 +-
 .../com/atproto/identity/resolveHandle.ts     |    9 +-
 .../com/atproto/identity/signPlcOperation.ts  |   16 +-
 .../atproto/identity/submitPlcOperation.ts    |   11 +-
 .../com/atproto/identity/updateHandle.ts      |    9 +-
 .../lexicon/types/com/atproto/label/defs.ts   |   95 +-
 .../types/com/atproto/label/queryLabels.ts    |   11 +-
 .../com/atproto/label/subscribeLabels.ts      |   49 +-
 .../types/com/atproto/lexicon/schema.ts       |   24 +-
 .../com/atproto/moderation/createReport.ts    |   28 +-
 .../types/com/atproto/moderation/defs.ts      |   22 +-
 .../types/com/atproto/repo/applyWrites.ts     |  120 +-
 .../types/com/atproto/repo/createRecord.ts    |   14 +-
 .../lexicon/types/com/atproto/repo/defs.ts    |   24 +-
 .../types/com/atproto/repo/deleteRecord.ts    |   12 +-
 .../types/com/atproto/repo/describeRepo.ts    |   11 +-
 .../types/com/atproto/repo/getRecord.ts       |   11 +-
 .../types/com/atproto/repo/importRepo.ts      |   10 +-
 .../com/atproto/repo/listMissingBlobs.ts      |   25 +-
 .../types/com/atproto/repo/listRecords.ts     |   27 +-
 .../types/com/atproto/repo/putRecord.ts       |   14 +-
 .../types/com/atproto/repo/strongRef.ts       |   25 +-
 .../types/com/atproto/repo/uploadBlob.ts      |   11 +-
 .../com/atproto/server/activateAccount.ts     |    8 +-
 .../com/atproto/server/checkAccountStatus.ts  |    9 +-
 .../types/com/atproto/server/confirmEmail.ts  |    9 +-
 .../types/com/atproto/server/createAccount.ts |   14 +-
 .../com/atproto/server/createAppPassword.ts   |   28 +-
 .../com/atproto/server/createInviteCode.ts    |   10 +-
 .../com/atproto/server/createInviteCodes.ts   |   29 +-
 .../types/com/atproto/server/createSession.ts |   12 +-
 .../com/atproto/server/deactivateAccount.ts   |    9 +-
 .../lexicon/types/com/atproto/server/defs.ts  |   40 +-
 .../types/com/atproto/server/deleteAccount.ts |    9 +-
 .../types/com/atproto/server/deleteSession.ts |    8 +-
 .../com/atproto/server/describeServer.ts      |   41 +-
 .../atproto/server/getAccountInviteCodes.ts   |   11 +-
 .../com/atproto/server/getServiceAuth.ts      |    9 +-
 .../types/com/atproto/server/getSession.ts    |   11 +-
 .../com/atproto/server/listAppPasswords.ts    |   25 +-
 .../com/atproto/server/refreshSession.ts      |   11 +-
 .../atproto/server/requestAccountDelete.ts    |    8 +-
 .../server/requestEmailConfirmation.ts        |    8 +-
 .../com/atproto/server/requestEmailUpdate.ts  |    9 +-
 .../atproto/server/requestPasswordReset.ts    |    9 +-
 .../com/atproto/server/reserveSigningKey.ts   |   10 +-
 .../types/com/atproto/server/resetPassword.ts |    9 +-
 .../com/atproto/server/revokeAppPassword.ts   |    9 +-
 .../types/com/atproto/server/updateEmail.ts   |    9 +-
 .../lexicon/types/com/atproto/sync/getBlob.ts |   10 +-
 .../types/com/atproto/sync/getBlocks.ts       |   10 +-
 .../types/com/atproto/sync/getCheckout.ts     |   10 +-
 .../lexicon/types/com/atproto/sync/getHead.ts |    9 +-
 .../types/com/atproto/sync/getLatestCommit.ts |    9 +-
 .../types/com/atproto/sync/getRecord.ts       |   10 +-
 .../lexicon/types/com/atproto/sync/getRepo.ts |   10 +-
 .../types/com/atproto/sync/getRepoStatus.ts   |    9 +-
 .../types/com/atproto/sync/listBlobs.ts       |    9 +-
 .../types/com/atproto/sync/listRepos.ts       |   25 +-
 .../types/com/atproto/sync/notifyOfUpdate.ts  |    9 +-
 .../types/com/atproto/sync/requestCrawl.ts    |    9 +-
 .../types/com/atproto/sync/subscribeRepos.ts  |  154 +-
 .../com/atproto/temp/addReservedHandle.ts     |   13 +-
 .../com/atproto/temp/checkSignupQueue.ts      |    9 +-
 .../types/com/atproto/temp/fetchLabels.ts     |   11 +-
 .../atproto/temp/requestPhoneVerification.ts  |    9 +-
 packages/bsky/src/lexicon/util.ts             |   83 +-
 packages/bsky/src/views/index.ts              |  234 ++-
 packages/bsky/src/views/types.ts              |    6 +-
 packages/bsky/tests/_util.ts                  |   91 +-
 packages/bsky/tests/admin/admin-auth.test.ts  |   10 +-
 packages/bsky/tests/admin/moderation.test.ts  |   20 +-
 .../__snapshots__/author-feed.test.ts.snap    | 1476 +++++++++++++----
 packages/bsky/tests/views/author-feed.test.ts |   76 +-
 packages/bsky/tests/views/blocks.test.ts      |   21 +-
 .../bsky/tests/views/feed-view-post.test.ts   |   40 +-
 .../bsky/tests/views/labeler-service.test.ts  |    5 +-
 .../bsky/tests/views/labels-takedown.test.ts  |    6 +-
 packages/bsky/tests/views/list-feed.test.ts   |   13 +-
 packages/bsky/tests/views/posts.test.ts       |    4 +-
 .../bsky/tests/views/starter-packs.test.ts    |    8 +-
 packages/bsky/tests/views/thread.test.ts      |   19 +-
 packages/bsync/jest.config.js                 |    1 +
 packages/common-web/jest.config.js            |    1 +
 packages/common/jest.config.js                |    1 +
 packages/crypto/jest.config.js                |    1 +
 packages/dev-env/src/moderator-client.ts      |   11 +-
 packages/dev-env/src/seed/client.ts           |    3 +-
 packages/identity/jest.config.js              |    1 +
 packages/lex-cli/src/codegen/client.ts        |   82 +-
 packages/lex-cli/src/codegen/common.ts        |  209 ++-
 packages/lex-cli/src/codegen/lex-gen.ts       |  281 +++-
 packages/lex-cli/src/codegen/server.ts        |   67 +-
 packages/lexicon/jest.config.js               |    1 +
 packages/lexicon/src/lexicons.ts              |   30 +-
 packages/lexicon/src/types.ts                 |   24 +-
 packages/lexicon/src/util.ts                  |   15 -
 packages/lexicon/src/validators/complex.ts    |  103 +-
 packages/lexicon/src/validators/formats.ts    |   19 +-
 packages/lexicon/src/validators/primitives.ts |   12 +-
 packages/ozone/jest.config.js                 |    1 +
 .../ozone/src/api/moderation/emitEvent.ts     |    9 +-
 packages/ozone/src/api/moderation/getRepos.ts |    2 +-
 packages/ozone/src/api/util.ts                |   27 +-
 packages/ozone/src/lexicon/index.ts           |  372 ++---
 packages/ozone/src/lexicon/lexicons.ts        |   41 +-
 .../src/lexicon/types/app/bsky/actor/defs.ts  |  468 +++---
 .../types/app/bsky/actor/getPreferences.ts    |   11 +-
 .../types/app/bsky/actor/getProfile.ts        |   10 +-
 .../types/app/bsky/actor/getProfiles.ts       |   11 +-
 .../types/app/bsky/actor/getSuggestions.ts    |   11 +-
 .../lexicon/types/app/bsky/actor/profile.ts   |   32 +-
 .../types/app/bsky/actor/putPreferences.ts    |   11 +-
 .../types/app/bsky/actor/searchActors.ts      |   11 +-
 .../app/bsky/actor/searchActorsTypeahead.ts   |   11 +-
 .../src/lexicon/types/app/bsky/embed/defs.ts  |   24 +-
 .../lexicon/types/app/bsky/embed/external.ts  |   73 +-
 .../lexicon/types/app/bsky/embed/images.ts    |   71 +-
 .../lexicon/types/app/bsky/embed/record.ts    |  155 +-
 .../types/app/bsky/embed/recordWithMedia.ts   |   65 +-
 .../src/lexicon/types/app/bsky/embed/video.ts |   57 +-
 .../src/lexicon/types/app/bsky/feed/defs.ts   |  395 ++---
 .../app/bsky/feed/describeFeedGenerator.ts    |   41 +-
 .../lexicon/types/app/bsky/feed/generator.ts  |   32 +-
 .../types/app/bsky/feed/getActorFeeds.ts      |   11 +-
 .../types/app/bsky/feed/getActorLikes.ts      |   11 +-
 .../types/app/bsky/feed/getAuthorFeed.ts      |   11 +-
 .../lexicon/types/app/bsky/feed/getFeed.ts    |   11 +-
 .../types/app/bsky/feed/getFeedGenerator.ts   |   11 +-
 .../types/app/bsky/feed/getFeedGenerators.ts  |   11 +-
 .../types/app/bsky/feed/getFeedSkeleton.ts    |   11 +-
 .../lexicon/types/app/bsky/feed/getLikes.ts   |   25 +-
 .../types/app/bsky/feed/getListFeed.ts        |   11 +-
 .../types/app/bsky/feed/getPostThread.ts      |   19 +-
 .../lexicon/types/app/bsky/feed/getPosts.ts   |   11 +-
 .../lexicon/types/app/bsky/feed/getQuotes.ts  |   11 +-
 .../types/app/bsky/feed/getRepostedBy.ts      |   11 +-
 .../types/app/bsky/feed/getSuggestedFeeds.ts  |   11 +-
 .../types/app/bsky/feed/getTimeline.ts        |   11 +-
 .../src/lexicon/types/app/bsky/feed/like.ts   |   25 +-
 .../src/lexicon/types/app/bsky/feed/post.ts   |   99 +-
 .../lexicon/types/app/bsky/feed/postgate.ts   |   42 +-
 .../src/lexicon/types/app/bsky/feed/repost.ts |   26 +-
 .../types/app/bsky/feed/searchPosts.ts        |   11 +-
 .../types/app/bsky/feed/sendInteractions.ts   |   15 +-
 .../lexicon/types/app/bsky/feed/threadgate.ts |   98 +-
 .../src/lexicon/types/app/bsky/graph/block.ts |   24 +-
 .../src/lexicon/types/app/bsky/graph/defs.ts  |  154 +-
 .../lexicon/types/app/bsky/graph/follow.ts    |   24 +-
 .../app/bsky/graph/getActorStarterPacks.ts    |   11 +-
 .../lexicon/types/app/bsky/graph/getBlocks.ts |   11 +-
 .../types/app/bsky/graph/getFollowers.ts      |   11 +-
 .../types/app/bsky/graph/getFollows.ts        |   11 +-
 .../types/app/bsky/graph/getKnownFollowers.ts |   11 +-
 .../lexicon/types/app/bsky/graph/getList.ts   |   11 +-
 .../types/app/bsky/graph/getListBlocks.ts     |   11 +-
 .../types/app/bsky/graph/getListMutes.ts      |   11 +-
 .../lexicon/types/app/bsky/graph/getLists.ts  |   11 +-
 .../lexicon/types/app/bsky/graph/getMutes.ts  |   11 +-
 .../types/app/bsky/graph/getRelationships.ts  |   17 +-
 .../types/app/bsky/graph/getStarterPack.ts    |   11 +-
 .../types/app/bsky/graph/getStarterPacks.ts   |   11 +-
 .../bsky/graph/getSuggestedFollowsByActor.ts  |   11 +-
 .../src/lexicon/types/app/bsky/graph/list.ts  |   34 +-
 .../lexicon/types/app/bsky/graph/listblock.ts |   24 +-
 .../lexicon/types/app/bsky/graph/listitem.ts  |   24 +-
 .../lexicon/types/app/bsky/graph/muteActor.ts |    9 +-
 .../types/app/bsky/graph/muteActorList.ts     |    9 +-
 .../types/app/bsky/graph/muteThread.ts        |    9 +-
 .../app/bsky/graph/searchStarterPacks.ts      |   11 +-
 .../types/app/bsky/graph/starterpack.ts       |   42 +-
 .../types/app/bsky/graph/unmuteActor.ts       |    9 +-
 .../types/app/bsky/graph/unmuteActorList.ts   |    9 +-
 .../types/app/bsky/graph/unmuteThread.ts      |    9 +-
 .../lexicon/types/app/bsky/labeler/defs.ts    |   76 +-
 .../types/app/bsky/labeler/getServices.ts     |   17 +-
 .../lexicon/types/app/bsky/labeler/service.ts |   32 +-
 .../app/bsky/notification/getUnreadCount.ts   |    9 +-
 .../bsky/notification/listNotifications.ts    |   34 +-
 .../app/bsky/notification/putPreferences.ts   |    9 +-
 .../app/bsky/notification/registerPush.ts     |    9 +-
 .../types/app/bsky/notification/updateSeen.ts |    9 +-
 .../lexicon/types/app/bsky/richtext/facet.ts  |   89 +-
 .../lexicon/types/app/bsky/unspecced/defs.ts  |   79 +-
 .../types/app/bsky/unspecced/getConfig.ts     |    9 +-
 .../unspecced/getPopularFeedGenerators.ts     |   11 +-
 .../bsky/unspecced/getSuggestionsSkeleton.ts  |   11 +-
 .../bsky/unspecced/getTaggedSuggestions.ts    |   28 +-
 .../app/bsky/unspecced/getTrendingTopics.ts   |   11 +-
 .../bsky/unspecced/searchActorsSkeleton.ts    |   11 +-
 .../app/bsky/unspecced/searchPostsSkeleton.ts |   11 +-
 .../unspecced/searchStarterPacksSkeleton.ts   |   11 +-
 .../src/lexicon/types/app/bsky/video/defs.ts  |   24 +-
 .../types/app/bsky/video/getJobStatus.ts      |   11 +-
 .../types/app/bsky/video/getUploadLimits.ts   |    9 +-
 .../types/app/bsky/video/uploadVideo.ts       |   13 +-
 .../types/chat/bsky/actor/declaration.ts      |   24 +-
 .../src/lexicon/types/chat/bsky/actor/defs.ts |   28 +-
 .../types/chat/bsky/actor/deleteAccount.ts    |   12 +-
 .../chat/bsky/actor/exportAccountData.ts      |   10 +-
 .../src/lexicon/types/chat/bsky/convo/defs.ts |  194 +--
 .../chat/bsky/convo/deleteMessageForSelf.ts   |   11 +-
 .../lexicon/types/chat/bsky/convo/getConvo.ts |   11 +-
 .../chat/bsky/convo/getConvoForMembers.ts     |   11 +-
 .../lexicon/types/chat/bsky/convo/getLog.ts   |   21 +-
 .../types/chat/bsky/convo/getMessages.ts      |   17 +-
 .../types/chat/bsky/convo/leaveConvo.ts       |   10 +-
 .../types/chat/bsky/convo/listConvos.ts       |   11 +-
 .../types/chat/bsky/convo/muteConvo.ts        |   12 +-
 .../types/chat/bsky/convo/sendMessage.ts      |   11 +-
 .../types/chat/bsky/convo/sendMessageBatch.ts |   28 +-
 .../types/chat/bsky/convo/unmuteConvo.ts      |   12 +-
 .../types/chat/bsky/convo/updateRead.ts       |   12 +-
 .../chat/bsky/moderation/getActorMetadata.ts  |   25 +-
 .../chat/bsky/moderation/getMessageContext.ts |   17 +-
 .../chat/bsky/moderation/updateActorAccess.ts |    9 +-
 .../lexicon/types/com/atproto/admin/defs.ts   |   92 +-
 .../types/com/atproto/admin/deleteAccount.ts  |    9 +-
 .../atproto/admin/disableAccountInvites.ts    |    9 +-
 .../com/atproto/admin/disableInviteCodes.ts   |    9 +-
 .../com/atproto/admin/enableAccountInvites.ts |    9 +-
 .../types/com/atproto/admin/getAccountInfo.ts |   10 +-
 .../com/atproto/admin/getAccountInfos.ts      |   11 +-
 .../types/com/atproto/admin/getInviteCodes.ts |   11 +-
 .../com/atproto/admin/getSubjectStatus.ts     |   21 +-
 .../types/com/atproto/admin/searchAccounts.ts |   11 +-
 .../types/com/atproto/admin/sendEmail.ts      |   10 +-
 .../com/atproto/admin/updateAccountEmail.ts   |    9 +-
 .../com/atproto/admin/updateAccountHandle.ts  |    9 +-
 .../atproto/admin/updateAccountPassword.ts    |    9 +-
 .../com/atproto/admin/updateSubjectStatus.ts  |   30 +-
 .../identity/getRecommendedDidCredentials.ts  |   13 +-
 .../identity/requestPlcOperationSignature.ts  |    8 +-
 .../com/atproto/identity/resolveHandle.ts     |    9 +-
 .../com/atproto/identity/signPlcOperation.ts  |   16 +-
 .../atproto/identity/submitPlcOperation.ts    |   11 +-
 .../com/atproto/identity/updateHandle.ts      |    9 +-
 .../lexicon/types/com/atproto/label/defs.ts   |   95 +-
 .../types/com/atproto/label/queryLabels.ts    |   11 +-
 .../com/atproto/label/subscribeLabels.ts      |   49 +-
 .../types/com/atproto/lexicon/schema.ts       |   24 +-
 .../com/atproto/moderation/createReport.ts    |   28 +-
 .../types/com/atproto/moderation/defs.ts      |   22 +-
 .../types/com/atproto/repo/applyWrites.ts     |  120 +-
 .../types/com/atproto/repo/createRecord.ts    |   14 +-
 .../lexicon/types/com/atproto/repo/defs.ts    |   24 +-
 .../types/com/atproto/repo/deleteRecord.ts    |   12 +-
 .../types/com/atproto/repo/describeRepo.ts    |   11 +-
 .../types/com/atproto/repo/getRecord.ts       |   11 +-
 .../types/com/atproto/repo/importRepo.ts      |   10 +-
 .../com/atproto/repo/listMissingBlobs.ts      |   25 +-
 .../types/com/atproto/repo/listRecords.ts     |   27 +-
 .../types/com/atproto/repo/putRecord.ts       |   14 +-
 .../types/com/atproto/repo/strongRef.ts       |   25 +-
 .../types/com/atproto/repo/uploadBlob.ts      |   11 +-
 .../com/atproto/server/activateAccount.ts     |    8 +-
 .../com/atproto/server/checkAccountStatus.ts  |    9 +-
 .../types/com/atproto/server/confirmEmail.ts  |    9 +-
 .../types/com/atproto/server/createAccount.ts |   14 +-
 .../com/atproto/server/createAppPassword.ts   |   28 +-
 .../com/atproto/server/createInviteCode.ts    |   10 +-
 .../com/atproto/server/createInviteCodes.ts   |   29 +-
 .../types/com/atproto/server/createSession.ts |   12 +-
 .../com/atproto/server/deactivateAccount.ts   |    9 +-
 .../lexicon/types/com/atproto/server/defs.ts  |   40 +-
 .../types/com/atproto/server/deleteAccount.ts |    9 +-
 .../types/com/atproto/server/deleteSession.ts |    8 +-
 .../com/atproto/server/describeServer.ts      |   41 +-
 .../atproto/server/getAccountInviteCodes.ts   |   11 +-
 .../com/atproto/server/getServiceAuth.ts      |    9 +-
 .../types/com/atproto/server/getSession.ts    |   11 +-
 .../com/atproto/server/listAppPasswords.ts    |   25 +-
 .../com/atproto/server/refreshSession.ts      |   11 +-
 .../atproto/server/requestAccountDelete.ts    |    8 +-
 .../server/requestEmailConfirmation.ts        |    8 +-
 .../com/atproto/server/requestEmailUpdate.ts  |    9 +-
 .../atproto/server/requestPasswordReset.ts    |    9 +-
 .../com/atproto/server/reserveSigningKey.ts   |   10 +-
 .../types/com/atproto/server/resetPassword.ts |    9 +-
 .../com/atproto/server/revokeAppPassword.ts   |    9 +-
 .../types/com/atproto/server/updateEmail.ts   |    9 +-
 .../lexicon/types/com/atproto/sync/getBlob.ts |   10 +-
 .../types/com/atproto/sync/getBlocks.ts       |   10 +-
 .../types/com/atproto/sync/getCheckout.ts     |   10 +-
 .../lexicon/types/com/atproto/sync/getHead.ts |    9 +-
 .../types/com/atproto/sync/getLatestCommit.ts |    9 +-
 .../types/com/atproto/sync/getRecord.ts       |   10 +-
 .../lexicon/types/com/atproto/sync/getRepo.ts |   10 +-
 .../types/com/atproto/sync/getRepoStatus.ts   |    9 +-
 .../types/com/atproto/sync/listBlobs.ts       |    9 +-
 .../types/com/atproto/sync/listRepos.ts       |   25 +-
 .../types/com/atproto/sync/notifyOfUpdate.ts  |    9 +-
 .../types/com/atproto/sync/requestCrawl.ts    |    9 +-
 .../types/com/atproto/sync/subscribeRepos.ts  |  154 +-
 .../com/atproto/temp/addReservedHandle.ts     |   13 +-
 .../com/atproto/temp/checkSignupQueue.ts      |    9 +-
 .../types/com/atproto/temp/fetchLabels.ts     |   11 +-
 .../atproto/temp/requestPhoneVerification.ts  |    9 +-
 .../ozone/communication/createTemplate.ts     |   11 +-
 .../types/tools/ozone/communication/defs.ts   |   24 +-
 .../ozone/communication/deleteTemplate.ts     |    9 +-
 .../ozone/communication/listTemplates.ts      |   11 +-
 .../ozone/communication/updateTemplate.ts     |   11 +-
 .../types/tools/ozone/moderation/defs.ts      |  765 ++++-----
 .../types/tools/ozone/moderation/emitEvent.ts |   59 +-
 .../types/tools/ozone/moderation/getEvent.ts  |   10 +-
 .../types/tools/ozone/moderation/getRecord.ts |   10 +-
 .../tools/ozone/moderation/getRecords.ts      |   17 +-
 .../types/tools/ozone/moderation/getRepo.ts   |   10 +-
 .../types/tools/ozone/moderation/getRepos.ts  |   17 +-
 .../tools/ozone/moderation/queryEvents.ts     |   11 +-
 .../tools/ozone/moderation/queryStatuses.ts   |   11 +-
 .../tools/ozone/moderation/searchRepos.ts     |   11 +-
 .../types/tools/ozone/server/getConfig.ts     |   41 +-
 .../types/tools/ozone/set/addValues.ts        |    9 +-
 .../src/lexicon/types/tools/ozone/set/defs.ts |   38 +-
 .../types/tools/ozone/set/deleteSet.ts        |   13 +-
 .../types/tools/ozone/set/deleteValues.ts     |    9 +-
 .../types/tools/ozone/set/getValues.ts        |   11 +-
 .../types/tools/ozone/set/querySets.ts        |   11 +-
 .../types/tools/ozone/set/upsertSet.ts        |   10 +-
 .../lexicon/types/tools/ozone/setting/defs.ts |   26 +-
 .../types/tools/ozone/setting/listOptions.ts  |   11 +-
 .../tools/ozone/setting/removeOptions.ts      |   13 +-
 .../types/tools/ozone/setting/upsertOption.ts |   14 +-
 .../types/tools/ozone/signature/defs.ts       |   24 +-
 .../tools/ozone/signature/findCorrelation.ts  |   11 +-
 .../ozone/signature/findRelatedAccounts.ts    |   32 +-
 .../tools/ozone/signature/searchAccounts.ts   |   11 +-
 .../types/tools/ozone/team/addMember.ts       |   11 +-
 .../lexicon/types/tools/ozone/team/defs.ts    |   32 +-
 .../types/tools/ozone/team/deleteMember.ts    |    9 +-
 .../types/tools/ozone/team/listMembers.ts     |   11 +-
 .../types/tools/ozone/team/updateMember.ts    |   11 +-
 packages/ozone/src/lexicon/util.ts            |   83 +-
 packages/ozone/src/mod-service/index.ts       |   16 +-
 packages/ozone/src/mod-service/subject.ts     |   54 +-
 packages/ozone/src/mod-service/types.ts       |   17 +-
 packages/ozone/src/mod-service/util.ts        |    4 +-
 packages/ozone/src/mod-service/views.ts       |  262 +--
 .../ozone/src/tag-service/embed-tagger.ts     |   10 +-
 .../ozone/src/tag-service/language-tagger.ts  |   21 +-
 .../moderation-events.test.ts.snap            |    2 +-
 packages/ozone/tests/_util.ts                 |   58 +-
 packages/ozone/tests/blob-divert.test.ts      |    8 +-
 .../ozone/tests/moderation-appeals.test.ts    |    1 +
 .../ozone/tests/moderation-events.test.ts     |   29 +-
 .../tests/moderation-status-tags.test.ts      |   13 +-
 .../ozone/tests/moderation-statuses.test.ts   |   34 +-
 packages/ozone/tests/moderation.test.ts       |   25 +-
 packages/ozone/tests/protected-tags.test.ts   |    1 +
 .../tests/record-and-account-events.test.ts   |   53 +-
 packages/ozone/tests/takedown.test.ts         |   14 +-
 packages/pds/jest.config.js                   |    1 +
 packages/pds/src/actor-store/record/reader.ts |    4 +-
 .../src/api/app/bsky/feed/getActorLikes.ts    |    2 +-
 .../src/api/app/bsky/feed/getPostThread.ts    |   11 +-
 .../com/atproto/identity/signPlcOperation.ts  |   12 +-
 .../api/com/atproto/identity/updateHandle.ts  |    1 +
 .../pds/src/api/com/atproto/repo/putRecord.ts |    2 +-
 packages/pds/src/lexicon/index.ts             |  372 ++---
 packages/pds/src/lexicon/lexicons.ts          |   41 +-
 .../src/lexicon/types/app/bsky/actor/defs.ts  |  468 +++---
 .../types/app/bsky/actor/getPreferences.ts    |   11 +-
 .../types/app/bsky/actor/getProfile.ts        |   10 +-
 .../types/app/bsky/actor/getProfiles.ts       |   11 +-
 .../types/app/bsky/actor/getSuggestions.ts    |   11 +-
 .../lexicon/types/app/bsky/actor/profile.ts   |   32 +-
 .../types/app/bsky/actor/putPreferences.ts    |   11 +-
 .../types/app/bsky/actor/searchActors.ts      |   11 +-
 .../app/bsky/actor/searchActorsTypeahead.ts   |   11 +-
 .../src/lexicon/types/app/bsky/embed/defs.ts  |   24 +-
 .../lexicon/types/app/bsky/embed/external.ts  |   73 +-
 .../lexicon/types/app/bsky/embed/images.ts    |   71 +-
 .../lexicon/types/app/bsky/embed/record.ts    |  155 +-
 .../types/app/bsky/embed/recordWithMedia.ts   |   65 +-
 .../src/lexicon/types/app/bsky/embed/video.ts |   57 +-
 .../src/lexicon/types/app/bsky/feed/defs.ts   |  395 ++---
 .../app/bsky/feed/describeFeedGenerator.ts    |   41 +-
 .../lexicon/types/app/bsky/feed/generator.ts  |   32 +-
 .../types/app/bsky/feed/getActorFeeds.ts      |   11 +-
 .../types/app/bsky/feed/getActorLikes.ts      |   11 +-
 .../types/app/bsky/feed/getAuthorFeed.ts      |   11 +-
 .../lexicon/types/app/bsky/feed/getFeed.ts    |   11 +-
 .../types/app/bsky/feed/getFeedGenerator.ts   |   11 +-
 .../types/app/bsky/feed/getFeedGenerators.ts  |   11 +-
 .../types/app/bsky/feed/getFeedSkeleton.ts    |   11 +-
 .../lexicon/types/app/bsky/feed/getLikes.ts   |   25 +-
 .../types/app/bsky/feed/getListFeed.ts        |   11 +-
 .../types/app/bsky/feed/getPostThread.ts      |   19 +-
 .../lexicon/types/app/bsky/feed/getPosts.ts   |   11 +-
 .../lexicon/types/app/bsky/feed/getQuotes.ts  |   11 +-
 .../types/app/bsky/feed/getRepostedBy.ts      |   11 +-
 .../types/app/bsky/feed/getSuggestedFeeds.ts  |   11 +-
 .../types/app/bsky/feed/getTimeline.ts        |   11 +-
 .../src/lexicon/types/app/bsky/feed/like.ts   |   25 +-
 .../src/lexicon/types/app/bsky/feed/post.ts   |   99 +-
 .../lexicon/types/app/bsky/feed/postgate.ts   |   42 +-
 .../src/lexicon/types/app/bsky/feed/repost.ts |   26 +-
 .../types/app/bsky/feed/searchPosts.ts        |   11 +-
 .../types/app/bsky/feed/sendInteractions.ts   |   15 +-
 .../lexicon/types/app/bsky/feed/threadgate.ts |   98 +-
 .../src/lexicon/types/app/bsky/graph/block.ts |   24 +-
 .../src/lexicon/types/app/bsky/graph/defs.ts  |  154 +-
 .../lexicon/types/app/bsky/graph/follow.ts    |   24 +-
 .../app/bsky/graph/getActorStarterPacks.ts    |   11 +-
 .../lexicon/types/app/bsky/graph/getBlocks.ts |   11 +-
 .../types/app/bsky/graph/getFollowers.ts      |   11 +-
 .../types/app/bsky/graph/getFollows.ts        |   11 +-
 .../types/app/bsky/graph/getKnownFollowers.ts |   11 +-
 .../lexicon/types/app/bsky/graph/getList.ts   |   11 +-
 .../types/app/bsky/graph/getListBlocks.ts     |   11 +-
 .../types/app/bsky/graph/getListMutes.ts      |   11 +-
 .../lexicon/types/app/bsky/graph/getLists.ts  |   11 +-
 .../lexicon/types/app/bsky/graph/getMutes.ts  |   11 +-
 .../types/app/bsky/graph/getRelationships.ts  |   17 +-
 .../types/app/bsky/graph/getStarterPack.ts    |   11 +-
 .../types/app/bsky/graph/getStarterPacks.ts   |   11 +-
 .../bsky/graph/getSuggestedFollowsByActor.ts  |   11 +-
 .../src/lexicon/types/app/bsky/graph/list.ts  |   34 +-
 .../lexicon/types/app/bsky/graph/listblock.ts |   24 +-
 .../lexicon/types/app/bsky/graph/listitem.ts  |   24 +-
 .../lexicon/types/app/bsky/graph/muteActor.ts |    9 +-
 .../types/app/bsky/graph/muteActorList.ts     |    9 +-
 .../types/app/bsky/graph/muteThread.ts        |    9 +-
 .../app/bsky/graph/searchStarterPacks.ts      |   11 +-
 .../types/app/bsky/graph/starterpack.ts       |   42 +-
 .../types/app/bsky/graph/unmuteActor.ts       |    9 +-
 .../types/app/bsky/graph/unmuteActorList.ts   |    9 +-
 .../types/app/bsky/graph/unmuteThread.ts      |    9 +-
 .../lexicon/types/app/bsky/labeler/defs.ts    |   76 +-
 .../types/app/bsky/labeler/getServices.ts     |   17 +-
 .../lexicon/types/app/bsky/labeler/service.ts |   32 +-
 .../app/bsky/notification/getUnreadCount.ts   |    9 +-
 .../bsky/notification/listNotifications.ts    |   34 +-
 .../app/bsky/notification/putPreferences.ts   |    9 +-
 .../app/bsky/notification/registerPush.ts     |    9 +-
 .../types/app/bsky/notification/updateSeen.ts |    9 +-
 .../lexicon/types/app/bsky/richtext/facet.ts  |   89 +-
 .../lexicon/types/app/bsky/unspecced/defs.ts  |   79 +-
 .../types/app/bsky/unspecced/getConfig.ts     |    9 +-
 .../unspecced/getPopularFeedGenerators.ts     |   11 +-
 .../bsky/unspecced/getSuggestionsSkeleton.ts  |   11 +-
 .../bsky/unspecced/getTaggedSuggestions.ts    |   28 +-
 .../app/bsky/unspecced/getTrendingTopics.ts   |   11 +-
 .../bsky/unspecced/searchActorsSkeleton.ts    |   11 +-
 .../app/bsky/unspecced/searchPostsSkeleton.ts |   11 +-
 .../unspecced/searchStarterPacksSkeleton.ts   |   11 +-
 .../src/lexicon/types/app/bsky/video/defs.ts  |   24 +-
 .../types/app/bsky/video/getJobStatus.ts      |   11 +-
 .../types/app/bsky/video/getUploadLimits.ts   |    9 +-
 .../types/app/bsky/video/uploadVideo.ts       |   13 +-
 .../types/chat/bsky/actor/declaration.ts      |   24 +-
 .../src/lexicon/types/chat/bsky/actor/defs.ts |   28 +-
 .../types/chat/bsky/actor/deleteAccount.ts    |   12 +-
 .../chat/bsky/actor/exportAccountData.ts      |   10 +-
 .../src/lexicon/types/chat/bsky/convo/defs.ts |  194 +--
 .../chat/bsky/convo/deleteMessageForSelf.ts   |   11 +-
 .../lexicon/types/chat/bsky/convo/getConvo.ts |   11 +-
 .../chat/bsky/convo/getConvoForMembers.ts     |   11 +-
 .../lexicon/types/chat/bsky/convo/getLog.ts   |   21 +-
 .../types/chat/bsky/convo/getMessages.ts      |   17 +-
 .../types/chat/bsky/convo/leaveConvo.ts       |   10 +-
 .../types/chat/bsky/convo/listConvos.ts       |   11 +-
 .../types/chat/bsky/convo/muteConvo.ts        |   12 +-
 .../types/chat/bsky/convo/sendMessage.ts      |   11 +-
 .../types/chat/bsky/convo/sendMessageBatch.ts |   28 +-
 .../types/chat/bsky/convo/unmuteConvo.ts      |   12 +-
 .../types/chat/bsky/convo/updateRead.ts       |   12 +-
 .../chat/bsky/moderation/getActorMetadata.ts  |   25 +-
 .../chat/bsky/moderation/getMessageContext.ts |   17 +-
 .../chat/bsky/moderation/updateActorAccess.ts |    9 +-
 .../lexicon/types/com/atproto/admin/defs.ts   |   92 +-
 .../types/com/atproto/admin/deleteAccount.ts  |    9 +-
 .../atproto/admin/disableAccountInvites.ts    |    9 +-
 .../com/atproto/admin/disableInviteCodes.ts   |    9 +-
 .../com/atproto/admin/enableAccountInvites.ts |    9 +-
 .../types/com/atproto/admin/getAccountInfo.ts |   10 +-
 .../com/atproto/admin/getAccountInfos.ts      |   11 +-
 .../types/com/atproto/admin/getInviteCodes.ts |   11 +-
 .../com/atproto/admin/getSubjectStatus.ts     |   21 +-
 .../types/com/atproto/admin/searchAccounts.ts |   11 +-
 .../types/com/atproto/admin/sendEmail.ts      |   10 +-
 .../com/atproto/admin/updateAccountEmail.ts   |    9 +-
 .../com/atproto/admin/updateAccountHandle.ts  |    9 +-
 .../atproto/admin/updateAccountPassword.ts    |    9 +-
 .../com/atproto/admin/updateSubjectStatus.ts  |   30 +-
 .../identity/getRecommendedDidCredentials.ts  |   13 +-
 .../identity/requestPlcOperationSignature.ts  |    8 +-
 .../com/atproto/identity/resolveHandle.ts     |    9 +-
 .../com/atproto/identity/signPlcOperation.ts  |   16 +-
 .../atproto/identity/submitPlcOperation.ts    |   11 +-
 .../com/atproto/identity/updateHandle.ts      |    9 +-
 .../lexicon/types/com/atproto/label/defs.ts   |   95 +-
 .../types/com/atproto/label/queryLabels.ts    |   11 +-
 .../com/atproto/label/subscribeLabels.ts      |   49 +-
 .../types/com/atproto/lexicon/schema.ts       |   24 +-
 .../com/atproto/moderation/createReport.ts    |   28 +-
 .../types/com/atproto/moderation/defs.ts      |   22 +-
 .../types/com/atproto/repo/applyWrites.ts     |  120 +-
 .../types/com/atproto/repo/createRecord.ts    |   14 +-
 .../lexicon/types/com/atproto/repo/defs.ts    |   24 +-
 .../types/com/atproto/repo/deleteRecord.ts    |   12 +-
 .../types/com/atproto/repo/describeRepo.ts    |   11 +-
 .../types/com/atproto/repo/getRecord.ts       |   11 +-
 .../types/com/atproto/repo/importRepo.ts      |   10 +-
 .../com/atproto/repo/listMissingBlobs.ts      |   25 +-
 .../types/com/atproto/repo/listRecords.ts     |   27 +-
 .../types/com/atproto/repo/putRecord.ts       |   14 +-
 .../types/com/atproto/repo/strongRef.ts       |   25 +-
 .../types/com/atproto/repo/uploadBlob.ts      |   11 +-
 .../com/atproto/server/activateAccount.ts     |    8 +-
 .../com/atproto/server/checkAccountStatus.ts  |    9 +-
 .../types/com/atproto/server/confirmEmail.ts  |    9 +-
 .../types/com/atproto/server/createAccount.ts |   14 +-
 .../com/atproto/server/createAppPassword.ts   |   28 +-
 .../com/atproto/server/createInviteCode.ts    |   10 +-
 .../com/atproto/server/createInviteCodes.ts   |   29 +-
 .../types/com/atproto/server/createSession.ts |   12 +-
 .../com/atproto/server/deactivateAccount.ts   |    9 +-
 .../lexicon/types/com/atproto/server/defs.ts  |   40 +-
 .../types/com/atproto/server/deleteAccount.ts |    9 +-
 .../types/com/atproto/server/deleteSession.ts |    8 +-
 .../com/atproto/server/describeServer.ts      |   41 +-
 .../atproto/server/getAccountInviteCodes.ts   |   11 +-
 .../com/atproto/server/getServiceAuth.ts      |    9 +-
 .../types/com/atproto/server/getSession.ts    |   11 +-
 .../com/atproto/server/listAppPasswords.ts    |   25 +-
 .../com/atproto/server/refreshSession.ts      |   11 +-
 .../atproto/server/requestAccountDelete.ts    |    8 +-
 .../server/requestEmailConfirmation.ts        |    8 +-
 .../com/atproto/server/requestEmailUpdate.ts  |    9 +-
 .../atproto/server/requestPasswordReset.ts    |    9 +-
 .../com/atproto/server/reserveSigningKey.ts   |   10 +-
 .../types/com/atproto/server/resetPassword.ts |    9 +-
 .../com/atproto/server/revokeAppPassword.ts   |    9 +-
 .../types/com/atproto/server/updateEmail.ts   |    9 +-
 .../lexicon/types/com/atproto/sync/getBlob.ts |   10 +-
 .../types/com/atproto/sync/getBlocks.ts       |   10 +-
 .../types/com/atproto/sync/getCheckout.ts     |   10 +-
 .../lexicon/types/com/atproto/sync/getHead.ts |    9 +-
 .../types/com/atproto/sync/getLatestCommit.ts |    9 +-
 .../types/com/atproto/sync/getRecord.ts       |   10 +-
 .../lexicon/types/com/atproto/sync/getRepo.ts |   10 +-
 .../types/com/atproto/sync/getRepoStatus.ts   |    9 +-
 .../types/com/atproto/sync/listBlobs.ts       |    9 +-
 .../types/com/atproto/sync/listRepos.ts       |   25 +-
 .../types/com/atproto/sync/notifyOfUpdate.ts  |    9 +-
 .../types/com/atproto/sync/requestCrawl.ts    |    9 +-
 .../types/com/atproto/sync/subscribeRepos.ts  |  154 +-
 .../com/atproto/temp/addReservedHandle.ts     |   13 +-
 .../com/atproto/temp/checkSignupQueue.ts      |    9 +-
 .../types/com/atproto/temp/fetchLabels.ts     |   11 +-
 .../atproto/temp/requestPhoneVerification.ts  |    9 +-
 .../ozone/communication/createTemplate.ts     |   11 +-
 .../types/tools/ozone/communication/defs.ts   |   24 +-
 .../ozone/communication/deleteTemplate.ts     |    9 +-
 .../ozone/communication/listTemplates.ts      |   11 +-
 .../ozone/communication/updateTemplate.ts     |   11 +-
 .../types/tools/ozone/moderation/defs.ts      |  765 ++++-----
 .../types/tools/ozone/moderation/emitEvent.ts |   59 +-
 .../types/tools/ozone/moderation/getEvent.ts  |   10 +-
 .../types/tools/ozone/moderation/getRecord.ts |   10 +-
 .../tools/ozone/moderation/getRecords.ts      |   17 +-
 .../types/tools/ozone/moderation/getRepo.ts   |   10 +-
 .../types/tools/ozone/moderation/getRepos.ts  |   17 +-
 .../tools/ozone/moderation/queryEvents.ts     |   11 +-
 .../tools/ozone/moderation/queryStatuses.ts   |   11 +-
 .../tools/ozone/moderation/searchRepos.ts     |   11 +-
 .../types/tools/ozone/server/getConfig.ts     |   41 +-
 .../types/tools/ozone/set/addValues.ts        |    9 +-
 .../src/lexicon/types/tools/ozone/set/defs.ts |   38 +-
 .../types/tools/ozone/set/deleteSet.ts        |   13 +-
 .../types/tools/ozone/set/deleteValues.ts     |    9 +-
 .../types/tools/ozone/set/getValues.ts        |   11 +-
 .../types/tools/ozone/set/querySets.ts        |   11 +-
 .../types/tools/ozone/set/upsertSet.ts        |   10 +-
 .../lexicon/types/tools/ozone/setting/defs.ts |   26 +-
 .../types/tools/ozone/setting/listOptions.ts  |   11 +-
 .../tools/ozone/setting/removeOptions.ts      |   13 +-
 .../types/tools/ozone/setting/upsertOption.ts |   14 +-
 .../types/tools/ozone/signature/defs.ts       |   24 +-
 .../tools/ozone/signature/findCorrelation.ts  |   11 +-
 .../ozone/signature/findRelatedAccounts.ts    |   32 +-
 .../tools/ozone/signature/searchAccounts.ts   |   11 +-
 .../types/tools/ozone/team/addMember.ts       |   11 +-
 .../lexicon/types/tools/ozone/team/defs.ts    |   32 +-
 .../types/tools/ozone/team/deleteMember.ts    |    9 +-
 .../types/tools/ozone/team/listMembers.ts     |   11 +-
 .../types/tools/ozone/team/updateMember.ts    |   11 +-
 packages/pds/src/lexicon/util.ts              |   83 +-
 packages/pds/src/pipethrough.ts               |    4 +-
 packages/pds/src/read-after-write/viewer.ts   |   37 +-
 packages/pds/src/repo/prepare.ts              |   46 +-
 packages/pds/tests/_util.ts                   |   11 +-
 packages/pds/tests/app-passwords.test.ts      |    8 +-
 packages/pds/tests/create-post.test.ts        |    5 +-
 packages/pds/tests/crud.test.ts               |    9 +-
 packages/pds/tests/file-uploads.test.ts       |    2 +
 packages/pds/tests/moderation.test.ts         |   21 +-
 packages/pds/tests/moderator-auth.test.ts     |    7 +-
 packages/pds/tests/preferences.test.ts        |    2 +
 .../proxied/__snapshots__/admin.test.ts.snap  |    2 +-
 packages/pds/tests/proxied/admin.test.ts      |    6 +
 .../tests/proxied/read-after-write.test.ts    |   45 +-
 packages/pds/tests/seeds/basic.ts             |    2 +-
 packages/repo/jest.config.js                  |    1 +
 packages/sync/jest.config.js                  |    1 +
 packages/syntax/jest.config.js                |    1 +
 packages/syntax/src/tid.ts                    |   20 +-
 packages/xrpc-server/jest.config.js           |    1 +
 tsconfig/browser.json                         |    2 +-
 tsconfig/isomorphic.json                      |    2 +-
 tsconfig/node.json                            |    2 +-
 tsconfig/nodenext.json                        |    4 +-
 tsconfig/tests.json                           |    2 +-
 1014 files changed, 17461 insertions(+), 14622 deletions(-)
 create mode 100644 .changeset/beige-trees-float.md
 create mode 100644 .changeset/brown-flies-stare.md
 create mode 100644 .changeset/fast-points-walk.md
 create mode 100644 .changeset/fast-waves-jog.md
 create mode 100644 .changeset/green-cherries-shave.md
 create mode 100644 .changeset/green-forks-lie.md
 create mode 100644 .changeset/late-worms-travel.md
 create mode 100644 .changeset/popular-shirts-rescue.md
 create mode 100644 .changeset/shiny-suns-walk.md
 create mode 100644 .changeset/silly-starfishes-pay.md
 create mode 100644 .changeset/spotty-bottles-march.md
 create mode 100644 .changeset/tiny-carpets-impress.md
 create mode 100644 packages/api/src/predicate.ts

diff --git a/.changeset/beige-trees-float.md b/.changeset/beige-trees-float.md
new file mode 100644
index 00000000000..06b11c8fd2d
--- /dev/null
+++ b/.changeset/beige-trees-float.md
@@ -0,0 +1,5 @@
+---
+"@atproto/api": patch
+---
+
+Fixes a bug that would clear interests prefs when updating hidden posts
diff --git a/.changeset/brown-flies-stare.md b/.changeset/brown-flies-stare.md
new file mode 100644
index 00000000000..e31e8c5f2f4
--- /dev/null
+++ b/.changeset/brown-flies-stare.md
@@ -0,0 +1,10 @@
+---
+"@atproto/ozone": patch
+"@atproto/bsky": patch
+"@atproto/api": minor
+"@atproto/pds": patch
+---
+
+Update Lexicon derived code to better reflect data typings. In particular, Lexicon derived interfaces will now explicitly include the `$type` property that can be present in the data.
+
+
diff --git a/.changeset/fast-points-walk.md b/.changeset/fast-points-walk.md
new file mode 100644
index 00000000000..697405d5178
--- /dev/null
+++ b/.changeset/fast-points-walk.md
@@ -0,0 +1,5 @@
+---
+"@atproto/syntax": patch
+---
+
+Improve performance of isValidTid
diff --git a/.changeset/fast-waves-jog.md b/.changeset/fast-waves-jog.md
new file mode 100644
index 00000000000..17daee73935
--- /dev/null
+++ b/.changeset/fast-waves-jog.md
@@ -0,0 +1,5 @@
+---
+"@atproto/lex-cli": minor
+---
+
+Update the code generation to better reflect the data typings. In particular this change will cause generated code to explicit the `$type` property that can be present in the data.
diff --git a/.changeset/green-cherries-shave.md b/.changeset/green-cherries-shave.md
new file mode 100644
index 00000000000..13326d6d967
--- /dev/null
+++ b/.changeset/green-cherries-shave.md
@@ -0,0 +1,5 @@
+---
+"@atproto/pds": patch
+---
+
+Minor typing fixes
diff --git a/.changeset/green-forks-lie.md b/.changeset/green-forks-lie.md
new file mode 100644
index 00000000000..d00a1e5b694
--- /dev/null
+++ b/.changeset/green-forks-lie.md
@@ -0,0 +1,5 @@
+---
+"@atproto/api": minor
+---
+
+Helper functions (e.g. `NS.isRecord`) no longer casts the output value. Use `asPredicate(NS.validateRecord)` to create a predicate function that will ensure that an unknown value is indeed an `NS.Record`. The `isX` helper function's purpose is to discriminate between `$type`d values from unions.
diff --git a/.changeset/late-worms-travel.md b/.changeset/late-worms-travel.md
new file mode 100644
index 00000000000..68f63285d98
--- /dev/null
+++ b/.changeset/late-worms-travel.md
@@ -0,0 +1,5 @@
+---
+"@atproto/lex-cli": patch
+---
+
+Add `.js` file extension to `import` statements in generated code.
diff --git a/.changeset/popular-shirts-rescue.md b/.changeset/popular-shirts-rescue.md
new file mode 100644
index 00000000000..3e7b8ed68bb
--- /dev/null
+++ b/.changeset/popular-shirts-rescue.md
@@ -0,0 +1,5 @@
+---
+"@atproto/lexicon": patch
+---
+
+Various performance improvements
diff --git a/.changeset/shiny-suns-walk.md b/.changeset/shiny-suns-walk.md
new file mode 100644
index 00000000000..65068e336df
--- /dev/null
+++ b/.changeset/shiny-suns-walk.md
@@ -0,0 +1,5 @@
+---
+"@atproto/lex-cli": patch
+---
+
+Type the generated `ids` object (that contains all the lexicon namespace ids) as `const`.
diff --git a/.changeset/silly-starfishes-pay.md b/.changeset/silly-starfishes-pay.md
new file mode 100644
index 00000000000..af95fb425c4
--- /dev/null
+++ b/.changeset/silly-starfishes-pay.md
@@ -0,0 +1,5 @@
+---
+"@atproto/lexicon": patch
+---
+
+Fully type `ValidationResult`'s `value` property, allowing `NS.validateMyType` helper functions to return a typed value in case of success.
diff --git a/.changeset/spotty-bottles-march.md b/.changeset/spotty-bottles-march.md
new file mode 100644
index 00000000000..9dfc33703aa
--- /dev/null
+++ b/.changeset/spotty-bottles-march.md
@@ -0,0 +1,5 @@
+---
+"@atproto/lex-cli": minor
+---
+
+Remove `[string]: unknown` index signature from custom user objects, input and output schemas.
diff --git a/.changeset/tiny-carpets-impress.md b/.changeset/tiny-carpets-impress.md
new file mode 100644
index 00000000000..8d7699990dc
--- /dev/null
+++ b/.changeset/tiny-carpets-impress.md
@@ -0,0 +1,5 @@
+---
+"@atproto/lex-cli": patch
+---
+
+Ensures that empty `schemas` arrays are typed as `LexiconDoc[]`.
diff --git a/.prettierignore b/.prettierignore
index 681b5d03670..e6453c5dfbb 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -6,3 +6,9 @@ pnpm-lock.yaml
 .pnpm*
 .changeset
 CHANGELOG.md
+
+# Prettier is used to format the code during codegen
+packages/api/src/client
+packages/bsky/src/lexicon
+packages/pds/src/lexicon
+packages/ozone/src/lexicon
diff --git a/packages/api/jest.config.js b/packages/api/jest.config.js
index 1c938059f3e..d6611c66952 100644
--- a/packages/api/jest.config.js
+++ b/packages/api/jest.config.js
@@ -5,4 +5,5 @@ module.exports = {
   testTimeout: 60000,
   setupFiles: ['<rootDir>/../../jest.setup.ts'],
   setupFilesAfterEnv: ['<rootDir>/jest.setup.ts'],
+  moduleNameMapper: { '^(\\.\\.?\\/.+)\\.js$': ['$1.ts', '$1.js'] },
 }
diff --git a/packages/api/src/agent.ts b/packages/api/src/agent.ts
index ec4cda02fb4..769c6be0127 100644
--- a/packages/api/src/agent.ts
+++ b/packages/api/src/agent.ts
@@ -1,5 +1,5 @@
 import AwaitLock from 'await-lock'
-import { TID } from '@atproto/common-web'
+import { TID, retry } from '@atproto/common-web'
 import { AtUri, ensureValidDid } from '@atproto/syntax'
 import { FetchHandler, XrpcClient, buildFetchHandler } from '@atproto/xrpc'
 import {
@@ -15,6 +15,7 @@ import {
 } from './client/index'
 import { schemas } from './client/lexicons'
 import { MutedWord, Nux } from './client/types/app/bsky/actor/defs'
+import { $Typed, Un$Typed } from './client/util'
 import { BSKY_LABELER_DID } from './const'
 import { interpretLabelValueDefinitions } from './moderation'
 import { DEFAULT_LABEL_SETTINGS } from './moderation/const/labels'
@@ -23,6 +24,7 @@ import {
   LabelPreference,
   ModerationPrefs,
 } from './moderation/types'
+import * as predicate from './predicate'
 import { SessionManager } from './session-manager'
 import {
   AtpAgentGlobalOpts,
@@ -56,15 +58,6 @@ const THREAD_VIEW_PREF_DEFAULTS = {
   prioritizeFollowedUsers: true,
 }
 
-declare global {
-  interface Array<T> {
-    findLast(
-      predicate: (value: T, index: number, obj: T[]) => unknown,
-      thisArg?: any,
-    ): T
-  }
-}
-
 export type { FetchHandler }
 
 /**
@@ -447,59 +440,56 @@ export class Agent extends XrpcClient {
     })
   }
 
+  /**
+   * @note: Using this method will reset the whole profile record if it
+   * previously contained invalid values (wrt to the profile lexicon).
+   */
   async upsertProfile(
     updateFn: (
       existing: AppBskyActorProfile.Record | undefined,
-    ) => AppBskyActorProfile.Record | Promise<AppBskyActorProfile.Record>,
-  ) {
-    const repo = this.accountDid
+    ) =>
+      | Un$Typed<AppBskyActorProfile.Record>
+      | Promise<Un$Typed<AppBskyActorProfile.Record>>,
+  ): Promise<void> {
+    const upsert = async () => {
+      const repo = this.assertDid
+      const collection = 'app.bsky.actor.profile'
 
-    let retriesRemaining = 5
-    while (retriesRemaining >= 0) {
-      // fetch existing
       const existing = await this.com.atproto.repo
-        .getRecord({
-          repo,
-          collection: 'app.bsky.actor.profile',
-          rkey: 'self',
-        })
+        .getRecord({ repo, collection, rkey: 'self' })
         .catch((_) => undefined)
 
+      const existingRecord: AppBskyActorProfile.Record | undefined =
+        existing && predicate.isValidProfile(existing.data.value)
+          ? existing.data.value
+          : undefined
+
       // run the update
-      const updated = await updateFn(existing?.data.value)
-      if (updated) {
-        updated.$type = 'app.bsky.actor.profile'
-      }
+      const updated = await updateFn(existingRecord)
+
+      // validate the value returned by the update function
+      const validation = AppBskyActorProfile.validateRecord({
+        $type: collection,
+        ...updated,
+      })
 
-      // validate the record
-      const validation = AppBskyActorProfile.validateRecord(updated)
       if (!validation.success) {
         throw validation.error
       }
 
-      try {
-        // attempt the put
-        await this.com.atproto.repo.putRecord({
-          repo,
-          collection: 'app.bsky.actor.profile',
-          rkey: 'self',
-          record: updated,
-          swapRecord: existing?.data.cid || null,
-        })
-      } catch (e: unknown) {
-        if (
-          retriesRemaining > 0 &&
-          e instanceof ComAtprotoRepoPutRecord.InvalidSwapError
-        ) {
-          // try again
-          retriesRemaining--
-          continue
-        } else {
-          throw e
-        }
-      }
-      break
+      await this.com.atproto.repo.putRecord({
+        repo,
+        collection,
+        rkey: 'self',
+        record: validation.value,
+        swapRecord: existing?.data.cid || null,
+      })
     }
+
+    return retry(upsert, {
+      maxRetries: 5,
+      retryable: (e) => e instanceof ComAtprotoRepoPutRecord.InvalidSwapError,
+    })
   }
 
   async mute(actor: string) {
@@ -591,23 +581,14 @@ export class Agent extends XrpcClient {
     const res = await this.app.bsky.actor.getPreferences({})
     const labelPrefs: AppBskyActorDefs.ContentLabelPref[] = []
     for (const pref of res.data.preferences) {
-      if (
-        AppBskyActorDefs.isAdultContentPref(pref) &&
-        AppBskyActorDefs.validateAdultContentPref(pref).success
-      ) {
+      if (predicate.isValidAdultContentPref(pref)) {
         // adult content preferences
         prefs.moderationPrefs.adultContentEnabled = pref.enabled
-      } else if (
-        AppBskyActorDefs.isContentLabelPref(pref) &&
-        AppBskyActorDefs.validateContentLabelPref(pref).success
-      ) {
+      } else if (predicate.isValidContentLabelPref(pref)) {
         // content label preference
         const adjustedPref = adjustLegacyContentLabelPref(pref)
         labelPrefs.push(adjustedPref)
-      } else if (
-        AppBskyActorDefs.isLabelersPref(pref) &&
-        AppBskyActorDefs.validateLabelersPref(pref).success
-      ) {
+      } else if (predicate.isValidLabelersPref(pref)) {
         // labelers preferences
         prefs.moderationPrefs.labelers = this.appLabelers
           .map((did: string) => ({ did, labels: {} }))
@@ -617,56 +598,30 @@ export class Agent extends XrpcClient {
               labels: {},
             })),
           )
-      } else if (
-        AppBskyActorDefs.isSavedFeedsPrefV2(pref) &&
-        AppBskyActorDefs.validateSavedFeedsPrefV2(pref).success
-      ) {
+      } else if (predicate.isValidSavedFeedsPrefV2(pref)) {
         prefs.savedFeeds = pref.items
-      } else if (
-        AppBskyActorDefs.isSavedFeedsPref(pref) &&
-        AppBskyActorDefs.validateSavedFeedsPref(pref).success
-      ) {
+      } else if (predicate.isValidSavedFeedsPref(pref)) {
         // saved and pinned feeds
         prefs.feeds.saved = pref.saved
         prefs.feeds.pinned = pref.pinned
-      } else if (
-        AppBskyActorDefs.isPersonalDetailsPref(pref) &&
-        AppBskyActorDefs.validatePersonalDetailsPref(pref).success
-      ) {
+      } else if (predicate.isValidPersonalDetailsPref(pref)) {
         // birth date (irl)
         if (pref.birthDate) {
           prefs.birthDate = new Date(pref.birthDate)
         }
-      } else if (
-        AppBskyActorDefs.isFeedViewPref(pref) &&
-        AppBskyActorDefs.validateFeedViewPref(pref).success
-      ) {
+      } else if (predicate.isValidFeedViewPref(pref)) {
         // feed view preferences
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const { $type, feed, ...v } = pref
-        prefs.feedViewPrefs[pref.feed] = { ...FEED_VIEW_PREF_DEFAULTS, ...v }
-      } else if (
-        AppBskyActorDefs.isThreadViewPref(pref) &&
-        AppBskyActorDefs.validateThreadViewPref(pref).success
-      ) {
+        const { $type: _, feed, ...v } = pref
+        prefs.feedViewPrefs[feed] = { ...FEED_VIEW_PREF_DEFAULTS, ...v }
+      } else if (predicate.isValidThreadViewPref(pref)) {
         // thread view preferences
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const { $type, ...v } = pref
+        const { $type: _, ...v } = pref
         prefs.threadViewPrefs = { ...prefs.threadViewPrefs, ...v }
-      } else if (
-        AppBskyActorDefs.isInterestsPref(pref) &&
-        AppBskyActorDefs.validateInterestsPref(pref).success
-      ) {
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const { $type, ...v } = pref
+      } else if (predicate.isValidInterestsPref(pref)) {
+        const { $type: _, ...v } = pref
         prefs.interests = { ...prefs.interests, ...v }
-      } else if (
-        AppBskyActorDefs.isMutedWordsPref(pref) &&
-        AppBskyActorDefs.validateMutedWordsPref(pref).success
-      ) {
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const { $type, ...v } = pref
-        prefs.moderationPrefs.mutedWords = v.items
+      } else if (predicate.isValidMutedWordsPref(pref)) {
+        prefs.moderationPrefs.mutedWords = pref.items
 
         if (prefs.moderationPrefs.mutedWords.length) {
           prefs.moderationPrefs.mutedWords =
@@ -675,26 +630,13 @@ export class Agent extends XrpcClient {
               return word
             })
         }
-      } else if (
-        AppBskyActorDefs.isHiddenPostsPref(pref) &&
-        AppBskyActorDefs.validateHiddenPostsPref(pref).success
-      ) {
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const { $type, ...v } = pref
-        prefs.moderationPrefs.hiddenPosts = v.items
-      } else if (
-        AppBskyActorDefs.isBskyAppStatePref(pref) &&
-        AppBskyActorDefs.validateBskyAppStatePref(pref).success
-      ) {
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const { $type, ...v } = pref
-        prefs.bskyAppState.queuedNudges = v.queuedNudges || []
-        prefs.bskyAppState.activeProgressGuide = v.activeProgressGuide
-        prefs.bskyAppState.nuxs = v.nuxs || []
-      } else if (
-        AppBskyActorDefs.isPostInteractionSettingsPref(pref) &&
-        AppBskyActorDefs.validatePostInteractionSettingsPref(pref).success
-      ) {
+      } else if (predicate.isValidHiddenPostsPref(pref)) {
+        prefs.moderationPrefs.hiddenPosts = pref.items
+      } else if (predicate.isValidBskyAppStatePref(pref)) {
+        prefs.bskyAppState.queuedNudges = pref.queuedNudges || []
+        prefs.bskyAppState.activeProgressGuide = pref.activeProgressGuide
+        prefs.bskyAppState.nuxs = pref.nuxs || []
+      } else if (predicate.isValidPostInteractionSettingsPref(pref)) {
         prefs.postInteractionSettings.threadgateAllowRules =
           pref.threadgateAllowRules
         prefs.postInteractionSettings.postgateEmbeddingRules =
@@ -900,23 +842,19 @@ export class Agent extends XrpcClient {
   }
 
   async setAdultContentEnabled(v: boolean) {
-    await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      let adultContentPref = prefs.findLast(
-        (pref) =>
-          AppBskyActorDefs.isAdultContentPref(pref) &&
-          AppBskyActorDefs.validateAdultContentPref(pref).success,
-      )
-      if (adultContentPref) {
-        adultContentPref.enabled = v
-      } else {
-        adultContentPref = {
-          $type: 'app.bsky.actor.defs#adultContentPref',
-          enabled: v,
-        }
+    await this.updatePreferences((prefs) => {
+      const adultContentPref = prefs.findLast(
+        predicate.isValidAdultContentPref,
+      ) || {
+        $type: 'app.bsky.actor.defs#adultContentPref',
+        enabled: v,
       }
+
+      adultContentPref.enabled = v
+
       return prefs
         .filter((pref) => !AppBskyActorDefs.isAdultContentPref(pref))
-        .concat([adultContentPref])
+        .concat(adultContentPref)
     })
   }
 
@@ -928,27 +866,21 @@ export class Agent extends XrpcClient {
     if (labelerDid) {
       ensureValidDid(labelerDid)
     }
-    await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      let labelPref = prefs.findLast(
-        (pref) =>
-          AppBskyActorDefs.isContentLabelPref(pref) &&
-          AppBskyActorDefs.validateContentLabelPref(pref).success &&
-          pref.label === key &&
-          pref.labelerDid === labelerDid,
-      )
-      let legacyLabelPref: AppBskyActorDefs.ContentLabelPref | undefined
-
-      if (labelPref) {
-        labelPref.visibility = value
-      } else {
-        labelPref = {
-          $type: 'app.bsky.actor.defs#contentLabelPref',
-          label: key,
-          labelerDid,
-          visibility: value,
-        }
+    await this.updatePreferences((prefs) => {
+      const labelPref = prefs
+        .filter(predicate.isValidContentLabelPref)
+        .findLast(
+          (pref) => pref.label === key && pref.labelerDid === labelerDid,
+        ) || {
+        $type: 'app.bsky.actor.defs#contentLabelPref',
+        label: key,
+        labelerDid,
+        visibility: value,
       }
 
+      labelPref.visibility = value
+
+      let legacyLabelPref: $Typed<AppBskyActorDefs.ContentLabelPref> | undefined
       if (AppBskyActorDefs.isContentLabelPref(labelPref)) {
         // is global
         if (!labelPref.labelerDid) {
@@ -956,28 +888,26 @@ export class Agent extends XrpcClient {
             'graphic-media': 'gore',
             porn: 'nsfw',
             sexual: 'suggestive',
+            // Protect against using toString, hasOwnProperty, etc. as a label:
+            __proto__: null,
           }[labelPref.label]
 
           // if it's a legacy label, double-write the legacy label
           if (legacyLabelValue) {
-            legacyLabelPref = prefs.findLast(
-              (pref) =>
-                AppBskyActorDefs.isContentLabelPref(pref) &&
-                AppBskyActorDefs.validateContentLabelPref(pref).success &&
-                pref.label === legacyLabelValue &&
-                pref.labelerDid === undefined,
-            ) as AppBskyActorDefs.ContentLabelPref | undefined
-
-            if (legacyLabelPref) {
-              legacyLabelPref.visibility = value
-            } else {
-              legacyLabelPref = {
-                $type: 'app.bsky.actor.defs#contentLabelPref',
-                label: legacyLabelValue,
-                labelerDid: undefined,
-                visibility: value,
-              }
+            legacyLabelPref = prefs
+              .filter(predicate.isValidContentLabelPref)
+              .findLast(
+                (pref) =>
+                  pref.label === legacyLabelValue &&
+                  pref.labelerDid === undefined,
+              ) || {
+              $type: 'app.bsky.actor.defs#contentLabelPref',
+              label: legacyLabelValue,
+              labelerDid: undefined,
+              visibility: value,
             }
+
+            legacyLabelPref!.visibility = value
           }
         }
       }
@@ -988,7 +918,7 @@ export class Agent extends XrpcClient {
             !AppBskyActorDefs.isContentLabelPref(pref) ||
             !(pref.label === key && pref.labelerDid === labelerDid),
         )
-        .concat([labelPref])
+        .concat(labelPref)
         .filter((pref) => {
           if (!legacyLabelPref) return true
           return (
@@ -1004,63 +934,37 @@ export class Agent extends XrpcClient {
   }
 
   async addLabeler(did: string) {
-    const prefs = await this.updatePreferences(
-      (prefs: AppBskyActorDefs.Preferences) => {
-        let labelersPref = prefs.findLast(
-          (pref) =>
-            AppBskyActorDefs.isLabelersPref(pref) &&
-            AppBskyActorDefs.validateLabelersPref(pref).success,
-        )
-        if (!labelersPref) {
-          labelersPref = {
-            $type: 'app.bsky.actor.defs#labelersPref',
-            labelers: [],
-          }
-        }
-        if (AppBskyActorDefs.isLabelersPref(labelersPref)) {
-          let labelerPrefItem = labelersPref.labelers.find(
-            (labeler) => labeler.did === did,
-          )
-          if (!labelerPrefItem) {
-            labelerPrefItem = {
-              did,
-            }
-            labelersPref.labelers.push(labelerPrefItem)
-          }
-        }
-        return prefs
-          .filter((pref) => !AppBskyActorDefs.isLabelersPref(pref))
-          .concat([labelersPref])
-      },
-    )
+    const prefs = await this.updatePreferences((prefs) => {
+      const labelersPref = prefs.findLast(predicate.isValidLabelersPref) || {
+        $type: 'app.bsky.actor.defs#labelersPref',
+        labelers: [],
+      }
+
+      if (!labelersPref.labelers.some((labeler) => labeler.did === did)) {
+        labelersPref.labelers.push({ did })
+      }
+
+      return prefs
+        .filter((pref) => !AppBskyActorDefs.isLabelersPref(pref))
+        .concat(labelersPref)
+    })
     // automatically configure the client
     this.configureLabelers(prefsArrayToLabelerDids(prefs))
   }
 
   async removeLabeler(did: string) {
-    const prefs = await this.updatePreferences(
-      (prefs: AppBskyActorDefs.Preferences) => {
-        let labelersPref = prefs.findLast(
-          (pref) =>
-            AppBskyActorDefs.isLabelersPref(pref) &&
-            AppBskyActorDefs.validateLabelersPref(pref).success,
-        )
-        if (!labelersPref) {
-          labelersPref = {
-            $type: 'app.bsky.actor.defs#labelersPref',
-            labelers: [],
-          }
-        }
-        if (AppBskyActorDefs.isLabelersPref(labelersPref)) {
-          labelersPref.labelers = labelersPref.labelers.filter(
-            (labeler) => labeler.did !== did,
-          )
-        }
-        return prefs
-          .filter((pref) => !AppBskyActorDefs.isLabelersPref(pref))
-          .concat([labelersPref])
-      },
-    )
+    const prefs = await this.updatePreferences((prefs) => {
+      const labelersPref = prefs.findLast(predicate.isValidLabelersPref) || {
+        $type: 'app.bsky.actor.defs#labelersPref',
+        labelers: [],
+      }
+
+      labelersPref.labelers = labelersPref.labelers.filter((l) => l.did !== did)
+
+      return prefs
+        .filter((pref) => !AppBskyActorDefs.isLabelersPref(pref))
+        .concat(labelersPref)
+    })
     // automatically configure the client
     this.configureLabelers(prefsArrayToLabelerDids(prefs))
   }
@@ -1070,75 +974,64 @@ export class Agent extends XrpcClient {
   }: {
     birthDate: string | Date | undefined
   }) {
-    birthDate = birthDate instanceof Date ? birthDate.toISOString() : birthDate
-    await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      let personalDetailsPref = prefs.findLast(
-        (pref) =>
-          AppBskyActorDefs.isPersonalDetailsPref(pref) &&
-          AppBskyActorDefs.validatePersonalDetailsPref(pref).success,
-      )
-      if (personalDetailsPref) {
-        personalDetailsPref.birthDate = birthDate
-      } else {
-        personalDetailsPref = {
-          $type: 'app.bsky.actor.defs#personalDetailsPref',
-          birthDate,
-        }
+    await this.updatePreferences((prefs) => {
+      const personalDetailsPref = prefs.findLast(
+        predicate.isValidPersonalDetailsPref,
+      ) || {
+        $type: 'app.bsky.actor.defs#personalDetailsPref',
       }
+
+      personalDetailsPref.birthDate =
+        birthDate instanceof Date ? birthDate.toISOString() : birthDate
+
       return prefs
         .filter((pref) => !AppBskyActorDefs.isPersonalDetailsPref(pref))
-        .concat([personalDetailsPref])
+        .concat(personalDetailsPref)
     })
   }
 
   async setFeedViewPrefs(feed: string, pref: Partial<BskyFeedViewPreference>) {
-    await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      const existing = prefs.findLast(
-        (pref) =>
-          AppBskyActorDefs.isFeedViewPref(pref) &&
-          AppBskyActorDefs.validateFeedViewPref(pref).success &&
-          pref.feed === feed,
-      )
-      if (existing) {
-        pref = { ...existing, ...pref }
-      }
+    await this.updatePreferences((prefs) => {
+      const existing = prefs
+        .filter(predicate.isValidFeedViewPref)
+        .findLast((pref) => pref.feed === feed)
+
       return prefs
-        .filter(
-          (p) => !AppBskyActorDefs.isFeedViewPref(pref) || p.feed !== feed,
-        )
-        .concat([{ ...pref, $type: 'app.bsky.actor.defs#feedViewPref', feed }])
+        .filter((p) => !AppBskyActorDefs.isFeedViewPref(p) || p.feed !== feed)
+        .concat({
+          ...existing,
+          ...pref,
+          $type: 'app.bsky.actor.defs#feedViewPref',
+          feed,
+        })
     })
   }
 
   async setThreadViewPrefs(pref: Partial<BskyThreadViewPreference>) {
-    await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      const existing = prefs.findLast(
-        (pref) =>
-          AppBskyActorDefs.isThreadViewPref(pref) &&
-          AppBskyActorDefs.validateThreadViewPref(pref).success,
-      )
-      if (existing) {
-        pref = { ...existing, ...pref }
-      }
+    await this.updatePreferences((prefs) => {
+      const existing = prefs.findLast(predicate.isValidThreadViewPref)
+
       return prefs
         .filter((p) => !AppBskyActorDefs.isThreadViewPref(p))
-        .concat([{ ...pref, $type: 'app.bsky.actor.defs#threadViewPref' }])
+        .concat({
+          ...existing,
+          ...pref,
+          $type: 'app.bsky.actor.defs#threadViewPref',
+        })
     })
   }
 
   async setInterestsPref(pref: Partial<BskyInterestsPreference>) {
-    await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      const existing = prefs.findLast(
-        (pref) =>
-          AppBskyActorDefs.isInterestsPref(pref) &&
-          AppBskyActorDefs.validateInterestsPref(pref).success,
-      )
-      if (existing) {
-        pref = { ...existing, ...pref }
-      }
+    await this.updatePreferences((prefs) => {
+      const existing = prefs.findLast(predicate.isValidInterestsPref)
+
       return prefs
         .filter((p) => !AppBskyActorDefs.isInterestsPref(p))
-        .concat([{ ...pref, $type: 'app.bsky.actor.defs#interestsPref' }])
+        .concat({
+          ...existing,
+          ...pref,
+          $type: 'app.bsky.actor.defs#interestsPref',
+        })
     })
   }
 
@@ -1155,12 +1048,8 @@ export class Agent extends XrpcClient {
 
     if (!sanitizedValue) return
 
-    await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      let mutedWordsPref = prefs.findLast(
-        (pref) =>
-          AppBskyActorDefs.isMutedWordsPref(pref) &&
-          AppBskyActorDefs.validateMutedWordsPref(pref).success,
-      )
+    await this.updatePreferences((prefs) => {
+      let mutedWordsPref = prefs.findLast(predicate.isValidMutedWordsPref)
 
       const newMutedWord: AppBskyActorDefs.MutedWord = {
         id: TID.nextStr(),
@@ -1170,7 +1059,7 @@ export class Agent extends XrpcClient {
         expiresAt: mutedWord.expiresAt || undefined,
       }
 
-      if (mutedWordsPref && AppBskyActorDefs.isMutedWordsPref(mutedWordsPref)) {
+      if (mutedWordsPref) {
         mutedWordsPref.items.push(newMutedWord)
 
         /**
@@ -1182,15 +1071,14 @@ export class Agent extends XrpcClient {
       } else {
         // if the pref doesn't exist, create it
         mutedWordsPref = {
+          $type: 'app.bsky.actor.defs#mutedWordsPref',
           items: [newMutedWord],
         }
       }
 
       return prefs
         .filter((p) => !AppBskyActorDefs.isMutedWordsPref(p))
-        .concat([
-          { ...mutedWordsPref, $type: 'app.bsky.actor.defs#mutedWordsPref' },
-        ])
+        .concat(mutedWordsPref)
     })
   }
 
@@ -1217,14 +1105,10 @@ export class Agent extends XrpcClient {
    * Update a muted word in user preferences.
    */
   async updateMutedWord(mutedWord: AppBskyActorDefs.MutedWord) {
-    await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      const mutedWordsPref = prefs.findLast(
-        (pref) =>
-          AppBskyActorDefs.isMutedWordsPref(pref) &&
-          AppBskyActorDefs.validateMutedWordsPref(pref).success,
-      )
+    await this.updatePreferences((prefs) => {
+      const mutedWordsPref = prefs.findLast(predicate.isValidMutedWordsPref)
 
-      if (mutedWordsPref && AppBskyActorDefs.isMutedWordsPref(mutedWordsPref)) {
+      if (mutedWordsPref) {
         mutedWordsPref.items = mutedWordsPref.items.map((existingItem) => {
           const match = matchMutedWord(existingItem, mutedWord)
 
@@ -1255,9 +1139,7 @@ export class Agent extends XrpcClient {
 
         return prefs
           .filter((p) => !AppBskyActorDefs.isMutedWordsPref(p))
-          .concat([
-            { ...mutedWordsPref, $type: 'app.bsky.actor.defs#mutedWordsPref' },
-          ])
+          .concat(mutedWordsPref)
       }
 
       return prefs
@@ -1268,14 +1150,10 @@ export class Agent extends XrpcClient {
    * Remove a muted word from user preferences.
    */
   async removeMutedWord(mutedWord: AppBskyActorDefs.MutedWord) {
-    await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      const mutedWordsPref = prefs.findLast(
-        (pref) =>
-          AppBskyActorDefs.isMutedWordsPref(pref) &&
-          AppBskyActorDefs.validateMutedWordsPref(pref).success,
-      )
+    await this.updatePreferences((prefs) => {
+      const mutedWordsPref = prefs.findLast(predicate.isValidMutedWordsPref)
 
-      if (mutedWordsPref && AppBskyActorDefs.isMutedWordsPref(mutedWordsPref)) {
+      if (mutedWordsPref) {
         for (let i = 0; i < mutedWordsPref.items.length; i++) {
           const match = matchMutedWord(mutedWordsPref.items[i], mutedWord)
 
@@ -1294,9 +1172,7 @@ export class Agent extends XrpcClient {
 
         return prefs
           .filter((p) => !AppBskyActorDefs.isMutedWordsPref(p))
-          .concat([
-            { ...mutedWordsPref, $type: 'app.bsky.actor.defs#mutedWordsPref' },
-          ])
+          .concat(mutedWordsPref)
       }
 
       return prefs
@@ -1319,83 +1195,54 @@ export class Agent extends XrpcClient {
   }
 
   async bskyAppQueueNudges(nudges: string | string[]) {
-    await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      let bskyAppStatePref: AppBskyActorDefs.BskyAppStatePref = prefs.findLast(
-        (pref) =>
-          AppBskyActorDefs.isBskyAppStatePref(pref) &&
-          AppBskyActorDefs.validateBskyAppStatePref(pref).success,
-      )
+    await this.updatePreferences((prefs) => {
+      const pref = prefs.findLast(predicate.isValidBskyAppStatePref) || {
+        $type: 'app.bsky.actor.defs#bskyAppStatePref',
+      }
 
-      bskyAppStatePref = bskyAppStatePref || {}
-      nudges = Array.isArray(nudges) ? nudges : [nudges]
-      bskyAppStatePref.queuedNudges = (
-        bskyAppStatePref.queuedNudges || []
-      ).concat(nudges)
+      pref.queuedNudges = (pref.queuedNudges || []).concat(nudges)
 
       return prefs
         .filter((p) => !AppBskyActorDefs.isBskyAppStatePref(p))
-        .concat([
-          {
-            ...bskyAppStatePref,
-            $type: 'app.bsky.actor.defs#bskyAppStatePref',
-          },
-        ])
+        .concat(pref)
     })
   }
 
   async bskyAppDismissNudges(nudges: string | string[]) {
-    await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      let bskyAppStatePref: AppBskyActorDefs.BskyAppStatePref = prefs.findLast(
-        (pref) =>
-          AppBskyActorDefs.isBskyAppStatePref(pref) &&
-          AppBskyActorDefs.validateBskyAppStatePref(pref).success,
-      )
+    await this.updatePreferences((prefs) => {
+      const pref = prefs.findLast(predicate.isValidBskyAppStatePref) || {
+        $type: 'app.bsky.actor.defs#bskyAppStatePref',
+      }
 
-      bskyAppStatePref = bskyAppStatePref || {}
       nudges = Array.isArray(nudges) ? nudges : [nudges]
-      bskyAppStatePref.queuedNudges = (
-        bskyAppStatePref.queuedNudges || []
-      ).filter((nudge) => !nudges.includes(nudge))
+      pref.queuedNudges = (pref.queuedNudges || []).filter(
+        (nudge) => !nudges.includes(nudge),
+      )
 
       return prefs
         .filter((p) => !AppBskyActorDefs.isBskyAppStatePref(p))
-        .concat([
-          {
-            ...bskyAppStatePref,
-            $type: 'app.bsky.actor.defs#bskyAppStatePref',
-          },
-        ])
+        .concat(pref)
     })
   }
 
   async bskyAppSetActiveProgressGuide(
     guide: AppBskyActorDefs.BskyAppProgressGuide | undefined,
   ) {
-    if (
-      guide &&
-      !AppBskyActorDefs.validateBskyAppProgressGuide(guide).success
-    ) {
-      throw new Error('Invalid progress guide')
+    if (guide) {
+      const result = AppBskyActorDefs.validateBskyAppProgressGuide(guide)
+      if (!result.success) throw result.error
     }
 
-    await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      let bskyAppStatePref: AppBskyActorDefs.BskyAppStatePref = prefs.findLast(
-        (pref) =>
-          AppBskyActorDefs.isBskyAppStatePref(pref) &&
-          AppBskyActorDefs.validateBskyAppStatePref(pref).success,
-      )
+    await this.updatePreferences((prefs) => {
+      const pref = prefs.findLast(predicate.isValidBskyAppStatePref) || {
+        $type: 'app.bsky.actor.defs#bskyAppStatePref',
+      }
 
-      bskyAppStatePref = bskyAppStatePref || {}
-      bskyAppStatePref.activeProgressGuide = guide
+      pref.activeProgressGuide = guide
 
       return prefs
         .filter((p) => !AppBskyActorDefs.isBskyAppStatePref(p))
-        .concat([
-          {
-            ...bskyAppStatePref,
-            $type: 'app.bsky.actor.defs#bskyAppStatePref',
-          },
-        ])
+        .concat(pref)
     })
   }
 
@@ -1405,17 +1252,14 @@ export class Agent extends XrpcClient {
   async bskyAppUpsertNux(nux: Nux) {
     validateNux(nux)
 
-    await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      let bskyAppStatePref: AppBskyActorDefs.BskyAppStatePref = prefs.findLast(
-        (pref) =>
-          AppBskyActorDefs.isBskyAppStatePref(pref) &&
-          AppBskyActorDefs.validateBskyAppStatePref(pref).success,
-      )
+    await this.updatePreferences((prefs) => {
+      const pref = prefs.findLast(predicate.isValidBskyAppStatePref) || {
+        $type: 'app.bsky.actor.defs#bskyAppStatePref',
+      }
 
-      bskyAppStatePref = bskyAppStatePref || {}
-      bskyAppStatePref.nuxs = bskyAppStatePref.nuxs || []
+      pref.nuxs = pref.nuxs || []
 
-      const existing = bskyAppStatePref.nuxs?.find((n) => {
+      const existing = pref.nuxs?.find((n) => {
         return n.id === nux.id
       })
 
@@ -1433,18 +1277,11 @@ export class Agent extends XrpcClient {
       }
 
       // remove duplicates and append
-      bskyAppStatePref.nuxs = bskyAppStatePref.nuxs
-        .filter((n) => n.id !== nux.id)
-        .concat(next)
+      pref.nuxs = pref.nuxs.filter((n) => n.id !== nux.id).concat(next)
 
       return prefs
         .filter((p) => !AppBskyActorDefs.isBskyAppStatePref(p))
-        .concat([
-          {
-            ...bskyAppStatePref,
-            $type: 'app.bsky.actor.defs#bskyAppStatePref',
-          },
-        ])
+        .concat(pref)
     })
   }
 
@@ -1452,69 +1289,43 @@ export class Agent extends XrpcClient {
    * Removes NUXs from user preferences.
    */
   async bskyAppRemoveNuxs(ids: string[]) {
-    await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      let bskyAppStatePref: AppBskyActorDefs.BskyAppStatePref = prefs.findLast(
-        (pref) =>
-          AppBskyActorDefs.isBskyAppStatePref(pref) &&
-          AppBskyActorDefs.validateBskyAppStatePref(pref).success,
-      )
+    await this.updatePreferences((prefs) => {
+      const pref = prefs.findLast(predicate.isValidBskyAppStatePref) || {
+        $type: 'app.bsky.actor.defs#bskyAppStatePref',
+      }
 
-      bskyAppStatePref = bskyAppStatePref || {}
-      bskyAppStatePref.nuxs = (bskyAppStatePref.nuxs || []).filter((nux) => {
-        return !ids.includes(nux.id)
-      })
+      pref.nuxs = (pref.nuxs || []).filter((nux) => !ids.includes(nux.id))
 
       return prefs
         .filter((p) => !AppBskyActorDefs.isBskyAppStatePref(p))
-        .concat([
-          {
-            ...bskyAppStatePref,
-            $type: 'app.bsky.actor.defs#bskyAppStatePref',
-          },
-        ])
+        .concat(pref)
     })
   }
 
   async setPostInteractionSettings(
     settings: AppBskyActorDefs.PostInteractionSettingsPref,
   ) {
-    if (
-      !AppBskyActorDefs.validatePostInteractionSettingsPref(settings).success
-    ) {
-      throw new Error('Invalid post interaction settings')
-    }
-
-    await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      let prev = prefs.findLast(
-        (pref) =>
-          AppBskyActorDefs.isPostInteractionSettingsPref(pref) &&
-          AppBskyActorDefs.validatePostInteractionSettingsPref(pref).success,
-      ) as AppBskyActorDefs.PostInteractionSettingsPref
-
-      if (!prev) {
-        prev = {
-          /**
-           * Matches handling of `threadgate.allow` where `undefined` means "everyone"
-           */
-          threadgateAllowRules: undefined,
-          postgateEmbeddingRules: undefined,
-        }
+    const result =
+      AppBskyActorDefs.validatePostInteractionSettingsPref(settings)
+    // Fool-proofing (should not be needed because of type safety)
+    if (!result.success) throw result.error
+
+    await this.updatePreferences((prefs) => {
+      const pref = prefs.findLast(
+        predicate.isValidPostInteractionSettingsPref,
+      ) || {
+        $type: 'app.bsky.actor.defs#postInteractionSettingsPref',
       }
 
       /**
        * Matches handling of `threadgate.allow` where `undefined` means "everyone"
        */
-      prev.threadgateAllowRules = settings.threadgateAllowRules
-      prev.postgateEmbeddingRules = settings.postgateEmbeddingRules
+      pref.threadgateAllowRules = settings.threadgateAllowRules
+      pref.postgateEmbeddingRules = settings.postgateEmbeddingRules
 
       return prefs
         .filter((p) => !AppBskyActorDefs.isPostInteractionSettingsPref(p))
-        .concat([
-          {
-            ...prev,
-            $type: 'app.bsky.actor.defs#postInteractionSettingsPref',
-          },
-        ])
+        .concat(pref)
     })
   }
 
@@ -1552,28 +1363,22 @@ export class Agent extends XrpcClient {
   }
 
   private async updateHiddenPost(postUri: string, action: 'hide' | 'unhide') {
-    await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      let pref = prefs.findLast(
-        (pref) =>
-          AppBskyActorDefs.isHiddenPostsPref(pref) &&
-          AppBskyActorDefs.validateHiddenPostsPref(pref).success,
-      )
-      if (pref && AppBskyActorDefs.isHiddenPostsPref(pref)) {
-        pref.items =
-          action === 'hide'
-            ? Array.from(new Set([...pref.items, postUri]))
-            : pref.items.filter((uri) => uri !== postUri)
-      } else {
-        if (action === 'hide') {
-          pref = {
-            $type: 'app.bsky.actor.defs#hiddenPostsPref',
-            items: [postUri],
-          }
-        }
+    await this.updatePreferences((prefs) => {
+      const pref = prefs.findLast(predicate.isValidHiddenPostsPref) || {
+        $type: 'app.bsky.actor.defs#hiddenPostsPref',
+        items: [],
       }
+
+      const hiddenItems = new Set(pref.items)
+
+      if (action === 'hide') hiddenItems.add(postUri)
+      else hiddenItems.delete(postUri)
+
+      pref.items = [...hiddenItems]
+
       return prefs
-        .filter((p) => !AppBskyActorDefs.isInterestsPref(p))
-        .concat([{ ...pref, $type: 'app.bsky.actor.defs#hiddenPostsPref' }])
+        .filter((p) => !AppBskyActorDefs.isHiddenPostsPref(p))
+        .concat(pref)
     })
   }
 
@@ -1587,27 +1392,20 @@ export class Agent extends XrpcClient {
     ) => { saved: string[]; pinned: string[] },
   ): Promise<{ saved: string[]; pinned: string[] }> {
     let res
-    await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      let feedsPref = prefs.findLast(
-        (pref) =>
-          AppBskyActorDefs.isSavedFeedsPref(pref) &&
-          AppBskyActorDefs.validateSavedFeedsPref(pref).success,
-      ) as AppBskyActorDefs.SavedFeedsPref | undefined
-      if (feedsPref) {
-        res = cb(feedsPref.saved, feedsPref.pinned)
-        feedsPref.saved = res.saved
-        feedsPref.pinned = res.pinned
-      } else {
-        res = cb([], [])
-        feedsPref = {
-          $type: 'app.bsky.actor.defs#savedFeedsPref',
-          saved: res.saved,
-          pinned: res.pinned,
-        }
+    await this.updatePreferences((prefs) => {
+      const feedsPref = prefs.findLast(predicate.isValidSavedFeedsPref) || {
+        $type: 'app.bsky.actor.defs#savedFeedsPref',
+        saved: [],
+        pinned: [],
       }
+
+      res = cb(feedsPref.saved, feedsPref.pinned)
+      feedsPref.saved = res.saved
+      feedsPref.pinned = res.pinned
+
       return prefs
         .filter((pref) => !AppBskyActorDefs.isSavedFeedsPref(pref))
-        .concat([feedsPref])
+        .concat(feedsPref)
     })
     return res
   }
@@ -1619,36 +1417,24 @@ export class Agent extends XrpcClient {
   ): Promise<AppBskyActorDefs.SavedFeed[]> {
     let maybeMutatedSavedFeeds: AppBskyActorDefs.SavedFeed[] = []
 
-    await this.updatePreferences((prefs: AppBskyActorDefs.Preferences) => {
-      let existingV2Pref = prefs.findLast(
-        (pref) =>
-          AppBskyActorDefs.isSavedFeedsPrefV2(pref) &&
-          AppBskyActorDefs.validateSavedFeedsPrefV2(pref).success,
-      ) as AppBskyActorDefs.SavedFeedsPrefV2 | undefined
-      let existingV1Pref = prefs.findLast(
-        (pref) =>
-          AppBskyActorDefs.isSavedFeedsPref(pref) &&
-          AppBskyActorDefs.validateSavedFeedsPref(pref).success,
-      ) as AppBskyActorDefs.SavedFeedsPref | undefined
-
-      if (existingV2Pref) {
-        maybeMutatedSavedFeeds = cb(existingV2Pref.items)
-        existingV2Pref = {
-          ...existingV2Pref,
-          items: maybeMutatedSavedFeeds,
-        }
-      } else {
-        maybeMutatedSavedFeeds = cb([])
-        existingV2Pref = {
-          $type: 'app.bsky.actor.defs#savedFeedsPrefV2',
-          items: maybeMutatedSavedFeeds,
-        }
+    await this.updatePreferences((prefs) => {
+      const existingV2Pref = prefs.findLast(
+        predicate.isValidSavedFeedsPrefV2,
+      ) || {
+        $type: 'app.bsky.actor.defs#savedFeedsPrefV2',
+        items: [],
       }
 
-      // enforce ordering, pinned then saved
-      const pinned = existingV2Pref.items.filter((i) => i.pinned)
-      const saved = existingV2Pref.items.filter((i) => !i.pinned)
-      existingV2Pref.items = pinned.concat(saved)
+      const newSavedFeeds = cb(existingV2Pref.items)
+
+      // enforce ordering: pinned first, then saved
+      existingV2Pref.items = [...newSavedFeeds].sort((a, b) =>
+        // @NOTE: preserve order of items with the same pinned status
+        a.pinned === b.pinned ? 0 : a.pinned ? -1 : 1,
+      )
+
+      // Store the return value
+      maybeMutatedSavedFeeds = newSavedFeeds
 
       let updatedPrefs = prefs
         .filter((pref) => !AppBskyActorDefs.isSavedFeedsPrefV2(pref))
@@ -1659,6 +1445,7 @@ export class Agent extends XrpcClient {
        * to v2. During the transition period, we double write v2 prefs back to
        * v1, but NOT the other way around.
        */
+      let existingV1Pref = prefs.findLast(predicate.isValidSavedFeedsPref)
       if (existingV1Pref) {
         const { saved, pinned } = existingV1Pref
         const v2Compat = savedFeedsToUriArrays(
@@ -1730,11 +1517,7 @@ function remapLegacyLabels(
 function prefsArrayToLabelerDids(
   prefs: AppBskyActorDefs.Preferences,
 ): string[] {
-  const labelersPref = prefs.findLast(
-    (pref) =>
-      AppBskyActorDefs.isLabelersPref(pref) &&
-      AppBskyActorDefs.validateLabelersPref(pref).success,
-  )
+  const labelersPref = prefs.findLast(predicate.isValidLabelersPref)
   let dids: string[] = []
   if (labelersPref) {
     dids = (labelersPref as AppBskyActorDefs.LabelersPref).labelers.map(
diff --git a/packages/api/src/client/index.ts b/packages/api/src/client/index.ts
index 5f46b6b277c..691d9cab6cc 100644
--- a/packages/api/src/client/index.ts
+++ b/packages/api/src/client/index.ts
@@ -2,465 +2,466 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { XrpcClient, FetchHandler, FetchHandlerOptions } from '@atproto/xrpc'
-import { schemas } from './lexicons'
+import { schemas } from './lexicons.js'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoAdminDefs from './types/com/atproto/admin/defs'
-import * as ComAtprotoAdminDeleteAccount from './types/com/atproto/admin/deleteAccount'
-import * as ComAtprotoAdminDisableAccountInvites from './types/com/atproto/admin/disableAccountInvites'
-import * as ComAtprotoAdminDisableInviteCodes from './types/com/atproto/admin/disableInviteCodes'
-import * as ComAtprotoAdminEnableAccountInvites from './types/com/atproto/admin/enableAccountInvites'
-import * as ComAtprotoAdminGetAccountInfo from './types/com/atproto/admin/getAccountInfo'
-import * as ComAtprotoAdminGetAccountInfos from './types/com/atproto/admin/getAccountInfos'
-import * as ComAtprotoAdminGetInviteCodes from './types/com/atproto/admin/getInviteCodes'
-import * as ComAtprotoAdminGetSubjectStatus from './types/com/atproto/admin/getSubjectStatus'
-import * as ComAtprotoAdminSearchAccounts from './types/com/atproto/admin/searchAccounts'
-import * as ComAtprotoAdminSendEmail from './types/com/atproto/admin/sendEmail'
-import * as ComAtprotoAdminUpdateAccountEmail from './types/com/atproto/admin/updateAccountEmail'
-import * as ComAtprotoAdminUpdateAccountHandle from './types/com/atproto/admin/updateAccountHandle'
-import * as ComAtprotoAdminUpdateAccountPassword from './types/com/atproto/admin/updateAccountPassword'
-import * as ComAtprotoAdminUpdateSubjectStatus from './types/com/atproto/admin/updateSubjectStatus'
-import * as ComAtprotoIdentityGetRecommendedDidCredentials from './types/com/atproto/identity/getRecommendedDidCredentials'
-import * as ComAtprotoIdentityRequestPlcOperationSignature from './types/com/atproto/identity/requestPlcOperationSignature'
-import * as ComAtprotoIdentityResolveHandle from './types/com/atproto/identity/resolveHandle'
-import * as ComAtprotoIdentitySignPlcOperation from './types/com/atproto/identity/signPlcOperation'
-import * as ComAtprotoIdentitySubmitPlcOperation from './types/com/atproto/identity/submitPlcOperation'
-import * as ComAtprotoIdentityUpdateHandle from './types/com/atproto/identity/updateHandle'
-import * as ComAtprotoLabelDefs from './types/com/atproto/label/defs'
-import * as ComAtprotoLabelQueryLabels from './types/com/atproto/label/queryLabels'
-import * as ComAtprotoLabelSubscribeLabels from './types/com/atproto/label/subscribeLabels'
-import * as ComAtprotoLexiconSchema from './types/com/atproto/lexicon/schema'
-import * as ComAtprotoModerationCreateReport from './types/com/atproto/moderation/createReport'
-import * as ComAtprotoModerationDefs from './types/com/atproto/moderation/defs'
-import * as ComAtprotoRepoApplyWrites from './types/com/atproto/repo/applyWrites'
-import * as ComAtprotoRepoCreateRecord from './types/com/atproto/repo/createRecord'
-import * as ComAtprotoRepoDefs from './types/com/atproto/repo/defs'
-import * as ComAtprotoRepoDeleteRecord from './types/com/atproto/repo/deleteRecord'
-import * as ComAtprotoRepoDescribeRepo from './types/com/atproto/repo/describeRepo'
-import * as ComAtprotoRepoGetRecord from './types/com/atproto/repo/getRecord'
-import * as ComAtprotoRepoImportRepo from './types/com/atproto/repo/importRepo'
-import * as ComAtprotoRepoListMissingBlobs from './types/com/atproto/repo/listMissingBlobs'
-import * as ComAtprotoRepoListRecords from './types/com/atproto/repo/listRecords'
-import * as ComAtprotoRepoPutRecord from './types/com/atproto/repo/putRecord'
-import * as ComAtprotoRepoStrongRef from './types/com/atproto/repo/strongRef'
-import * as ComAtprotoRepoUploadBlob from './types/com/atproto/repo/uploadBlob'
-import * as ComAtprotoServerActivateAccount from './types/com/atproto/server/activateAccount'
-import * as ComAtprotoServerCheckAccountStatus from './types/com/atproto/server/checkAccountStatus'
-import * as ComAtprotoServerConfirmEmail from './types/com/atproto/server/confirmEmail'
-import * as ComAtprotoServerCreateAccount from './types/com/atproto/server/createAccount'
-import * as ComAtprotoServerCreateAppPassword from './types/com/atproto/server/createAppPassword'
-import * as ComAtprotoServerCreateInviteCode from './types/com/atproto/server/createInviteCode'
-import * as ComAtprotoServerCreateInviteCodes from './types/com/atproto/server/createInviteCodes'
-import * as ComAtprotoServerCreateSession from './types/com/atproto/server/createSession'
-import * as ComAtprotoServerDeactivateAccount from './types/com/atproto/server/deactivateAccount'
-import * as ComAtprotoServerDefs from './types/com/atproto/server/defs'
-import * as ComAtprotoServerDeleteAccount from './types/com/atproto/server/deleteAccount'
-import * as ComAtprotoServerDeleteSession from './types/com/atproto/server/deleteSession'
-import * as ComAtprotoServerDescribeServer from './types/com/atproto/server/describeServer'
-import * as ComAtprotoServerGetAccountInviteCodes from './types/com/atproto/server/getAccountInviteCodes'
-import * as ComAtprotoServerGetServiceAuth from './types/com/atproto/server/getServiceAuth'
-import * as ComAtprotoServerGetSession from './types/com/atproto/server/getSession'
-import * as ComAtprotoServerListAppPasswords from './types/com/atproto/server/listAppPasswords'
-import * as ComAtprotoServerRefreshSession from './types/com/atproto/server/refreshSession'
-import * as ComAtprotoServerRequestAccountDelete from './types/com/atproto/server/requestAccountDelete'
-import * as ComAtprotoServerRequestEmailConfirmation from './types/com/atproto/server/requestEmailConfirmation'
-import * as ComAtprotoServerRequestEmailUpdate from './types/com/atproto/server/requestEmailUpdate'
-import * as ComAtprotoServerRequestPasswordReset from './types/com/atproto/server/requestPasswordReset'
-import * as ComAtprotoServerReserveSigningKey from './types/com/atproto/server/reserveSigningKey'
-import * as ComAtprotoServerResetPassword from './types/com/atproto/server/resetPassword'
-import * as ComAtprotoServerRevokeAppPassword from './types/com/atproto/server/revokeAppPassword'
-import * as ComAtprotoServerUpdateEmail from './types/com/atproto/server/updateEmail'
-import * as ComAtprotoSyncGetBlob from './types/com/atproto/sync/getBlob'
-import * as ComAtprotoSyncGetBlocks from './types/com/atproto/sync/getBlocks'
-import * as ComAtprotoSyncGetCheckout from './types/com/atproto/sync/getCheckout'
-import * as ComAtprotoSyncGetHead from './types/com/atproto/sync/getHead'
-import * as ComAtprotoSyncGetLatestCommit from './types/com/atproto/sync/getLatestCommit'
-import * as ComAtprotoSyncGetRecord from './types/com/atproto/sync/getRecord'
-import * as ComAtprotoSyncGetRepo from './types/com/atproto/sync/getRepo'
-import * as ComAtprotoSyncGetRepoStatus from './types/com/atproto/sync/getRepoStatus'
-import * as ComAtprotoSyncListBlobs from './types/com/atproto/sync/listBlobs'
-import * as ComAtprotoSyncListRepos from './types/com/atproto/sync/listRepos'
-import * as ComAtprotoSyncNotifyOfUpdate from './types/com/atproto/sync/notifyOfUpdate'
-import * as ComAtprotoSyncRequestCrawl from './types/com/atproto/sync/requestCrawl'
-import * as ComAtprotoSyncSubscribeRepos from './types/com/atproto/sync/subscribeRepos'
-import * as ComAtprotoTempAddReservedHandle from './types/com/atproto/temp/addReservedHandle'
-import * as ComAtprotoTempCheckSignupQueue from './types/com/atproto/temp/checkSignupQueue'
-import * as ComAtprotoTempFetchLabels from './types/com/atproto/temp/fetchLabels'
-import * as ComAtprotoTempRequestPhoneVerification from './types/com/atproto/temp/requestPhoneVerification'
-import * as AppBskyActorDefs from './types/app/bsky/actor/defs'
-import * as AppBskyActorGetPreferences from './types/app/bsky/actor/getPreferences'
-import * as AppBskyActorGetProfile from './types/app/bsky/actor/getProfile'
-import * as AppBskyActorGetProfiles from './types/app/bsky/actor/getProfiles'
-import * as AppBskyActorGetSuggestions from './types/app/bsky/actor/getSuggestions'
-import * as AppBskyActorProfile from './types/app/bsky/actor/profile'
-import * as AppBskyActorPutPreferences from './types/app/bsky/actor/putPreferences'
-import * as AppBskyActorSearchActors from './types/app/bsky/actor/searchActors'
-import * as AppBskyActorSearchActorsTypeahead from './types/app/bsky/actor/searchActorsTypeahead'
-import * as AppBskyEmbedDefs from './types/app/bsky/embed/defs'
-import * as AppBskyEmbedExternal from './types/app/bsky/embed/external'
-import * as AppBskyEmbedImages from './types/app/bsky/embed/images'
-import * as AppBskyEmbedRecord from './types/app/bsky/embed/record'
-import * as AppBskyEmbedRecordWithMedia from './types/app/bsky/embed/recordWithMedia'
-import * as AppBskyEmbedVideo from './types/app/bsky/embed/video'
-import * as AppBskyFeedDefs from './types/app/bsky/feed/defs'
-import * as AppBskyFeedDescribeFeedGenerator from './types/app/bsky/feed/describeFeedGenerator'
-import * as AppBskyFeedGenerator from './types/app/bsky/feed/generator'
-import * as AppBskyFeedGetActorFeeds from './types/app/bsky/feed/getActorFeeds'
-import * as AppBskyFeedGetActorLikes from './types/app/bsky/feed/getActorLikes'
-import * as AppBskyFeedGetAuthorFeed from './types/app/bsky/feed/getAuthorFeed'
-import * as AppBskyFeedGetFeed from './types/app/bsky/feed/getFeed'
-import * as AppBskyFeedGetFeedGenerator from './types/app/bsky/feed/getFeedGenerator'
-import * as AppBskyFeedGetFeedGenerators from './types/app/bsky/feed/getFeedGenerators'
-import * as AppBskyFeedGetFeedSkeleton from './types/app/bsky/feed/getFeedSkeleton'
-import * as AppBskyFeedGetLikes from './types/app/bsky/feed/getLikes'
-import * as AppBskyFeedGetListFeed from './types/app/bsky/feed/getListFeed'
-import * as AppBskyFeedGetPostThread from './types/app/bsky/feed/getPostThread'
-import * as AppBskyFeedGetPosts from './types/app/bsky/feed/getPosts'
-import * as AppBskyFeedGetQuotes from './types/app/bsky/feed/getQuotes'
-import * as AppBskyFeedGetRepostedBy from './types/app/bsky/feed/getRepostedBy'
-import * as AppBskyFeedGetSuggestedFeeds from './types/app/bsky/feed/getSuggestedFeeds'
-import * as AppBskyFeedGetTimeline from './types/app/bsky/feed/getTimeline'
-import * as AppBskyFeedLike from './types/app/bsky/feed/like'
-import * as AppBskyFeedPost from './types/app/bsky/feed/post'
-import * as AppBskyFeedPostgate from './types/app/bsky/feed/postgate'
-import * as AppBskyFeedRepost from './types/app/bsky/feed/repost'
-import * as AppBskyFeedSearchPosts from './types/app/bsky/feed/searchPosts'
-import * as AppBskyFeedSendInteractions from './types/app/bsky/feed/sendInteractions'
-import * as AppBskyFeedThreadgate from './types/app/bsky/feed/threadgate'
-import * as AppBskyGraphBlock from './types/app/bsky/graph/block'
-import * as AppBskyGraphDefs from './types/app/bsky/graph/defs'
-import * as AppBskyGraphFollow from './types/app/bsky/graph/follow'
-import * as AppBskyGraphGetActorStarterPacks from './types/app/bsky/graph/getActorStarterPacks'
-import * as AppBskyGraphGetBlocks from './types/app/bsky/graph/getBlocks'
-import * as AppBskyGraphGetFollowers from './types/app/bsky/graph/getFollowers'
-import * as AppBskyGraphGetFollows from './types/app/bsky/graph/getFollows'
-import * as AppBskyGraphGetKnownFollowers from './types/app/bsky/graph/getKnownFollowers'
-import * as AppBskyGraphGetList from './types/app/bsky/graph/getList'
-import * as AppBskyGraphGetListBlocks from './types/app/bsky/graph/getListBlocks'
-import * as AppBskyGraphGetListMutes from './types/app/bsky/graph/getListMutes'
-import * as AppBskyGraphGetLists from './types/app/bsky/graph/getLists'
-import * as AppBskyGraphGetMutes from './types/app/bsky/graph/getMutes'
-import * as AppBskyGraphGetRelationships from './types/app/bsky/graph/getRelationships'
-import * as AppBskyGraphGetStarterPack from './types/app/bsky/graph/getStarterPack'
-import * as AppBskyGraphGetStarterPacks from './types/app/bsky/graph/getStarterPacks'
-import * as AppBskyGraphGetSuggestedFollowsByActor from './types/app/bsky/graph/getSuggestedFollowsByActor'
-import * as AppBskyGraphList from './types/app/bsky/graph/list'
-import * as AppBskyGraphListblock from './types/app/bsky/graph/listblock'
-import * as AppBskyGraphListitem from './types/app/bsky/graph/listitem'
-import * as AppBskyGraphMuteActor from './types/app/bsky/graph/muteActor'
-import * as AppBskyGraphMuteActorList from './types/app/bsky/graph/muteActorList'
-import * as AppBskyGraphMuteThread from './types/app/bsky/graph/muteThread'
-import * as AppBskyGraphSearchStarterPacks from './types/app/bsky/graph/searchStarterPacks'
-import * as AppBskyGraphStarterpack from './types/app/bsky/graph/starterpack'
-import * as AppBskyGraphUnmuteActor from './types/app/bsky/graph/unmuteActor'
-import * as AppBskyGraphUnmuteActorList from './types/app/bsky/graph/unmuteActorList'
-import * as AppBskyGraphUnmuteThread from './types/app/bsky/graph/unmuteThread'
-import * as AppBskyLabelerDefs from './types/app/bsky/labeler/defs'
-import * as AppBskyLabelerGetServices from './types/app/bsky/labeler/getServices'
-import * as AppBskyLabelerService from './types/app/bsky/labeler/service'
-import * as AppBskyNotificationGetUnreadCount from './types/app/bsky/notification/getUnreadCount'
-import * as AppBskyNotificationListNotifications from './types/app/bsky/notification/listNotifications'
-import * as AppBskyNotificationPutPreferences from './types/app/bsky/notification/putPreferences'
-import * as AppBskyNotificationRegisterPush from './types/app/bsky/notification/registerPush'
-import * as AppBskyNotificationUpdateSeen from './types/app/bsky/notification/updateSeen'
-import * as AppBskyRichtextFacet from './types/app/bsky/richtext/facet'
-import * as AppBskyUnspeccedDefs from './types/app/bsky/unspecced/defs'
-import * as AppBskyUnspeccedGetConfig from './types/app/bsky/unspecced/getConfig'
-import * as AppBskyUnspeccedGetPopularFeedGenerators from './types/app/bsky/unspecced/getPopularFeedGenerators'
-import * as AppBskyUnspeccedGetSuggestionsSkeleton from './types/app/bsky/unspecced/getSuggestionsSkeleton'
-import * as AppBskyUnspeccedGetTaggedSuggestions from './types/app/bsky/unspecced/getTaggedSuggestions'
-import * as AppBskyUnspeccedGetTrendingTopics from './types/app/bsky/unspecced/getTrendingTopics'
-import * as AppBskyUnspeccedSearchActorsSkeleton from './types/app/bsky/unspecced/searchActorsSkeleton'
-import * as AppBskyUnspeccedSearchPostsSkeleton from './types/app/bsky/unspecced/searchPostsSkeleton'
-import * as AppBskyUnspeccedSearchStarterPacksSkeleton from './types/app/bsky/unspecced/searchStarterPacksSkeleton'
-import * as AppBskyVideoDefs from './types/app/bsky/video/defs'
-import * as AppBskyVideoGetJobStatus from './types/app/bsky/video/getJobStatus'
-import * as AppBskyVideoGetUploadLimits from './types/app/bsky/video/getUploadLimits'
-import * as AppBskyVideoUploadVideo from './types/app/bsky/video/uploadVideo'
-import * as ChatBskyActorDeclaration from './types/chat/bsky/actor/declaration'
-import * as ChatBskyActorDefs from './types/chat/bsky/actor/defs'
-import * as ChatBskyActorDeleteAccount from './types/chat/bsky/actor/deleteAccount'
-import * as ChatBskyActorExportAccountData from './types/chat/bsky/actor/exportAccountData'
-import * as ChatBskyConvoDefs from './types/chat/bsky/convo/defs'
-import * as ChatBskyConvoDeleteMessageForSelf from './types/chat/bsky/convo/deleteMessageForSelf'
-import * as ChatBskyConvoGetConvo from './types/chat/bsky/convo/getConvo'
-import * as ChatBskyConvoGetConvoForMembers from './types/chat/bsky/convo/getConvoForMembers'
-import * as ChatBskyConvoGetLog from './types/chat/bsky/convo/getLog'
-import * as ChatBskyConvoGetMessages from './types/chat/bsky/convo/getMessages'
-import * as ChatBskyConvoLeaveConvo from './types/chat/bsky/convo/leaveConvo'
-import * as ChatBskyConvoListConvos from './types/chat/bsky/convo/listConvos'
-import * as ChatBskyConvoMuteConvo from './types/chat/bsky/convo/muteConvo'
-import * as ChatBskyConvoSendMessage from './types/chat/bsky/convo/sendMessage'
-import * as ChatBskyConvoSendMessageBatch from './types/chat/bsky/convo/sendMessageBatch'
-import * as ChatBskyConvoUnmuteConvo from './types/chat/bsky/convo/unmuteConvo'
-import * as ChatBskyConvoUpdateRead from './types/chat/bsky/convo/updateRead'
-import * as ChatBskyModerationGetActorMetadata from './types/chat/bsky/moderation/getActorMetadata'
-import * as ChatBskyModerationGetMessageContext from './types/chat/bsky/moderation/getMessageContext'
-import * as ChatBskyModerationUpdateActorAccess from './types/chat/bsky/moderation/updateActorAccess'
-import * as ToolsOzoneCommunicationCreateTemplate from './types/tools/ozone/communication/createTemplate'
-import * as ToolsOzoneCommunicationDefs from './types/tools/ozone/communication/defs'
-import * as ToolsOzoneCommunicationDeleteTemplate from './types/tools/ozone/communication/deleteTemplate'
-import * as ToolsOzoneCommunicationListTemplates from './types/tools/ozone/communication/listTemplates'
-import * as ToolsOzoneCommunicationUpdateTemplate from './types/tools/ozone/communication/updateTemplate'
-import * as ToolsOzoneModerationDefs from './types/tools/ozone/moderation/defs'
-import * as ToolsOzoneModerationEmitEvent from './types/tools/ozone/moderation/emitEvent'
-import * as ToolsOzoneModerationGetEvent from './types/tools/ozone/moderation/getEvent'
-import * as ToolsOzoneModerationGetRecord from './types/tools/ozone/moderation/getRecord'
-import * as ToolsOzoneModerationGetRecords from './types/tools/ozone/moderation/getRecords'
-import * as ToolsOzoneModerationGetRepo from './types/tools/ozone/moderation/getRepo'
-import * as ToolsOzoneModerationGetRepos from './types/tools/ozone/moderation/getRepos'
-import * as ToolsOzoneModerationQueryEvents from './types/tools/ozone/moderation/queryEvents'
-import * as ToolsOzoneModerationQueryStatuses from './types/tools/ozone/moderation/queryStatuses'
-import * as ToolsOzoneModerationSearchRepos from './types/tools/ozone/moderation/searchRepos'
-import * as ToolsOzoneServerGetConfig from './types/tools/ozone/server/getConfig'
-import * as ToolsOzoneSetAddValues from './types/tools/ozone/set/addValues'
-import * as ToolsOzoneSetDefs from './types/tools/ozone/set/defs'
-import * as ToolsOzoneSetDeleteSet from './types/tools/ozone/set/deleteSet'
-import * as ToolsOzoneSetDeleteValues from './types/tools/ozone/set/deleteValues'
-import * as ToolsOzoneSetGetValues from './types/tools/ozone/set/getValues'
-import * as ToolsOzoneSetQuerySets from './types/tools/ozone/set/querySets'
-import * as ToolsOzoneSetUpsertSet from './types/tools/ozone/set/upsertSet'
-import * as ToolsOzoneSettingDefs from './types/tools/ozone/setting/defs'
-import * as ToolsOzoneSettingListOptions from './types/tools/ozone/setting/listOptions'
-import * as ToolsOzoneSettingRemoveOptions from './types/tools/ozone/setting/removeOptions'
-import * as ToolsOzoneSettingUpsertOption from './types/tools/ozone/setting/upsertOption'
-import * as ToolsOzoneSignatureDefs from './types/tools/ozone/signature/defs'
-import * as ToolsOzoneSignatureFindCorrelation from './types/tools/ozone/signature/findCorrelation'
-import * as ToolsOzoneSignatureFindRelatedAccounts from './types/tools/ozone/signature/findRelatedAccounts'
-import * as ToolsOzoneSignatureSearchAccounts from './types/tools/ozone/signature/searchAccounts'
-import * as ToolsOzoneTeamAddMember from './types/tools/ozone/team/addMember'
-import * as ToolsOzoneTeamDefs from './types/tools/ozone/team/defs'
-import * as ToolsOzoneTeamDeleteMember from './types/tools/ozone/team/deleteMember'
-import * as ToolsOzoneTeamListMembers from './types/tools/ozone/team/listMembers'
-import * as ToolsOzoneTeamUpdateMember from './types/tools/ozone/team/updateMember'
-
-export * as ComAtprotoAdminDefs from './types/com/atproto/admin/defs'
-export * as ComAtprotoAdminDeleteAccount from './types/com/atproto/admin/deleteAccount'
-export * as ComAtprotoAdminDisableAccountInvites from './types/com/atproto/admin/disableAccountInvites'
-export * as ComAtprotoAdminDisableInviteCodes from './types/com/atproto/admin/disableInviteCodes'
-export * as ComAtprotoAdminEnableAccountInvites from './types/com/atproto/admin/enableAccountInvites'
-export * as ComAtprotoAdminGetAccountInfo from './types/com/atproto/admin/getAccountInfo'
-export * as ComAtprotoAdminGetAccountInfos from './types/com/atproto/admin/getAccountInfos'
-export * as ComAtprotoAdminGetInviteCodes from './types/com/atproto/admin/getInviteCodes'
-export * as ComAtprotoAdminGetSubjectStatus from './types/com/atproto/admin/getSubjectStatus'
-export * as ComAtprotoAdminSearchAccounts from './types/com/atproto/admin/searchAccounts'
-export * as ComAtprotoAdminSendEmail from './types/com/atproto/admin/sendEmail'
-export * as ComAtprotoAdminUpdateAccountEmail from './types/com/atproto/admin/updateAccountEmail'
-export * as ComAtprotoAdminUpdateAccountHandle from './types/com/atproto/admin/updateAccountHandle'
-export * as ComAtprotoAdminUpdateAccountPassword from './types/com/atproto/admin/updateAccountPassword'
-export * as ComAtprotoAdminUpdateSubjectStatus from './types/com/atproto/admin/updateSubjectStatus'
-export * as ComAtprotoIdentityGetRecommendedDidCredentials from './types/com/atproto/identity/getRecommendedDidCredentials'
-export * as ComAtprotoIdentityRequestPlcOperationSignature from './types/com/atproto/identity/requestPlcOperationSignature'
-export * as ComAtprotoIdentityResolveHandle from './types/com/atproto/identity/resolveHandle'
-export * as ComAtprotoIdentitySignPlcOperation from './types/com/atproto/identity/signPlcOperation'
-export * as ComAtprotoIdentitySubmitPlcOperation from './types/com/atproto/identity/submitPlcOperation'
-export * as ComAtprotoIdentityUpdateHandle from './types/com/atproto/identity/updateHandle'
-export * as ComAtprotoLabelDefs from './types/com/atproto/label/defs'
-export * as ComAtprotoLabelQueryLabels from './types/com/atproto/label/queryLabels'
-export * as ComAtprotoLabelSubscribeLabels from './types/com/atproto/label/subscribeLabels'
-export * as ComAtprotoLexiconSchema from './types/com/atproto/lexicon/schema'
-export * as ComAtprotoModerationCreateReport from './types/com/atproto/moderation/createReport'
-export * as ComAtprotoModerationDefs from './types/com/atproto/moderation/defs'
-export * as ComAtprotoRepoApplyWrites from './types/com/atproto/repo/applyWrites'
-export * as ComAtprotoRepoCreateRecord from './types/com/atproto/repo/createRecord'
-export * as ComAtprotoRepoDefs from './types/com/atproto/repo/defs'
-export * as ComAtprotoRepoDeleteRecord from './types/com/atproto/repo/deleteRecord'
-export * as ComAtprotoRepoDescribeRepo from './types/com/atproto/repo/describeRepo'
-export * as ComAtprotoRepoGetRecord from './types/com/atproto/repo/getRecord'
-export * as ComAtprotoRepoImportRepo from './types/com/atproto/repo/importRepo'
-export * as ComAtprotoRepoListMissingBlobs from './types/com/atproto/repo/listMissingBlobs'
-export * as ComAtprotoRepoListRecords from './types/com/atproto/repo/listRecords'
-export * as ComAtprotoRepoPutRecord from './types/com/atproto/repo/putRecord'
-export * as ComAtprotoRepoStrongRef from './types/com/atproto/repo/strongRef'
-export * as ComAtprotoRepoUploadBlob from './types/com/atproto/repo/uploadBlob'
-export * as ComAtprotoServerActivateAccount from './types/com/atproto/server/activateAccount'
-export * as ComAtprotoServerCheckAccountStatus from './types/com/atproto/server/checkAccountStatus'
-export * as ComAtprotoServerConfirmEmail from './types/com/atproto/server/confirmEmail'
-export * as ComAtprotoServerCreateAccount from './types/com/atproto/server/createAccount'
-export * as ComAtprotoServerCreateAppPassword from './types/com/atproto/server/createAppPassword'
-export * as ComAtprotoServerCreateInviteCode from './types/com/atproto/server/createInviteCode'
-export * as ComAtprotoServerCreateInviteCodes from './types/com/atproto/server/createInviteCodes'
-export * as ComAtprotoServerCreateSession from './types/com/atproto/server/createSession'
-export * as ComAtprotoServerDeactivateAccount from './types/com/atproto/server/deactivateAccount'
-export * as ComAtprotoServerDefs from './types/com/atproto/server/defs'
-export * as ComAtprotoServerDeleteAccount from './types/com/atproto/server/deleteAccount'
-export * as ComAtprotoServerDeleteSession from './types/com/atproto/server/deleteSession'
-export * as ComAtprotoServerDescribeServer from './types/com/atproto/server/describeServer'
-export * as ComAtprotoServerGetAccountInviteCodes from './types/com/atproto/server/getAccountInviteCodes'
-export * as ComAtprotoServerGetServiceAuth from './types/com/atproto/server/getServiceAuth'
-export * as ComAtprotoServerGetSession from './types/com/atproto/server/getSession'
-export * as ComAtprotoServerListAppPasswords from './types/com/atproto/server/listAppPasswords'
-export * as ComAtprotoServerRefreshSession from './types/com/atproto/server/refreshSession'
-export * as ComAtprotoServerRequestAccountDelete from './types/com/atproto/server/requestAccountDelete'
-export * as ComAtprotoServerRequestEmailConfirmation from './types/com/atproto/server/requestEmailConfirmation'
-export * as ComAtprotoServerRequestEmailUpdate from './types/com/atproto/server/requestEmailUpdate'
-export * as ComAtprotoServerRequestPasswordReset from './types/com/atproto/server/requestPasswordReset'
-export * as ComAtprotoServerReserveSigningKey from './types/com/atproto/server/reserveSigningKey'
-export * as ComAtprotoServerResetPassword from './types/com/atproto/server/resetPassword'
-export * as ComAtprotoServerRevokeAppPassword from './types/com/atproto/server/revokeAppPassword'
-export * as ComAtprotoServerUpdateEmail from './types/com/atproto/server/updateEmail'
-export * as ComAtprotoSyncGetBlob from './types/com/atproto/sync/getBlob'
-export * as ComAtprotoSyncGetBlocks from './types/com/atproto/sync/getBlocks'
-export * as ComAtprotoSyncGetCheckout from './types/com/atproto/sync/getCheckout'
-export * as ComAtprotoSyncGetHead from './types/com/atproto/sync/getHead'
-export * as ComAtprotoSyncGetLatestCommit from './types/com/atproto/sync/getLatestCommit'
-export * as ComAtprotoSyncGetRecord from './types/com/atproto/sync/getRecord'
-export * as ComAtprotoSyncGetRepo from './types/com/atproto/sync/getRepo'
-export * as ComAtprotoSyncGetRepoStatus from './types/com/atproto/sync/getRepoStatus'
-export * as ComAtprotoSyncListBlobs from './types/com/atproto/sync/listBlobs'
-export * as ComAtprotoSyncListRepos from './types/com/atproto/sync/listRepos'
-export * as ComAtprotoSyncNotifyOfUpdate from './types/com/atproto/sync/notifyOfUpdate'
-export * as ComAtprotoSyncRequestCrawl from './types/com/atproto/sync/requestCrawl'
-export * as ComAtprotoSyncSubscribeRepos from './types/com/atproto/sync/subscribeRepos'
-export * as ComAtprotoTempAddReservedHandle from './types/com/atproto/temp/addReservedHandle'
-export * as ComAtprotoTempCheckSignupQueue from './types/com/atproto/temp/checkSignupQueue'
-export * as ComAtprotoTempFetchLabels from './types/com/atproto/temp/fetchLabels'
-export * as ComAtprotoTempRequestPhoneVerification from './types/com/atproto/temp/requestPhoneVerification'
-export * as AppBskyActorDefs from './types/app/bsky/actor/defs'
-export * as AppBskyActorGetPreferences from './types/app/bsky/actor/getPreferences'
-export * as AppBskyActorGetProfile from './types/app/bsky/actor/getProfile'
-export * as AppBskyActorGetProfiles from './types/app/bsky/actor/getProfiles'
-export * as AppBskyActorGetSuggestions from './types/app/bsky/actor/getSuggestions'
-export * as AppBskyActorProfile from './types/app/bsky/actor/profile'
-export * as AppBskyActorPutPreferences from './types/app/bsky/actor/putPreferences'
-export * as AppBskyActorSearchActors from './types/app/bsky/actor/searchActors'
-export * as AppBskyActorSearchActorsTypeahead from './types/app/bsky/actor/searchActorsTypeahead'
-export * as AppBskyEmbedDefs from './types/app/bsky/embed/defs'
-export * as AppBskyEmbedExternal from './types/app/bsky/embed/external'
-export * as AppBskyEmbedImages from './types/app/bsky/embed/images'
-export * as AppBskyEmbedRecord from './types/app/bsky/embed/record'
-export * as AppBskyEmbedRecordWithMedia from './types/app/bsky/embed/recordWithMedia'
-export * as AppBskyEmbedVideo from './types/app/bsky/embed/video'
-export * as AppBskyFeedDefs from './types/app/bsky/feed/defs'
-export * as AppBskyFeedDescribeFeedGenerator from './types/app/bsky/feed/describeFeedGenerator'
-export * as AppBskyFeedGenerator from './types/app/bsky/feed/generator'
-export * as AppBskyFeedGetActorFeeds from './types/app/bsky/feed/getActorFeeds'
-export * as AppBskyFeedGetActorLikes from './types/app/bsky/feed/getActorLikes'
-export * as AppBskyFeedGetAuthorFeed from './types/app/bsky/feed/getAuthorFeed'
-export * as AppBskyFeedGetFeed from './types/app/bsky/feed/getFeed'
-export * as AppBskyFeedGetFeedGenerator from './types/app/bsky/feed/getFeedGenerator'
-export * as AppBskyFeedGetFeedGenerators from './types/app/bsky/feed/getFeedGenerators'
-export * as AppBskyFeedGetFeedSkeleton from './types/app/bsky/feed/getFeedSkeleton'
-export * as AppBskyFeedGetLikes from './types/app/bsky/feed/getLikes'
-export * as AppBskyFeedGetListFeed from './types/app/bsky/feed/getListFeed'
-export * as AppBskyFeedGetPostThread from './types/app/bsky/feed/getPostThread'
-export * as AppBskyFeedGetPosts from './types/app/bsky/feed/getPosts'
-export * as AppBskyFeedGetQuotes from './types/app/bsky/feed/getQuotes'
-export * as AppBskyFeedGetRepostedBy from './types/app/bsky/feed/getRepostedBy'
-export * as AppBskyFeedGetSuggestedFeeds from './types/app/bsky/feed/getSuggestedFeeds'
-export * as AppBskyFeedGetTimeline from './types/app/bsky/feed/getTimeline'
-export * as AppBskyFeedLike from './types/app/bsky/feed/like'
-export * as AppBskyFeedPost from './types/app/bsky/feed/post'
-export * as AppBskyFeedPostgate from './types/app/bsky/feed/postgate'
-export * as AppBskyFeedRepost from './types/app/bsky/feed/repost'
-export * as AppBskyFeedSearchPosts from './types/app/bsky/feed/searchPosts'
-export * as AppBskyFeedSendInteractions from './types/app/bsky/feed/sendInteractions'
-export * as AppBskyFeedThreadgate from './types/app/bsky/feed/threadgate'
-export * as AppBskyGraphBlock from './types/app/bsky/graph/block'
-export * as AppBskyGraphDefs from './types/app/bsky/graph/defs'
-export * as AppBskyGraphFollow from './types/app/bsky/graph/follow'
-export * as AppBskyGraphGetActorStarterPacks from './types/app/bsky/graph/getActorStarterPacks'
-export * as AppBskyGraphGetBlocks from './types/app/bsky/graph/getBlocks'
-export * as AppBskyGraphGetFollowers from './types/app/bsky/graph/getFollowers'
-export * as AppBskyGraphGetFollows from './types/app/bsky/graph/getFollows'
-export * as AppBskyGraphGetKnownFollowers from './types/app/bsky/graph/getKnownFollowers'
-export * as AppBskyGraphGetList from './types/app/bsky/graph/getList'
-export * as AppBskyGraphGetListBlocks from './types/app/bsky/graph/getListBlocks'
-export * as AppBskyGraphGetListMutes from './types/app/bsky/graph/getListMutes'
-export * as AppBskyGraphGetLists from './types/app/bsky/graph/getLists'
-export * as AppBskyGraphGetMutes from './types/app/bsky/graph/getMutes'
-export * as AppBskyGraphGetRelationships from './types/app/bsky/graph/getRelationships'
-export * as AppBskyGraphGetStarterPack from './types/app/bsky/graph/getStarterPack'
-export * as AppBskyGraphGetStarterPacks from './types/app/bsky/graph/getStarterPacks'
-export * as AppBskyGraphGetSuggestedFollowsByActor from './types/app/bsky/graph/getSuggestedFollowsByActor'
-export * as AppBskyGraphList from './types/app/bsky/graph/list'
-export * as AppBskyGraphListblock from './types/app/bsky/graph/listblock'
-export * as AppBskyGraphListitem from './types/app/bsky/graph/listitem'
-export * as AppBskyGraphMuteActor from './types/app/bsky/graph/muteActor'
-export * as AppBskyGraphMuteActorList from './types/app/bsky/graph/muteActorList'
-export * as AppBskyGraphMuteThread from './types/app/bsky/graph/muteThread'
-export * as AppBskyGraphSearchStarterPacks from './types/app/bsky/graph/searchStarterPacks'
-export * as AppBskyGraphStarterpack from './types/app/bsky/graph/starterpack'
-export * as AppBskyGraphUnmuteActor from './types/app/bsky/graph/unmuteActor'
-export * as AppBskyGraphUnmuteActorList from './types/app/bsky/graph/unmuteActorList'
-export * as AppBskyGraphUnmuteThread from './types/app/bsky/graph/unmuteThread'
-export * as AppBskyLabelerDefs from './types/app/bsky/labeler/defs'
-export * as AppBskyLabelerGetServices from './types/app/bsky/labeler/getServices'
-export * as AppBskyLabelerService from './types/app/bsky/labeler/service'
-export * as AppBskyNotificationGetUnreadCount from './types/app/bsky/notification/getUnreadCount'
-export * as AppBskyNotificationListNotifications from './types/app/bsky/notification/listNotifications'
-export * as AppBskyNotificationPutPreferences from './types/app/bsky/notification/putPreferences'
-export * as AppBskyNotificationRegisterPush from './types/app/bsky/notification/registerPush'
-export * as AppBskyNotificationUpdateSeen from './types/app/bsky/notification/updateSeen'
-export * as AppBskyRichtextFacet from './types/app/bsky/richtext/facet'
-export * as AppBskyUnspeccedDefs from './types/app/bsky/unspecced/defs'
-export * as AppBskyUnspeccedGetConfig from './types/app/bsky/unspecced/getConfig'
-export * as AppBskyUnspeccedGetPopularFeedGenerators from './types/app/bsky/unspecced/getPopularFeedGenerators'
-export * as AppBskyUnspeccedGetSuggestionsSkeleton from './types/app/bsky/unspecced/getSuggestionsSkeleton'
-export * as AppBskyUnspeccedGetTaggedSuggestions from './types/app/bsky/unspecced/getTaggedSuggestions'
-export * as AppBskyUnspeccedGetTrendingTopics from './types/app/bsky/unspecced/getTrendingTopics'
-export * as AppBskyUnspeccedSearchActorsSkeleton from './types/app/bsky/unspecced/searchActorsSkeleton'
-export * as AppBskyUnspeccedSearchPostsSkeleton from './types/app/bsky/unspecced/searchPostsSkeleton'
-export * as AppBskyUnspeccedSearchStarterPacksSkeleton from './types/app/bsky/unspecced/searchStarterPacksSkeleton'
-export * as AppBskyVideoDefs from './types/app/bsky/video/defs'
-export * as AppBskyVideoGetJobStatus from './types/app/bsky/video/getJobStatus'
-export * as AppBskyVideoGetUploadLimits from './types/app/bsky/video/getUploadLimits'
-export * as AppBskyVideoUploadVideo from './types/app/bsky/video/uploadVideo'
-export * as ChatBskyActorDeclaration from './types/chat/bsky/actor/declaration'
-export * as ChatBskyActorDefs from './types/chat/bsky/actor/defs'
-export * as ChatBskyActorDeleteAccount from './types/chat/bsky/actor/deleteAccount'
-export * as ChatBskyActorExportAccountData from './types/chat/bsky/actor/exportAccountData'
-export * as ChatBskyConvoDefs from './types/chat/bsky/convo/defs'
-export * as ChatBskyConvoDeleteMessageForSelf from './types/chat/bsky/convo/deleteMessageForSelf'
-export * as ChatBskyConvoGetConvo from './types/chat/bsky/convo/getConvo'
-export * as ChatBskyConvoGetConvoForMembers from './types/chat/bsky/convo/getConvoForMembers'
-export * as ChatBskyConvoGetLog from './types/chat/bsky/convo/getLog'
-export * as ChatBskyConvoGetMessages from './types/chat/bsky/convo/getMessages'
-export * as ChatBskyConvoLeaveConvo from './types/chat/bsky/convo/leaveConvo'
-export * as ChatBskyConvoListConvos from './types/chat/bsky/convo/listConvos'
-export * as ChatBskyConvoMuteConvo from './types/chat/bsky/convo/muteConvo'
-export * as ChatBskyConvoSendMessage from './types/chat/bsky/convo/sendMessage'
-export * as ChatBskyConvoSendMessageBatch from './types/chat/bsky/convo/sendMessageBatch'
-export * as ChatBskyConvoUnmuteConvo from './types/chat/bsky/convo/unmuteConvo'
-export * as ChatBskyConvoUpdateRead from './types/chat/bsky/convo/updateRead'
-export * as ChatBskyModerationGetActorMetadata from './types/chat/bsky/moderation/getActorMetadata'
-export * as ChatBskyModerationGetMessageContext from './types/chat/bsky/moderation/getMessageContext'
-export * as ChatBskyModerationUpdateActorAccess from './types/chat/bsky/moderation/updateActorAccess'
-export * as ToolsOzoneCommunicationCreateTemplate from './types/tools/ozone/communication/createTemplate'
-export * as ToolsOzoneCommunicationDefs from './types/tools/ozone/communication/defs'
-export * as ToolsOzoneCommunicationDeleteTemplate from './types/tools/ozone/communication/deleteTemplate'
-export * as ToolsOzoneCommunicationListTemplates from './types/tools/ozone/communication/listTemplates'
-export * as ToolsOzoneCommunicationUpdateTemplate from './types/tools/ozone/communication/updateTemplate'
-export * as ToolsOzoneModerationDefs from './types/tools/ozone/moderation/defs'
-export * as ToolsOzoneModerationEmitEvent from './types/tools/ozone/moderation/emitEvent'
-export * as ToolsOzoneModerationGetEvent from './types/tools/ozone/moderation/getEvent'
-export * as ToolsOzoneModerationGetRecord from './types/tools/ozone/moderation/getRecord'
-export * as ToolsOzoneModerationGetRecords from './types/tools/ozone/moderation/getRecords'
-export * as ToolsOzoneModerationGetRepo from './types/tools/ozone/moderation/getRepo'
-export * as ToolsOzoneModerationGetRepos from './types/tools/ozone/moderation/getRepos'
-export * as ToolsOzoneModerationQueryEvents from './types/tools/ozone/moderation/queryEvents'
-export * as ToolsOzoneModerationQueryStatuses from './types/tools/ozone/moderation/queryStatuses'
-export * as ToolsOzoneModerationSearchRepos from './types/tools/ozone/moderation/searchRepos'
-export * as ToolsOzoneServerGetConfig from './types/tools/ozone/server/getConfig'
-export * as ToolsOzoneSetAddValues from './types/tools/ozone/set/addValues'
-export * as ToolsOzoneSetDefs from './types/tools/ozone/set/defs'
-export * as ToolsOzoneSetDeleteSet from './types/tools/ozone/set/deleteSet'
-export * as ToolsOzoneSetDeleteValues from './types/tools/ozone/set/deleteValues'
-export * as ToolsOzoneSetGetValues from './types/tools/ozone/set/getValues'
-export * as ToolsOzoneSetQuerySets from './types/tools/ozone/set/querySets'
-export * as ToolsOzoneSetUpsertSet from './types/tools/ozone/set/upsertSet'
-export * as ToolsOzoneSettingDefs from './types/tools/ozone/setting/defs'
-export * as ToolsOzoneSettingListOptions from './types/tools/ozone/setting/listOptions'
-export * as ToolsOzoneSettingRemoveOptions from './types/tools/ozone/setting/removeOptions'
-export * as ToolsOzoneSettingUpsertOption from './types/tools/ozone/setting/upsertOption'
-export * as ToolsOzoneSignatureDefs from './types/tools/ozone/signature/defs'
-export * as ToolsOzoneSignatureFindCorrelation from './types/tools/ozone/signature/findCorrelation'
-export * as ToolsOzoneSignatureFindRelatedAccounts from './types/tools/ozone/signature/findRelatedAccounts'
-export * as ToolsOzoneSignatureSearchAccounts from './types/tools/ozone/signature/searchAccounts'
-export * as ToolsOzoneTeamAddMember from './types/tools/ozone/team/addMember'
-export * as ToolsOzoneTeamDefs from './types/tools/ozone/team/defs'
-export * as ToolsOzoneTeamDeleteMember from './types/tools/ozone/team/deleteMember'
-export * as ToolsOzoneTeamListMembers from './types/tools/ozone/team/listMembers'
-export * as ToolsOzoneTeamUpdateMember from './types/tools/ozone/team/updateMember'
+import { OmitKey, Un$Typed } from './util.js'
+import * as ComAtprotoAdminDefs from './types/com/atproto/admin/defs.js'
+import * as ComAtprotoAdminDeleteAccount from './types/com/atproto/admin/deleteAccount.js'
+import * as ComAtprotoAdminDisableAccountInvites from './types/com/atproto/admin/disableAccountInvites.js'
+import * as ComAtprotoAdminDisableInviteCodes from './types/com/atproto/admin/disableInviteCodes.js'
+import * as ComAtprotoAdminEnableAccountInvites from './types/com/atproto/admin/enableAccountInvites.js'
+import * as ComAtprotoAdminGetAccountInfo from './types/com/atproto/admin/getAccountInfo.js'
+import * as ComAtprotoAdminGetAccountInfos from './types/com/atproto/admin/getAccountInfos.js'
+import * as ComAtprotoAdminGetInviteCodes from './types/com/atproto/admin/getInviteCodes.js'
+import * as ComAtprotoAdminGetSubjectStatus from './types/com/atproto/admin/getSubjectStatus.js'
+import * as ComAtprotoAdminSearchAccounts from './types/com/atproto/admin/searchAccounts.js'
+import * as ComAtprotoAdminSendEmail from './types/com/atproto/admin/sendEmail.js'
+import * as ComAtprotoAdminUpdateAccountEmail from './types/com/atproto/admin/updateAccountEmail.js'
+import * as ComAtprotoAdminUpdateAccountHandle from './types/com/atproto/admin/updateAccountHandle.js'
+import * as ComAtprotoAdminUpdateAccountPassword from './types/com/atproto/admin/updateAccountPassword.js'
+import * as ComAtprotoAdminUpdateSubjectStatus from './types/com/atproto/admin/updateSubjectStatus.js'
+import * as ComAtprotoIdentityGetRecommendedDidCredentials from './types/com/atproto/identity/getRecommendedDidCredentials.js'
+import * as ComAtprotoIdentityRequestPlcOperationSignature from './types/com/atproto/identity/requestPlcOperationSignature.js'
+import * as ComAtprotoIdentityResolveHandle from './types/com/atproto/identity/resolveHandle.js'
+import * as ComAtprotoIdentitySignPlcOperation from './types/com/atproto/identity/signPlcOperation.js'
+import * as ComAtprotoIdentitySubmitPlcOperation from './types/com/atproto/identity/submitPlcOperation.js'
+import * as ComAtprotoIdentityUpdateHandle from './types/com/atproto/identity/updateHandle.js'
+import * as ComAtprotoLabelDefs from './types/com/atproto/label/defs.js'
+import * as ComAtprotoLabelQueryLabels from './types/com/atproto/label/queryLabels.js'
+import * as ComAtprotoLabelSubscribeLabels from './types/com/atproto/label/subscribeLabels.js'
+import * as ComAtprotoLexiconSchema from './types/com/atproto/lexicon/schema.js'
+import * as ComAtprotoModerationCreateReport from './types/com/atproto/moderation/createReport.js'
+import * as ComAtprotoModerationDefs from './types/com/atproto/moderation/defs.js'
+import * as ComAtprotoRepoApplyWrites from './types/com/atproto/repo/applyWrites.js'
+import * as ComAtprotoRepoCreateRecord from './types/com/atproto/repo/createRecord.js'
+import * as ComAtprotoRepoDefs from './types/com/atproto/repo/defs.js'
+import * as ComAtprotoRepoDeleteRecord from './types/com/atproto/repo/deleteRecord.js'
+import * as ComAtprotoRepoDescribeRepo from './types/com/atproto/repo/describeRepo.js'
+import * as ComAtprotoRepoGetRecord from './types/com/atproto/repo/getRecord.js'
+import * as ComAtprotoRepoImportRepo from './types/com/atproto/repo/importRepo.js'
+import * as ComAtprotoRepoListMissingBlobs from './types/com/atproto/repo/listMissingBlobs.js'
+import * as ComAtprotoRepoListRecords from './types/com/atproto/repo/listRecords.js'
+import * as ComAtprotoRepoPutRecord from './types/com/atproto/repo/putRecord.js'
+import * as ComAtprotoRepoStrongRef from './types/com/atproto/repo/strongRef.js'
+import * as ComAtprotoRepoUploadBlob from './types/com/atproto/repo/uploadBlob.js'
+import * as ComAtprotoServerActivateAccount from './types/com/atproto/server/activateAccount.js'
+import * as ComAtprotoServerCheckAccountStatus from './types/com/atproto/server/checkAccountStatus.js'
+import * as ComAtprotoServerConfirmEmail from './types/com/atproto/server/confirmEmail.js'
+import * as ComAtprotoServerCreateAccount from './types/com/atproto/server/createAccount.js'
+import * as ComAtprotoServerCreateAppPassword from './types/com/atproto/server/createAppPassword.js'
+import * as ComAtprotoServerCreateInviteCode from './types/com/atproto/server/createInviteCode.js'
+import * as ComAtprotoServerCreateInviteCodes from './types/com/atproto/server/createInviteCodes.js'
+import * as ComAtprotoServerCreateSession from './types/com/atproto/server/createSession.js'
+import * as ComAtprotoServerDeactivateAccount from './types/com/atproto/server/deactivateAccount.js'
+import * as ComAtprotoServerDefs from './types/com/atproto/server/defs.js'
+import * as ComAtprotoServerDeleteAccount from './types/com/atproto/server/deleteAccount.js'
+import * as ComAtprotoServerDeleteSession from './types/com/atproto/server/deleteSession.js'
+import * as ComAtprotoServerDescribeServer from './types/com/atproto/server/describeServer.js'
+import * as ComAtprotoServerGetAccountInviteCodes from './types/com/atproto/server/getAccountInviteCodes.js'
+import * as ComAtprotoServerGetServiceAuth from './types/com/atproto/server/getServiceAuth.js'
+import * as ComAtprotoServerGetSession from './types/com/atproto/server/getSession.js'
+import * as ComAtprotoServerListAppPasswords from './types/com/atproto/server/listAppPasswords.js'
+import * as ComAtprotoServerRefreshSession from './types/com/atproto/server/refreshSession.js'
+import * as ComAtprotoServerRequestAccountDelete from './types/com/atproto/server/requestAccountDelete.js'
+import * as ComAtprotoServerRequestEmailConfirmation from './types/com/atproto/server/requestEmailConfirmation.js'
+import * as ComAtprotoServerRequestEmailUpdate from './types/com/atproto/server/requestEmailUpdate.js'
+import * as ComAtprotoServerRequestPasswordReset from './types/com/atproto/server/requestPasswordReset.js'
+import * as ComAtprotoServerReserveSigningKey from './types/com/atproto/server/reserveSigningKey.js'
+import * as ComAtprotoServerResetPassword from './types/com/atproto/server/resetPassword.js'
+import * as ComAtprotoServerRevokeAppPassword from './types/com/atproto/server/revokeAppPassword.js'
+import * as ComAtprotoServerUpdateEmail from './types/com/atproto/server/updateEmail.js'
+import * as ComAtprotoSyncGetBlob from './types/com/atproto/sync/getBlob.js'
+import * as ComAtprotoSyncGetBlocks from './types/com/atproto/sync/getBlocks.js'
+import * as ComAtprotoSyncGetCheckout from './types/com/atproto/sync/getCheckout.js'
+import * as ComAtprotoSyncGetHead from './types/com/atproto/sync/getHead.js'
+import * as ComAtprotoSyncGetLatestCommit from './types/com/atproto/sync/getLatestCommit.js'
+import * as ComAtprotoSyncGetRecord from './types/com/atproto/sync/getRecord.js'
+import * as ComAtprotoSyncGetRepo from './types/com/atproto/sync/getRepo.js'
+import * as ComAtprotoSyncGetRepoStatus from './types/com/atproto/sync/getRepoStatus.js'
+import * as ComAtprotoSyncListBlobs from './types/com/atproto/sync/listBlobs.js'
+import * as ComAtprotoSyncListRepos from './types/com/atproto/sync/listRepos.js'
+import * as ComAtprotoSyncNotifyOfUpdate from './types/com/atproto/sync/notifyOfUpdate.js'
+import * as ComAtprotoSyncRequestCrawl from './types/com/atproto/sync/requestCrawl.js'
+import * as ComAtprotoSyncSubscribeRepos from './types/com/atproto/sync/subscribeRepos.js'
+import * as ComAtprotoTempAddReservedHandle from './types/com/atproto/temp/addReservedHandle.js'
+import * as ComAtprotoTempCheckSignupQueue from './types/com/atproto/temp/checkSignupQueue.js'
+import * as ComAtprotoTempFetchLabels from './types/com/atproto/temp/fetchLabels.js'
+import * as ComAtprotoTempRequestPhoneVerification from './types/com/atproto/temp/requestPhoneVerification.js'
+import * as AppBskyActorDefs from './types/app/bsky/actor/defs.js'
+import * as AppBskyActorGetPreferences from './types/app/bsky/actor/getPreferences.js'
+import * as AppBskyActorGetProfile from './types/app/bsky/actor/getProfile.js'
+import * as AppBskyActorGetProfiles from './types/app/bsky/actor/getProfiles.js'
+import * as AppBskyActorGetSuggestions from './types/app/bsky/actor/getSuggestions.js'
+import * as AppBskyActorProfile from './types/app/bsky/actor/profile.js'
+import * as AppBskyActorPutPreferences from './types/app/bsky/actor/putPreferences.js'
+import * as AppBskyActorSearchActors from './types/app/bsky/actor/searchActors.js'
+import * as AppBskyActorSearchActorsTypeahead from './types/app/bsky/actor/searchActorsTypeahead.js'
+import * as AppBskyEmbedDefs from './types/app/bsky/embed/defs.js'
+import * as AppBskyEmbedExternal from './types/app/bsky/embed/external.js'
+import * as AppBskyEmbedImages from './types/app/bsky/embed/images.js'
+import * as AppBskyEmbedRecord from './types/app/bsky/embed/record.js'
+import * as AppBskyEmbedRecordWithMedia from './types/app/bsky/embed/recordWithMedia.js'
+import * as AppBskyEmbedVideo from './types/app/bsky/embed/video.js'
+import * as AppBskyFeedDefs from './types/app/bsky/feed/defs.js'
+import * as AppBskyFeedDescribeFeedGenerator from './types/app/bsky/feed/describeFeedGenerator.js'
+import * as AppBskyFeedGenerator from './types/app/bsky/feed/generator.js'
+import * as AppBskyFeedGetActorFeeds from './types/app/bsky/feed/getActorFeeds.js'
+import * as AppBskyFeedGetActorLikes from './types/app/bsky/feed/getActorLikes.js'
+import * as AppBskyFeedGetAuthorFeed from './types/app/bsky/feed/getAuthorFeed.js'
+import * as AppBskyFeedGetFeed from './types/app/bsky/feed/getFeed.js'
+import * as AppBskyFeedGetFeedGenerator from './types/app/bsky/feed/getFeedGenerator.js'
+import * as AppBskyFeedGetFeedGenerators from './types/app/bsky/feed/getFeedGenerators.js'
+import * as AppBskyFeedGetFeedSkeleton from './types/app/bsky/feed/getFeedSkeleton.js'
+import * as AppBskyFeedGetLikes from './types/app/bsky/feed/getLikes.js'
+import * as AppBskyFeedGetListFeed from './types/app/bsky/feed/getListFeed.js'
+import * as AppBskyFeedGetPostThread from './types/app/bsky/feed/getPostThread.js'
+import * as AppBskyFeedGetPosts from './types/app/bsky/feed/getPosts.js'
+import * as AppBskyFeedGetQuotes from './types/app/bsky/feed/getQuotes.js'
+import * as AppBskyFeedGetRepostedBy from './types/app/bsky/feed/getRepostedBy.js'
+import * as AppBskyFeedGetSuggestedFeeds from './types/app/bsky/feed/getSuggestedFeeds.js'
+import * as AppBskyFeedGetTimeline from './types/app/bsky/feed/getTimeline.js'
+import * as AppBskyFeedLike from './types/app/bsky/feed/like.js'
+import * as AppBskyFeedPost from './types/app/bsky/feed/post.js'
+import * as AppBskyFeedPostgate from './types/app/bsky/feed/postgate.js'
+import * as AppBskyFeedRepost from './types/app/bsky/feed/repost.js'
+import * as AppBskyFeedSearchPosts from './types/app/bsky/feed/searchPosts.js'
+import * as AppBskyFeedSendInteractions from './types/app/bsky/feed/sendInteractions.js'
+import * as AppBskyFeedThreadgate from './types/app/bsky/feed/threadgate.js'
+import * as AppBskyGraphBlock from './types/app/bsky/graph/block.js'
+import * as AppBskyGraphDefs from './types/app/bsky/graph/defs.js'
+import * as AppBskyGraphFollow from './types/app/bsky/graph/follow.js'
+import * as AppBskyGraphGetActorStarterPacks from './types/app/bsky/graph/getActorStarterPacks.js'
+import * as AppBskyGraphGetBlocks from './types/app/bsky/graph/getBlocks.js'
+import * as AppBskyGraphGetFollowers from './types/app/bsky/graph/getFollowers.js'
+import * as AppBskyGraphGetFollows from './types/app/bsky/graph/getFollows.js'
+import * as AppBskyGraphGetKnownFollowers from './types/app/bsky/graph/getKnownFollowers.js'
+import * as AppBskyGraphGetList from './types/app/bsky/graph/getList.js'
+import * as AppBskyGraphGetListBlocks from './types/app/bsky/graph/getListBlocks.js'
+import * as AppBskyGraphGetListMutes from './types/app/bsky/graph/getListMutes.js'
+import * as AppBskyGraphGetLists from './types/app/bsky/graph/getLists.js'
+import * as AppBskyGraphGetMutes from './types/app/bsky/graph/getMutes.js'
+import * as AppBskyGraphGetRelationships from './types/app/bsky/graph/getRelationships.js'
+import * as AppBskyGraphGetStarterPack from './types/app/bsky/graph/getStarterPack.js'
+import * as AppBskyGraphGetStarterPacks from './types/app/bsky/graph/getStarterPacks.js'
+import * as AppBskyGraphGetSuggestedFollowsByActor from './types/app/bsky/graph/getSuggestedFollowsByActor.js'
+import * as AppBskyGraphList from './types/app/bsky/graph/list.js'
+import * as AppBskyGraphListblock from './types/app/bsky/graph/listblock.js'
+import * as AppBskyGraphListitem from './types/app/bsky/graph/listitem.js'
+import * as AppBskyGraphMuteActor from './types/app/bsky/graph/muteActor.js'
+import * as AppBskyGraphMuteActorList from './types/app/bsky/graph/muteActorList.js'
+import * as AppBskyGraphMuteThread from './types/app/bsky/graph/muteThread.js'
+import * as AppBskyGraphSearchStarterPacks from './types/app/bsky/graph/searchStarterPacks.js'
+import * as AppBskyGraphStarterpack from './types/app/bsky/graph/starterpack.js'
+import * as AppBskyGraphUnmuteActor from './types/app/bsky/graph/unmuteActor.js'
+import * as AppBskyGraphUnmuteActorList from './types/app/bsky/graph/unmuteActorList.js'
+import * as AppBskyGraphUnmuteThread from './types/app/bsky/graph/unmuteThread.js'
+import * as AppBskyLabelerDefs from './types/app/bsky/labeler/defs.js'
+import * as AppBskyLabelerGetServices from './types/app/bsky/labeler/getServices.js'
+import * as AppBskyLabelerService from './types/app/bsky/labeler/service.js'
+import * as AppBskyNotificationGetUnreadCount from './types/app/bsky/notification/getUnreadCount.js'
+import * as AppBskyNotificationListNotifications from './types/app/bsky/notification/listNotifications.js'
+import * as AppBskyNotificationPutPreferences from './types/app/bsky/notification/putPreferences.js'
+import * as AppBskyNotificationRegisterPush from './types/app/bsky/notification/registerPush.js'
+import * as AppBskyNotificationUpdateSeen from './types/app/bsky/notification/updateSeen.js'
+import * as AppBskyRichtextFacet from './types/app/bsky/richtext/facet.js'
+import * as AppBskyUnspeccedDefs from './types/app/bsky/unspecced/defs.js'
+import * as AppBskyUnspeccedGetConfig from './types/app/bsky/unspecced/getConfig.js'
+import * as AppBskyUnspeccedGetPopularFeedGenerators from './types/app/bsky/unspecced/getPopularFeedGenerators.js'
+import * as AppBskyUnspeccedGetSuggestionsSkeleton from './types/app/bsky/unspecced/getSuggestionsSkeleton.js'
+import * as AppBskyUnspeccedGetTaggedSuggestions from './types/app/bsky/unspecced/getTaggedSuggestions.js'
+import * as AppBskyUnspeccedGetTrendingTopics from './types/app/bsky/unspecced/getTrendingTopics.js'
+import * as AppBskyUnspeccedSearchActorsSkeleton from './types/app/bsky/unspecced/searchActorsSkeleton.js'
+import * as AppBskyUnspeccedSearchPostsSkeleton from './types/app/bsky/unspecced/searchPostsSkeleton.js'
+import * as AppBskyUnspeccedSearchStarterPacksSkeleton from './types/app/bsky/unspecced/searchStarterPacksSkeleton.js'
+import * as AppBskyVideoDefs from './types/app/bsky/video/defs.js'
+import * as AppBskyVideoGetJobStatus from './types/app/bsky/video/getJobStatus.js'
+import * as AppBskyVideoGetUploadLimits from './types/app/bsky/video/getUploadLimits.js'
+import * as AppBskyVideoUploadVideo from './types/app/bsky/video/uploadVideo.js'
+import * as ChatBskyActorDeclaration from './types/chat/bsky/actor/declaration.js'
+import * as ChatBskyActorDefs from './types/chat/bsky/actor/defs.js'
+import * as ChatBskyActorDeleteAccount from './types/chat/bsky/actor/deleteAccount.js'
+import * as ChatBskyActorExportAccountData from './types/chat/bsky/actor/exportAccountData.js'
+import * as ChatBskyConvoDefs from './types/chat/bsky/convo/defs.js'
+import * as ChatBskyConvoDeleteMessageForSelf from './types/chat/bsky/convo/deleteMessageForSelf.js'
+import * as ChatBskyConvoGetConvo from './types/chat/bsky/convo/getConvo.js'
+import * as ChatBskyConvoGetConvoForMembers from './types/chat/bsky/convo/getConvoForMembers.js'
+import * as ChatBskyConvoGetLog from './types/chat/bsky/convo/getLog.js'
+import * as ChatBskyConvoGetMessages from './types/chat/bsky/convo/getMessages.js'
+import * as ChatBskyConvoLeaveConvo from './types/chat/bsky/convo/leaveConvo.js'
+import * as ChatBskyConvoListConvos from './types/chat/bsky/convo/listConvos.js'
+import * as ChatBskyConvoMuteConvo from './types/chat/bsky/convo/muteConvo.js'
+import * as ChatBskyConvoSendMessage from './types/chat/bsky/convo/sendMessage.js'
+import * as ChatBskyConvoSendMessageBatch from './types/chat/bsky/convo/sendMessageBatch.js'
+import * as ChatBskyConvoUnmuteConvo from './types/chat/bsky/convo/unmuteConvo.js'
+import * as ChatBskyConvoUpdateRead from './types/chat/bsky/convo/updateRead.js'
+import * as ChatBskyModerationGetActorMetadata from './types/chat/bsky/moderation/getActorMetadata.js'
+import * as ChatBskyModerationGetMessageContext from './types/chat/bsky/moderation/getMessageContext.js'
+import * as ChatBskyModerationUpdateActorAccess from './types/chat/bsky/moderation/updateActorAccess.js'
+import * as ToolsOzoneCommunicationCreateTemplate from './types/tools/ozone/communication/createTemplate.js'
+import * as ToolsOzoneCommunicationDefs from './types/tools/ozone/communication/defs.js'
+import * as ToolsOzoneCommunicationDeleteTemplate from './types/tools/ozone/communication/deleteTemplate.js'
+import * as ToolsOzoneCommunicationListTemplates from './types/tools/ozone/communication/listTemplates.js'
+import * as ToolsOzoneCommunicationUpdateTemplate from './types/tools/ozone/communication/updateTemplate.js'
+import * as ToolsOzoneModerationDefs from './types/tools/ozone/moderation/defs.js'
+import * as ToolsOzoneModerationEmitEvent from './types/tools/ozone/moderation/emitEvent.js'
+import * as ToolsOzoneModerationGetEvent from './types/tools/ozone/moderation/getEvent.js'
+import * as ToolsOzoneModerationGetRecord from './types/tools/ozone/moderation/getRecord.js'
+import * as ToolsOzoneModerationGetRecords from './types/tools/ozone/moderation/getRecords.js'
+import * as ToolsOzoneModerationGetRepo from './types/tools/ozone/moderation/getRepo.js'
+import * as ToolsOzoneModerationGetRepos from './types/tools/ozone/moderation/getRepos.js'
+import * as ToolsOzoneModerationQueryEvents from './types/tools/ozone/moderation/queryEvents.js'
+import * as ToolsOzoneModerationQueryStatuses from './types/tools/ozone/moderation/queryStatuses.js'
+import * as ToolsOzoneModerationSearchRepos from './types/tools/ozone/moderation/searchRepos.js'
+import * as ToolsOzoneServerGetConfig from './types/tools/ozone/server/getConfig.js'
+import * as ToolsOzoneSetAddValues from './types/tools/ozone/set/addValues.js'
+import * as ToolsOzoneSetDefs from './types/tools/ozone/set/defs.js'
+import * as ToolsOzoneSetDeleteSet from './types/tools/ozone/set/deleteSet.js'
+import * as ToolsOzoneSetDeleteValues from './types/tools/ozone/set/deleteValues.js'
+import * as ToolsOzoneSetGetValues from './types/tools/ozone/set/getValues.js'
+import * as ToolsOzoneSetQuerySets from './types/tools/ozone/set/querySets.js'
+import * as ToolsOzoneSetUpsertSet from './types/tools/ozone/set/upsertSet.js'
+import * as ToolsOzoneSettingDefs from './types/tools/ozone/setting/defs.js'
+import * as ToolsOzoneSettingListOptions from './types/tools/ozone/setting/listOptions.js'
+import * as ToolsOzoneSettingRemoveOptions from './types/tools/ozone/setting/removeOptions.js'
+import * as ToolsOzoneSettingUpsertOption from './types/tools/ozone/setting/upsertOption.js'
+import * as ToolsOzoneSignatureDefs from './types/tools/ozone/signature/defs.js'
+import * as ToolsOzoneSignatureFindCorrelation from './types/tools/ozone/signature/findCorrelation.js'
+import * as ToolsOzoneSignatureFindRelatedAccounts from './types/tools/ozone/signature/findRelatedAccounts.js'
+import * as ToolsOzoneSignatureSearchAccounts from './types/tools/ozone/signature/searchAccounts.js'
+import * as ToolsOzoneTeamAddMember from './types/tools/ozone/team/addMember.js'
+import * as ToolsOzoneTeamDefs from './types/tools/ozone/team/defs.js'
+import * as ToolsOzoneTeamDeleteMember from './types/tools/ozone/team/deleteMember.js'
+import * as ToolsOzoneTeamListMembers from './types/tools/ozone/team/listMembers.js'
+import * as ToolsOzoneTeamUpdateMember from './types/tools/ozone/team/updateMember.js'
+
+export * as ComAtprotoAdminDefs from './types/com/atproto/admin/defs.js'
+export * as ComAtprotoAdminDeleteAccount from './types/com/atproto/admin/deleteAccount.js'
+export * as ComAtprotoAdminDisableAccountInvites from './types/com/atproto/admin/disableAccountInvites.js'
+export * as ComAtprotoAdminDisableInviteCodes from './types/com/atproto/admin/disableInviteCodes.js'
+export * as ComAtprotoAdminEnableAccountInvites from './types/com/atproto/admin/enableAccountInvites.js'
+export * as ComAtprotoAdminGetAccountInfo from './types/com/atproto/admin/getAccountInfo.js'
+export * as ComAtprotoAdminGetAccountInfos from './types/com/atproto/admin/getAccountInfos.js'
+export * as ComAtprotoAdminGetInviteCodes from './types/com/atproto/admin/getInviteCodes.js'
+export * as ComAtprotoAdminGetSubjectStatus from './types/com/atproto/admin/getSubjectStatus.js'
+export * as ComAtprotoAdminSearchAccounts from './types/com/atproto/admin/searchAccounts.js'
+export * as ComAtprotoAdminSendEmail from './types/com/atproto/admin/sendEmail.js'
+export * as ComAtprotoAdminUpdateAccountEmail from './types/com/atproto/admin/updateAccountEmail.js'
+export * as ComAtprotoAdminUpdateAccountHandle from './types/com/atproto/admin/updateAccountHandle.js'
+export * as ComAtprotoAdminUpdateAccountPassword from './types/com/atproto/admin/updateAccountPassword.js'
+export * as ComAtprotoAdminUpdateSubjectStatus from './types/com/atproto/admin/updateSubjectStatus.js'
+export * as ComAtprotoIdentityGetRecommendedDidCredentials from './types/com/atproto/identity/getRecommendedDidCredentials.js'
+export * as ComAtprotoIdentityRequestPlcOperationSignature from './types/com/atproto/identity/requestPlcOperationSignature.js'
+export * as ComAtprotoIdentityResolveHandle from './types/com/atproto/identity/resolveHandle.js'
+export * as ComAtprotoIdentitySignPlcOperation from './types/com/atproto/identity/signPlcOperation.js'
+export * as ComAtprotoIdentitySubmitPlcOperation from './types/com/atproto/identity/submitPlcOperation.js'
+export * as ComAtprotoIdentityUpdateHandle from './types/com/atproto/identity/updateHandle.js'
+export * as ComAtprotoLabelDefs from './types/com/atproto/label/defs.js'
+export * as ComAtprotoLabelQueryLabels from './types/com/atproto/label/queryLabels.js'
+export * as ComAtprotoLabelSubscribeLabels from './types/com/atproto/label/subscribeLabels.js'
+export * as ComAtprotoLexiconSchema from './types/com/atproto/lexicon/schema.js'
+export * as ComAtprotoModerationCreateReport from './types/com/atproto/moderation/createReport.js'
+export * as ComAtprotoModerationDefs from './types/com/atproto/moderation/defs.js'
+export * as ComAtprotoRepoApplyWrites from './types/com/atproto/repo/applyWrites.js'
+export * as ComAtprotoRepoCreateRecord from './types/com/atproto/repo/createRecord.js'
+export * as ComAtprotoRepoDefs from './types/com/atproto/repo/defs.js'
+export * as ComAtprotoRepoDeleteRecord from './types/com/atproto/repo/deleteRecord.js'
+export * as ComAtprotoRepoDescribeRepo from './types/com/atproto/repo/describeRepo.js'
+export * as ComAtprotoRepoGetRecord from './types/com/atproto/repo/getRecord.js'
+export * as ComAtprotoRepoImportRepo from './types/com/atproto/repo/importRepo.js'
+export * as ComAtprotoRepoListMissingBlobs from './types/com/atproto/repo/listMissingBlobs.js'
+export * as ComAtprotoRepoListRecords from './types/com/atproto/repo/listRecords.js'
+export * as ComAtprotoRepoPutRecord from './types/com/atproto/repo/putRecord.js'
+export * as ComAtprotoRepoStrongRef from './types/com/atproto/repo/strongRef.js'
+export * as ComAtprotoRepoUploadBlob from './types/com/atproto/repo/uploadBlob.js'
+export * as ComAtprotoServerActivateAccount from './types/com/atproto/server/activateAccount.js'
+export * as ComAtprotoServerCheckAccountStatus from './types/com/atproto/server/checkAccountStatus.js'
+export * as ComAtprotoServerConfirmEmail from './types/com/atproto/server/confirmEmail.js'
+export * as ComAtprotoServerCreateAccount from './types/com/atproto/server/createAccount.js'
+export * as ComAtprotoServerCreateAppPassword from './types/com/atproto/server/createAppPassword.js'
+export * as ComAtprotoServerCreateInviteCode from './types/com/atproto/server/createInviteCode.js'
+export * as ComAtprotoServerCreateInviteCodes from './types/com/atproto/server/createInviteCodes.js'
+export * as ComAtprotoServerCreateSession from './types/com/atproto/server/createSession.js'
+export * as ComAtprotoServerDeactivateAccount from './types/com/atproto/server/deactivateAccount.js'
+export * as ComAtprotoServerDefs from './types/com/atproto/server/defs.js'
+export * as ComAtprotoServerDeleteAccount from './types/com/atproto/server/deleteAccount.js'
+export * as ComAtprotoServerDeleteSession from './types/com/atproto/server/deleteSession.js'
+export * as ComAtprotoServerDescribeServer from './types/com/atproto/server/describeServer.js'
+export * as ComAtprotoServerGetAccountInviteCodes from './types/com/atproto/server/getAccountInviteCodes.js'
+export * as ComAtprotoServerGetServiceAuth from './types/com/atproto/server/getServiceAuth.js'
+export * as ComAtprotoServerGetSession from './types/com/atproto/server/getSession.js'
+export * as ComAtprotoServerListAppPasswords from './types/com/atproto/server/listAppPasswords.js'
+export * as ComAtprotoServerRefreshSession from './types/com/atproto/server/refreshSession.js'
+export * as ComAtprotoServerRequestAccountDelete from './types/com/atproto/server/requestAccountDelete.js'
+export * as ComAtprotoServerRequestEmailConfirmation from './types/com/atproto/server/requestEmailConfirmation.js'
+export * as ComAtprotoServerRequestEmailUpdate from './types/com/atproto/server/requestEmailUpdate.js'
+export * as ComAtprotoServerRequestPasswordReset from './types/com/atproto/server/requestPasswordReset.js'
+export * as ComAtprotoServerReserveSigningKey from './types/com/atproto/server/reserveSigningKey.js'
+export * as ComAtprotoServerResetPassword from './types/com/atproto/server/resetPassword.js'
+export * as ComAtprotoServerRevokeAppPassword from './types/com/atproto/server/revokeAppPassword.js'
+export * as ComAtprotoServerUpdateEmail from './types/com/atproto/server/updateEmail.js'
+export * as ComAtprotoSyncGetBlob from './types/com/atproto/sync/getBlob.js'
+export * as ComAtprotoSyncGetBlocks from './types/com/atproto/sync/getBlocks.js'
+export * as ComAtprotoSyncGetCheckout from './types/com/atproto/sync/getCheckout.js'
+export * as ComAtprotoSyncGetHead from './types/com/atproto/sync/getHead.js'
+export * as ComAtprotoSyncGetLatestCommit from './types/com/atproto/sync/getLatestCommit.js'
+export * as ComAtprotoSyncGetRecord from './types/com/atproto/sync/getRecord.js'
+export * as ComAtprotoSyncGetRepo from './types/com/atproto/sync/getRepo.js'
+export * as ComAtprotoSyncGetRepoStatus from './types/com/atproto/sync/getRepoStatus.js'
+export * as ComAtprotoSyncListBlobs from './types/com/atproto/sync/listBlobs.js'
+export * as ComAtprotoSyncListRepos from './types/com/atproto/sync/listRepos.js'
+export * as ComAtprotoSyncNotifyOfUpdate from './types/com/atproto/sync/notifyOfUpdate.js'
+export * as ComAtprotoSyncRequestCrawl from './types/com/atproto/sync/requestCrawl.js'
+export * as ComAtprotoSyncSubscribeRepos from './types/com/atproto/sync/subscribeRepos.js'
+export * as ComAtprotoTempAddReservedHandle from './types/com/atproto/temp/addReservedHandle.js'
+export * as ComAtprotoTempCheckSignupQueue from './types/com/atproto/temp/checkSignupQueue.js'
+export * as ComAtprotoTempFetchLabels from './types/com/atproto/temp/fetchLabels.js'
+export * as ComAtprotoTempRequestPhoneVerification from './types/com/atproto/temp/requestPhoneVerification.js'
+export * as AppBskyActorDefs from './types/app/bsky/actor/defs.js'
+export * as AppBskyActorGetPreferences from './types/app/bsky/actor/getPreferences.js'
+export * as AppBskyActorGetProfile from './types/app/bsky/actor/getProfile.js'
+export * as AppBskyActorGetProfiles from './types/app/bsky/actor/getProfiles.js'
+export * as AppBskyActorGetSuggestions from './types/app/bsky/actor/getSuggestions.js'
+export * as AppBskyActorProfile from './types/app/bsky/actor/profile.js'
+export * as AppBskyActorPutPreferences from './types/app/bsky/actor/putPreferences.js'
+export * as AppBskyActorSearchActors from './types/app/bsky/actor/searchActors.js'
+export * as AppBskyActorSearchActorsTypeahead from './types/app/bsky/actor/searchActorsTypeahead.js'
+export * as AppBskyEmbedDefs from './types/app/bsky/embed/defs.js'
+export * as AppBskyEmbedExternal from './types/app/bsky/embed/external.js'
+export * as AppBskyEmbedImages from './types/app/bsky/embed/images.js'
+export * as AppBskyEmbedRecord from './types/app/bsky/embed/record.js'
+export * as AppBskyEmbedRecordWithMedia from './types/app/bsky/embed/recordWithMedia.js'
+export * as AppBskyEmbedVideo from './types/app/bsky/embed/video.js'
+export * as AppBskyFeedDefs from './types/app/bsky/feed/defs.js'
+export * as AppBskyFeedDescribeFeedGenerator from './types/app/bsky/feed/describeFeedGenerator.js'
+export * as AppBskyFeedGenerator from './types/app/bsky/feed/generator.js'
+export * as AppBskyFeedGetActorFeeds from './types/app/bsky/feed/getActorFeeds.js'
+export * as AppBskyFeedGetActorLikes from './types/app/bsky/feed/getActorLikes.js'
+export * as AppBskyFeedGetAuthorFeed from './types/app/bsky/feed/getAuthorFeed.js'
+export * as AppBskyFeedGetFeed from './types/app/bsky/feed/getFeed.js'
+export * as AppBskyFeedGetFeedGenerator from './types/app/bsky/feed/getFeedGenerator.js'
+export * as AppBskyFeedGetFeedGenerators from './types/app/bsky/feed/getFeedGenerators.js'
+export * as AppBskyFeedGetFeedSkeleton from './types/app/bsky/feed/getFeedSkeleton.js'
+export * as AppBskyFeedGetLikes from './types/app/bsky/feed/getLikes.js'
+export * as AppBskyFeedGetListFeed from './types/app/bsky/feed/getListFeed.js'
+export * as AppBskyFeedGetPostThread from './types/app/bsky/feed/getPostThread.js'
+export * as AppBskyFeedGetPosts from './types/app/bsky/feed/getPosts.js'
+export * as AppBskyFeedGetQuotes from './types/app/bsky/feed/getQuotes.js'
+export * as AppBskyFeedGetRepostedBy from './types/app/bsky/feed/getRepostedBy.js'
+export * as AppBskyFeedGetSuggestedFeeds from './types/app/bsky/feed/getSuggestedFeeds.js'
+export * as AppBskyFeedGetTimeline from './types/app/bsky/feed/getTimeline.js'
+export * as AppBskyFeedLike from './types/app/bsky/feed/like.js'
+export * as AppBskyFeedPost from './types/app/bsky/feed/post.js'
+export * as AppBskyFeedPostgate from './types/app/bsky/feed/postgate.js'
+export * as AppBskyFeedRepost from './types/app/bsky/feed/repost.js'
+export * as AppBskyFeedSearchPosts from './types/app/bsky/feed/searchPosts.js'
+export * as AppBskyFeedSendInteractions from './types/app/bsky/feed/sendInteractions.js'
+export * as AppBskyFeedThreadgate from './types/app/bsky/feed/threadgate.js'
+export * as AppBskyGraphBlock from './types/app/bsky/graph/block.js'
+export * as AppBskyGraphDefs from './types/app/bsky/graph/defs.js'
+export * as AppBskyGraphFollow from './types/app/bsky/graph/follow.js'
+export * as AppBskyGraphGetActorStarterPacks from './types/app/bsky/graph/getActorStarterPacks.js'
+export * as AppBskyGraphGetBlocks from './types/app/bsky/graph/getBlocks.js'
+export * as AppBskyGraphGetFollowers from './types/app/bsky/graph/getFollowers.js'
+export * as AppBskyGraphGetFollows from './types/app/bsky/graph/getFollows.js'
+export * as AppBskyGraphGetKnownFollowers from './types/app/bsky/graph/getKnownFollowers.js'
+export * as AppBskyGraphGetList from './types/app/bsky/graph/getList.js'
+export * as AppBskyGraphGetListBlocks from './types/app/bsky/graph/getListBlocks.js'
+export * as AppBskyGraphGetListMutes from './types/app/bsky/graph/getListMutes.js'
+export * as AppBskyGraphGetLists from './types/app/bsky/graph/getLists.js'
+export * as AppBskyGraphGetMutes from './types/app/bsky/graph/getMutes.js'
+export * as AppBskyGraphGetRelationships from './types/app/bsky/graph/getRelationships.js'
+export * as AppBskyGraphGetStarterPack from './types/app/bsky/graph/getStarterPack.js'
+export * as AppBskyGraphGetStarterPacks from './types/app/bsky/graph/getStarterPacks.js'
+export * as AppBskyGraphGetSuggestedFollowsByActor from './types/app/bsky/graph/getSuggestedFollowsByActor.js'
+export * as AppBskyGraphList from './types/app/bsky/graph/list.js'
+export * as AppBskyGraphListblock from './types/app/bsky/graph/listblock.js'
+export * as AppBskyGraphListitem from './types/app/bsky/graph/listitem.js'
+export * as AppBskyGraphMuteActor from './types/app/bsky/graph/muteActor.js'
+export * as AppBskyGraphMuteActorList from './types/app/bsky/graph/muteActorList.js'
+export * as AppBskyGraphMuteThread from './types/app/bsky/graph/muteThread.js'
+export * as AppBskyGraphSearchStarterPacks from './types/app/bsky/graph/searchStarterPacks.js'
+export * as AppBskyGraphStarterpack from './types/app/bsky/graph/starterpack.js'
+export * as AppBskyGraphUnmuteActor from './types/app/bsky/graph/unmuteActor.js'
+export * as AppBskyGraphUnmuteActorList from './types/app/bsky/graph/unmuteActorList.js'
+export * as AppBskyGraphUnmuteThread from './types/app/bsky/graph/unmuteThread.js'
+export * as AppBskyLabelerDefs from './types/app/bsky/labeler/defs.js'
+export * as AppBskyLabelerGetServices from './types/app/bsky/labeler/getServices.js'
+export * as AppBskyLabelerService from './types/app/bsky/labeler/service.js'
+export * as AppBskyNotificationGetUnreadCount from './types/app/bsky/notification/getUnreadCount.js'
+export * as AppBskyNotificationListNotifications from './types/app/bsky/notification/listNotifications.js'
+export * as AppBskyNotificationPutPreferences from './types/app/bsky/notification/putPreferences.js'
+export * as AppBskyNotificationRegisterPush from './types/app/bsky/notification/registerPush.js'
+export * as AppBskyNotificationUpdateSeen from './types/app/bsky/notification/updateSeen.js'
+export * as AppBskyRichtextFacet from './types/app/bsky/richtext/facet.js'
+export * as AppBskyUnspeccedDefs from './types/app/bsky/unspecced/defs.js'
+export * as AppBskyUnspeccedGetConfig from './types/app/bsky/unspecced/getConfig.js'
+export * as AppBskyUnspeccedGetPopularFeedGenerators from './types/app/bsky/unspecced/getPopularFeedGenerators.js'
+export * as AppBskyUnspeccedGetSuggestionsSkeleton from './types/app/bsky/unspecced/getSuggestionsSkeleton.js'
+export * as AppBskyUnspeccedGetTaggedSuggestions from './types/app/bsky/unspecced/getTaggedSuggestions.js'
+export * as AppBskyUnspeccedGetTrendingTopics from './types/app/bsky/unspecced/getTrendingTopics.js'
+export * as AppBskyUnspeccedSearchActorsSkeleton from './types/app/bsky/unspecced/searchActorsSkeleton.js'
+export * as AppBskyUnspeccedSearchPostsSkeleton from './types/app/bsky/unspecced/searchPostsSkeleton.js'
+export * as AppBskyUnspeccedSearchStarterPacksSkeleton from './types/app/bsky/unspecced/searchStarterPacksSkeleton.js'
+export * as AppBskyVideoDefs from './types/app/bsky/video/defs.js'
+export * as AppBskyVideoGetJobStatus from './types/app/bsky/video/getJobStatus.js'
+export * as AppBskyVideoGetUploadLimits from './types/app/bsky/video/getUploadLimits.js'
+export * as AppBskyVideoUploadVideo from './types/app/bsky/video/uploadVideo.js'
+export * as ChatBskyActorDeclaration from './types/chat/bsky/actor/declaration.js'
+export * as ChatBskyActorDefs from './types/chat/bsky/actor/defs.js'
+export * as ChatBskyActorDeleteAccount from './types/chat/bsky/actor/deleteAccount.js'
+export * as ChatBskyActorExportAccountData from './types/chat/bsky/actor/exportAccountData.js'
+export * as ChatBskyConvoDefs from './types/chat/bsky/convo/defs.js'
+export * as ChatBskyConvoDeleteMessageForSelf from './types/chat/bsky/convo/deleteMessageForSelf.js'
+export * as ChatBskyConvoGetConvo from './types/chat/bsky/convo/getConvo.js'
+export * as ChatBskyConvoGetConvoForMembers from './types/chat/bsky/convo/getConvoForMembers.js'
+export * as ChatBskyConvoGetLog from './types/chat/bsky/convo/getLog.js'
+export * as ChatBskyConvoGetMessages from './types/chat/bsky/convo/getMessages.js'
+export * as ChatBskyConvoLeaveConvo from './types/chat/bsky/convo/leaveConvo.js'
+export * as ChatBskyConvoListConvos from './types/chat/bsky/convo/listConvos.js'
+export * as ChatBskyConvoMuteConvo from './types/chat/bsky/convo/muteConvo.js'
+export * as ChatBskyConvoSendMessage from './types/chat/bsky/convo/sendMessage.js'
+export * as ChatBskyConvoSendMessageBatch from './types/chat/bsky/convo/sendMessageBatch.js'
+export * as ChatBskyConvoUnmuteConvo from './types/chat/bsky/convo/unmuteConvo.js'
+export * as ChatBskyConvoUpdateRead from './types/chat/bsky/convo/updateRead.js'
+export * as ChatBskyModerationGetActorMetadata from './types/chat/bsky/moderation/getActorMetadata.js'
+export * as ChatBskyModerationGetMessageContext from './types/chat/bsky/moderation/getMessageContext.js'
+export * as ChatBskyModerationUpdateActorAccess from './types/chat/bsky/moderation/updateActorAccess.js'
+export * as ToolsOzoneCommunicationCreateTemplate from './types/tools/ozone/communication/createTemplate.js'
+export * as ToolsOzoneCommunicationDefs from './types/tools/ozone/communication/defs.js'
+export * as ToolsOzoneCommunicationDeleteTemplate from './types/tools/ozone/communication/deleteTemplate.js'
+export * as ToolsOzoneCommunicationListTemplates from './types/tools/ozone/communication/listTemplates.js'
+export * as ToolsOzoneCommunicationUpdateTemplate from './types/tools/ozone/communication/updateTemplate.js'
+export * as ToolsOzoneModerationDefs from './types/tools/ozone/moderation/defs.js'
+export * as ToolsOzoneModerationEmitEvent from './types/tools/ozone/moderation/emitEvent.js'
+export * as ToolsOzoneModerationGetEvent from './types/tools/ozone/moderation/getEvent.js'
+export * as ToolsOzoneModerationGetRecord from './types/tools/ozone/moderation/getRecord.js'
+export * as ToolsOzoneModerationGetRecords from './types/tools/ozone/moderation/getRecords.js'
+export * as ToolsOzoneModerationGetRepo from './types/tools/ozone/moderation/getRepo.js'
+export * as ToolsOzoneModerationGetRepos from './types/tools/ozone/moderation/getRepos.js'
+export * as ToolsOzoneModerationQueryEvents from './types/tools/ozone/moderation/queryEvents.js'
+export * as ToolsOzoneModerationQueryStatuses from './types/tools/ozone/moderation/queryStatuses.js'
+export * as ToolsOzoneModerationSearchRepos from './types/tools/ozone/moderation/searchRepos.js'
+export * as ToolsOzoneServerGetConfig from './types/tools/ozone/server/getConfig.js'
+export * as ToolsOzoneSetAddValues from './types/tools/ozone/set/addValues.js'
+export * as ToolsOzoneSetDefs from './types/tools/ozone/set/defs.js'
+export * as ToolsOzoneSetDeleteSet from './types/tools/ozone/set/deleteSet.js'
+export * as ToolsOzoneSetDeleteValues from './types/tools/ozone/set/deleteValues.js'
+export * as ToolsOzoneSetGetValues from './types/tools/ozone/set/getValues.js'
+export * as ToolsOzoneSetQuerySets from './types/tools/ozone/set/querySets.js'
+export * as ToolsOzoneSetUpsertSet from './types/tools/ozone/set/upsertSet.js'
+export * as ToolsOzoneSettingDefs from './types/tools/ozone/setting/defs.js'
+export * as ToolsOzoneSettingListOptions from './types/tools/ozone/setting/listOptions.js'
+export * as ToolsOzoneSettingRemoveOptions from './types/tools/ozone/setting/removeOptions.js'
+export * as ToolsOzoneSettingUpsertOption from './types/tools/ozone/setting/upsertOption.js'
+export * as ToolsOzoneSignatureDefs from './types/tools/ozone/signature/defs.js'
+export * as ToolsOzoneSignatureFindCorrelation from './types/tools/ozone/signature/findCorrelation.js'
+export * as ToolsOzoneSignatureFindRelatedAccounts from './types/tools/ozone/signature/findRelatedAccounts.js'
+export * as ToolsOzoneSignatureSearchAccounts from './types/tools/ozone/signature/searchAccounts.js'
+export * as ToolsOzoneTeamAddMember from './types/tools/ozone/team/addMember.js'
+export * as ToolsOzoneTeamDefs from './types/tools/ozone/team/defs.js'
+export * as ToolsOzoneTeamDeleteMember from './types/tools/ozone/team/deleteMember.js'
+export * as ToolsOzoneTeamListMembers from './types/tools/ozone/team/listMembers.js'
+export * as ToolsOzoneTeamUpdateMember from './types/tools/ozone/team/updateMember.js'
 
 export const COM_ATPROTO_MODERATION = {
   DefsReasonSpam: 'com.atproto.moderation.defs#reasonSpam',
@@ -854,7 +855,7 @@ export class SchemaRecord {
   }
 
   async list(
-    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
   ): Promise<{
     cursor?: string
     records: { uri: string; value: ComAtprotoLexiconSchema.Record }[]
@@ -867,7 +868,7 @@ export class SchemaRecord {
   }
 
   async get(
-    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
   ): Promise<{
     uri: string
     cid: string
@@ -881,25 +882,25 @@ export class SchemaRecord {
   }
 
   async create(
-    params: Omit<
+    params: OmitKey<
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
-    record: ComAtprotoLexiconSchema.Record,
+    record: Un$Typed<ComAtprotoLexiconSchema.Record>,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
-    record.$type = 'com.atproto.lexicon.schema'
+    const collection = 'com.atproto.lexicon.schema'
     const res = await this._client.call(
       'com.atproto.repo.createRecord',
       undefined,
-      { collection: 'com.atproto.lexicon.schema', ...params, record },
+      { collection, ...params, record: { ...record, $type: collection } },
       { encoding: 'application/json', headers },
     )
     return res.data
   }
 
   async delete(
-    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    params: OmitKey<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
     headers?: Record<string, string>,
   ): Promise<void> {
     await this._client.call(
@@ -1689,7 +1690,7 @@ export class ProfileRecord {
   }
 
   async list(
-    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
   ): Promise<{
     cursor?: string
     records: { uri: string; value: AppBskyActorProfile.Record }[]
@@ -1702,7 +1703,7 @@ export class ProfileRecord {
   }
 
   async get(
-    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
   ): Promise<{ uri: string; cid: string; value: AppBskyActorProfile.Record }> {
     const res = await this._client.call('com.atproto.repo.getRecord', {
       collection: 'app.bsky.actor.profile',
@@ -1712,25 +1713,30 @@ export class ProfileRecord {
   }
 
   async create(
-    params: Omit<
+    params: OmitKey<
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
-    record: AppBskyActorProfile.Record,
+    record: Un$Typed<AppBskyActorProfile.Record>,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
-    record.$type = 'app.bsky.actor.profile'
+    const collection = 'app.bsky.actor.profile'
     const res = await this._client.call(
       'com.atproto.repo.createRecord',
       undefined,
-      { collection: 'app.bsky.actor.profile', rkey: 'self', ...params, record },
+      {
+        collection,
+        rkey: 'self',
+        ...params,
+        record: { ...record, $type: collection },
+      },
       { encoding: 'application/json', headers },
     )
     return res.data
   }
 
   async delete(
-    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    params: OmitKey<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
     headers?: Record<string, string>,
   ): Promise<void> {
     await this._client.call(
@@ -1972,7 +1978,7 @@ export class GeneratorRecord {
   }
 
   async list(
-    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
   ): Promise<{
     cursor?: string
     records: { uri: string; value: AppBskyFeedGenerator.Record }[]
@@ -1985,7 +1991,7 @@ export class GeneratorRecord {
   }
 
   async get(
-    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
   ): Promise<{ uri: string; cid: string; value: AppBskyFeedGenerator.Record }> {
     const res = await this._client.call('com.atproto.repo.getRecord', {
       collection: 'app.bsky.feed.generator',
@@ -1995,25 +2001,25 @@ export class GeneratorRecord {
   }
 
   async create(
-    params: Omit<
+    params: OmitKey<
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
-    record: AppBskyFeedGenerator.Record,
+    record: Un$Typed<AppBskyFeedGenerator.Record>,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
-    record.$type = 'app.bsky.feed.generator'
+    const collection = 'app.bsky.feed.generator'
     const res = await this._client.call(
       'com.atproto.repo.createRecord',
       undefined,
-      { collection: 'app.bsky.feed.generator', ...params, record },
+      { collection, ...params, record: { ...record, $type: collection } },
       { encoding: 'application/json', headers },
     )
     return res.data
   }
 
   async delete(
-    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    params: OmitKey<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
     headers?: Record<string, string>,
   ): Promise<void> {
     await this._client.call(
@@ -2033,7 +2039,7 @@ export class LikeRecord {
   }
 
   async list(
-    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
   ): Promise<{
     cursor?: string
     records: { uri: string; value: AppBskyFeedLike.Record }[]
@@ -2046,7 +2052,7 @@ export class LikeRecord {
   }
 
   async get(
-    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
   ): Promise<{ uri: string; cid: string; value: AppBskyFeedLike.Record }> {
     const res = await this._client.call('com.atproto.repo.getRecord', {
       collection: 'app.bsky.feed.like',
@@ -2056,25 +2062,25 @@ export class LikeRecord {
   }
 
   async create(
-    params: Omit<
+    params: OmitKey<
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
-    record: AppBskyFeedLike.Record,
+    record: Un$Typed<AppBskyFeedLike.Record>,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
-    record.$type = 'app.bsky.feed.like'
+    const collection = 'app.bsky.feed.like'
     const res = await this._client.call(
       'com.atproto.repo.createRecord',
       undefined,
-      { collection: 'app.bsky.feed.like', ...params, record },
+      { collection, ...params, record: { ...record, $type: collection } },
       { encoding: 'application/json', headers },
     )
     return res.data
   }
 
   async delete(
-    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    params: OmitKey<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
     headers?: Record<string, string>,
   ): Promise<void> {
     await this._client.call(
@@ -2094,7 +2100,7 @@ export class PostRecord {
   }
 
   async list(
-    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
   ): Promise<{
     cursor?: string
     records: { uri: string; value: AppBskyFeedPost.Record }[]
@@ -2107,7 +2113,7 @@ export class PostRecord {
   }
 
   async get(
-    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
   ): Promise<{ uri: string; cid: string; value: AppBskyFeedPost.Record }> {
     const res = await this._client.call('com.atproto.repo.getRecord', {
       collection: 'app.bsky.feed.post',
@@ -2117,25 +2123,25 @@ export class PostRecord {
   }
 
   async create(
-    params: Omit<
+    params: OmitKey<
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
-    record: AppBskyFeedPost.Record,
+    record: Un$Typed<AppBskyFeedPost.Record>,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
-    record.$type = 'app.bsky.feed.post'
+    const collection = 'app.bsky.feed.post'
     const res = await this._client.call(
       'com.atproto.repo.createRecord',
       undefined,
-      { collection: 'app.bsky.feed.post', ...params, record },
+      { collection, ...params, record: { ...record, $type: collection } },
       { encoding: 'application/json', headers },
     )
     return res.data
   }
 
   async delete(
-    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    params: OmitKey<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
     headers?: Record<string, string>,
   ): Promise<void> {
     await this._client.call(
@@ -2155,7 +2161,7 @@ export class PostgateRecord {
   }
 
   async list(
-    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
   ): Promise<{
     cursor?: string
     records: { uri: string; value: AppBskyFeedPostgate.Record }[]
@@ -2168,7 +2174,7 @@ export class PostgateRecord {
   }
 
   async get(
-    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
   ): Promise<{ uri: string; cid: string; value: AppBskyFeedPostgate.Record }> {
     const res = await this._client.call('com.atproto.repo.getRecord', {
       collection: 'app.bsky.feed.postgate',
@@ -2178,25 +2184,25 @@ export class PostgateRecord {
   }
 
   async create(
-    params: Omit<
+    params: OmitKey<
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
-    record: AppBskyFeedPostgate.Record,
+    record: Un$Typed<AppBskyFeedPostgate.Record>,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
-    record.$type = 'app.bsky.feed.postgate'
+    const collection = 'app.bsky.feed.postgate'
     const res = await this._client.call(
       'com.atproto.repo.createRecord',
       undefined,
-      { collection: 'app.bsky.feed.postgate', ...params, record },
+      { collection, ...params, record: { ...record, $type: collection } },
       { encoding: 'application/json', headers },
     )
     return res.data
   }
 
   async delete(
-    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    params: OmitKey<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
     headers?: Record<string, string>,
   ): Promise<void> {
     await this._client.call(
@@ -2216,7 +2222,7 @@ export class RepostRecord {
   }
 
   async list(
-    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
   ): Promise<{
     cursor?: string
     records: { uri: string; value: AppBskyFeedRepost.Record }[]
@@ -2229,7 +2235,7 @@ export class RepostRecord {
   }
 
   async get(
-    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
   ): Promise<{ uri: string; cid: string; value: AppBskyFeedRepost.Record }> {
     const res = await this._client.call('com.atproto.repo.getRecord', {
       collection: 'app.bsky.feed.repost',
@@ -2239,25 +2245,25 @@ export class RepostRecord {
   }
 
   async create(
-    params: Omit<
+    params: OmitKey<
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
-    record: AppBskyFeedRepost.Record,
+    record: Un$Typed<AppBskyFeedRepost.Record>,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
-    record.$type = 'app.bsky.feed.repost'
+    const collection = 'app.bsky.feed.repost'
     const res = await this._client.call(
       'com.atproto.repo.createRecord',
       undefined,
-      { collection: 'app.bsky.feed.repost', ...params, record },
+      { collection, ...params, record: { ...record, $type: collection } },
       { encoding: 'application/json', headers },
     )
     return res.data
   }
 
   async delete(
-    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    params: OmitKey<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
     headers?: Record<string, string>,
   ): Promise<void> {
     await this._client.call(
@@ -2277,7 +2283,7 @@ export class ThreadgateRecord {
   }
 
   async list(
-    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
   ): Promise<{
     cursor?: string
     records: { uri: string; value: AppBskyFeedThreadgate.Record }[]
@@ -2290,7 +2296,7 @@ export class ThreadgateRecord {
   }
 
   async get(
-    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
   ): Promise<{
     uri: string
     cid: string
@@ -2304,25 +2310,25 @@ export class ThreadgateRecord {
   }
 
   async create(
-    params: Omit<
+    params: OmitKey<
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
-    record: AppBskyFeedThreadgate.Record,
+    record: Un$Typed<AppBskyFeedThreadgate.Record>,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
-    record.$type = 'app.bsky.feed.threadgate'
+    const collection = 'app.bsky.feed.threadgate'
     const res = await this._client.call(
       'com.atproto.repo.createRecord',
       undefined,
-      { collection: 'app.bsky.feed.threadgate', ...params, record },
+      { collection, ...params, record: { ...record, $type: collection } },
       { encoding: 'application/json', headers },
     )
     return res.data
   }
 
   async delete(
-    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    params: OmitKey<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
     headers?: Record<string, string>,
   ): Promise<void> {
     await this._client.call(
@@ -2583,7 +2589,7 @@ export class BlockRecord {
   }
 
   async list(
-    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
   ): Promise<{
     cursor?: string
     records: { uri: string; value: AppBskyGraphBlock.Record }[]
@@ -2596,7 +2602,7 @@ export class BlockRecord {
   }
 
   async get(
-    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
   ): Promise<{ uri: string; cid: string; value: AppBskyGraphBlock.Record }> {
     const res = await this._client.call('com.atproto.repo.getRecord', {
       collection: 'app.bsky.graph.block',
@@ -2606,25 +2612,25 @@ export class BlockRecord {
   }
 
   async create(
-    params: Omit<
+    params: OmitKey<
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
-    record: AppBskyGraphBlock.Record,
+    record: Un$Typed<AppBskyGraphBlock.Record>,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
-    record.$type = 'app.bsky.graph.block'
+    const collection = 'app.bsky.graph.block'
     const res = await this._client.call(
       'com.atproto.repo.createRecord',
       undefined,
-      { collection: 'app.bsky.graph.block', ...params, record },
+      { collection, ...params, record: { ...record, $type: collection } },
       { encoding: 'application/json', headers },
     )
     return res.data
   }
 
   async delete(
-    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    params: OmitKey<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
     headers?: Record<string, string>,
   ): Promise<void> {
     await this._client.call(
@@ -2644,7 +2650,7 @@ export class FollowRecord {
   }
 
   async list(
-    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
   ): Promise<{
     cursor?: string
     records: { uri: string; value: AppBskyGraphFollow.Record }[]
@@ -2657,7 +2663,7 @@ export class FollowRecord {
   }
 
   async get(
-    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
   ): Promise<{ uri: string; cid: string; value: AppBskyGraphFollow.Record }> {
     const res = await this._client.call('com.atproto.repo.getRecord', {
       collection: 'app.bsky.graph.follow',
@@ -2667,25 +2673,25 @@ export class FollowRecord {
   }
 
   async create(
-    params: Omit<
+    params: OmitKey<
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
-    record: AppBskyGraphFollow.Record,
+    record: Un$Typed<AppBskyGraphFollow.Record>,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
-    record.$type = 'app.bsky.graph.follow'
+    const collection = 'app.bsky.graph.follow'
     const res = await this._client.call(
       'com.atproto.repo.createRecord',
       undefined,
-      { collection: 'app.bsky.graph.follow', ...params, record },
+      { collection, ...params, record: { ...record, $type: collection } },
       { encoding: 'application/json', headers },
     )
     return res.data
   }
 
   async delete(
-    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    params: OmitKey<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
     headers?: Record<string, string>,
   ): Promise<void> {
     await this._client.call(
@@ -2705,7 +2711,7 @@ export class ListRecord {
   }
 
   async list(
-    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
   ): Promise<{
     cursor?: string
     records: { uri: string; value: AppBskyGraphList.Record }[]
@@ -2718,7 +2724,7 @@ export class ListRecord {
   }
 
   async get(
-    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
   ): Promise<{ uri: string; cid: string; value: AppBskyGraphList.Record }> {
     const res = await this._client.call('com.atproto.repo.getRecord', {
       collection: 'app.bsky.graph.list',
@@ -2728,25 +2734,25 @@ export class ListRecord {
   }
 
   async create(
-    params: Omit<
+    params: OmitKey<
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
-    record: AppBskyGraphList.Record,
+    record: Un$Typed<AppBskyGraphList.Record>,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
-    record.$type = 'app.bsky.graph.list'
+    const collection = 'app.bsky.graph.list'
     const res = await this._client.call(
       'com.atproto.repo.createRecord',
       undefined,
-      { collection: 'app.bsky.graph.list', ...params, record },
+      { collection, ...params, record: { ...record, $type: collection } },
       { encoding: 'application/json', headers },
     )
     return res.data
   }
 
   async delete(
-    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    params: OmitKey<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
     headers?: Record<string, string>,
   ): Promise<void> {
     await this._client.call(
@@ -2766,7 +2772,7 @@ export class ListblockRecord {
   }
 
   async list(
-    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
   ): Promise<{
     cursor?: string
     records: { uri: string; value: AppBskyGraphListblock.Record }[]
@@ -2779,7 +2785,7 @@ export class ListblockRecord {
   }
 
   async get(
-    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
   ): Promise<{
     uri: string
     cid: string
@@ -2793,25 +2799,25 @@ export class ListblockRecord {
   }
 
   async create(
-    params: Omit<
+    params: OmitKey<
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
-    record: AppBskyGraphListblock.Record,
+    record: Un$Typed<AppBskyGraphListblock.Record>,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
-    record.$type = 'app.bsky.graph.listblock'
+    const collection = 'app.bsky.graph.listblock'
     const res = await this._client.call(
       'com.atproto.repo.createRecord',
       undefined,
-      { collection: 'app.bsky.graph.listblock', ...params, record },
+      { collection, ...params, record: { ...record, $type: collection } },
       { encoding: 'application/json', headers },
     )
     return res.data
   }
 
   async delete(
-    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    params: OmitKey<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
     headers?: Record<string, string>,
   ): Promise<void> {
     await this._client.call(
@@ -2831,7 +2837,7 @@ export class ListitemRecord {
   }
 
   async list(
-    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
   ): Promise<{
     cursor?: string
     records: { uri: string; value: AppBskyGraphListitem.Record }[]
@@ -2844,7 +2850,7 @@ export class ListitemRecord {
   }
 
   async get(
-    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
   ): Promise<{ uri: string; cid: string; value: AppBskyGraphListitem.Record }> {
     const res = await this._client.call('com.atproto.repo.getRecord', {
       collection: 'app.bsky.graph.listitem',
@@ -2854,25 +2860,25 @@ export class ListitemRecord {
   }
 
   async create(
-    params: Omit<
+    params: OmitKey<
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
-    record: AppBskyGraphListitem.Record,
+    record: Un$Typed<AppBskyGraphListitem.Record>,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
-    record.$type = 'app.bsky.graph.listitem'
+    const collection = 'app.bsky.graph.listitem'
     const res = await this._client.call(
       'com.atproto.repo.createRecord',
       undefined,
-      { collection: 'app.bsky.graph.listitem', ...params, record },
+      { collection, ...params, record: { ...record, $type: collection } },
       { encoding: 'application/json', headers },
     )
     return res.data
   }
 
   async delete(
-    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    params: OmitKey<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
     headers?: Record<string, string>,
   ): Promise<void> {
     await this._client.call(
@@ -2892,7 +2898,7 @@ export class StarterpackRecord {
   }
 
   async list(
-    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
   ): Promise<{
     cursor?: string
     records: { uri: string; value: AppBskyGraphStarterpack.Record }[]
@@ -2905,7 +2911,7 @@ export class StarterpackRecord {
   }
 
   async get(
-    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
   ): Promise<{
     uri: string
     cid: string
@@ -2919,25 +2925,25 @@ export class StarterpackRecord {
   }
 
   async create(
-    params: Omit<
+    params: OmitKey<
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
-    record: AppBskyGraphStarterpack.Record,
+    record: Un$Typed<AppBskyGraphStarterpack.Record>,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
-    record.$type = 'app.bsky.graph.starterpack'
+    const collection = 'app.bsky.graph.starterpack'
     const res = await this._client.call(
       'com.atproto.repo.createRecord',
       undefined,
-      { collection: 'app.bsky.graph.starterpack', ...params, record },
+      { collection, ...params, record: { ...record, $type: collection } },
       { encoding: 'application/json', headers },
     )
     return res.data
   }
 
   async delete(
-    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    params: OmitKey<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
     headers?: Record<string, string>,
   ): Promise<void> {
     await this._client.call(
@@ -2979,7 +2985,7 @@ export class ServiceRecord {
   }
 
   async list(
-    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
   ): Promise<{
     cursor?: string
     records: { uri: string; value: AppBskyLabelerService.Record }[]
@@ -2992,7 +2998,7 @@ export class ServiceRecord {
   }
 
   async get(
-    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
   ): Promise<{
     uri: string
     cid: string
@@ -3006,22 +3012,22 @@ export class ServiceRecord {
   }
 
   async create(
-    params: Omit<
+    params: OmitKey<
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
-    record: AppBskyLabelerService.Record,
+    record: Un$Typed<AppBskyLabelerService.Record>,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
-    record.$type = 'app.bsky.labeler.service'
+    const collection = 'app.bsky.labeler.service'
     const res = await this._client.call(
       'com.atproto.repo.createRecord',
       undefined,
       {
-        collection: 'app.bsky.labeler.service',
+        collection,
         rkey: 'self',
         ...params,
-        record,
+        record: { ...record, $type: collection },
       },
       { encoding: 'application/json', headers },
     )
@@ -3029,7 +3035,7 @@ export class ServiceRecord {
   }
 
   async delete(
-    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    params: OmitKey<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
     headers?: Record<string, string>,
   ): Promise<void> {
     await this._client.call(
@@ -3328,7 +3334,7 @@ export class DeclarationRecord {
   }
 
   async list(
-    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
   ): Promise<{
     cursor?: string
     records: { uri: string; value: ChatBskyActorDeclaration.Record }[]
@@ -3341,7 +3347,7 @@ export class DeclarationRecord {
   }
 
   async get(
-    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+    params: OmitKey<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
   ): Promise<{
     uri: string
     cid: string
@@ -3355,22 +3361,22 @@ export class DeclarationRecord {
   }
 
   async create(
-    params: Omit<
+    params: OmitKey<
       ComAtprotoRepoCreateRecord.InputSchema,
       'collection' | 'record'
     >,
-    record: ChatBskyActorDeclaration.Record,
+    record: Un$Typed<ChatBskyActorDeclaration.Record>,
     headers?: Record<string, string>,
   ): Promise<{ uri: string; cid: string }> {
-    record.$type = 'chat.bsky.actor.declaration'
+    const collection = 'chat.bsky.actor.declaration'
     const res = await this._client.call(
       'com.atproto.repo.createRecord',
       undefined,
       {
-        collection: 'chat.bsky.actor.declaration',
+        collection,
         rkey: 'self',
         ...params,
-        record,
+        record: { ...record, $type: collection },
       },
       { encoding: 'application/json', headers },
     )
@@ -3378,7 +3384,7 @@ export class DeclarationRecord {
   }
 
   async delete(
-    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    params: OmitKey<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
     headers?: Record<string, string>,
   ): Promise<void> {
     await this._client.call(
diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
index 6e709774761..c2bfa933c42 100644
--- a/packages/api/src/client/lexicons.ts
+++ b/packages/api/src/client/lexicons.ts
@@ -1,7 +1,13 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
-import { LexiconDoc, Lexicons } from '@atproto/lexicon'
+import {
+  LexiconDoc,
+  Lexicons,
+  ValidationError,
+  ValidationResult,
+} from '@atproto/lexicon'
+import { $Typed, is$typed, maybe$typed } from './util.js'
 
 export const schemaDict = {
   ComAtprotoAdminDefs: {
@@ -13871,8 +13877,37 @@ export const schemaDict = {
   },
 } as const satisfies Record<string, LexiconDoc>
 
-export const schemas = Object.values(schemaDict)
+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 = {
   ComAtprotoAdminDefs: 'com.atproto.admin.defs',
   ComAtprotoAdminDeleteAccount: 'com.atproto.admin.deleteAccount',
@@ -14124,4 +14159,4 @@ export const ids = {
   ToolsOzoneTeamDeleteMember: 'tools.ozone.team.deleteMember',
   ToolsOzoneTeamListMembers: 'tools.ozone.team.listMembers',
   ToolsOzoneTeamUpdateMember: 'tools.ozone.team.updateMember',
-}
+} as const
diff --git a/packages/api/src/client/types/app/bsky/actor/defs.ts b/packages/api/src/client/types/app/bsky/actor/defs.ts
index 84234ed2d08..d905d955114 100644
--- a/packages/api/src/client/types/app/bsky/actor/defs.ts
+++ b/packages/api/src/client/types/app/bsky/actor/defs.ts
@@ -2,16 +2,21 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as AppBskyGraphDefs from '../graph/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
-import * as AppBskyFeedThreadgate from '../feed/threadgate'
-import * as AppBskyFeedPostgate from '../feed/postgate'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as AppBskyGraphDefs from '../graph/defs.js'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
+import type * as AppBskyFeedThreadgate from '../feed/threadgate.js'
+import type * as AppBskyFeedPostgate from '../feed/postgate.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.defs'
 
 export interface ProfileViewBasic {
+  $type?: 'app.bsky.actor.defs#profileViewBasic'
   did: string
   handle: string
   displayName?: string
@@ -20,22 +25,20 @@ export interface ProfileViewBasic {
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
   createdAt?: string
-  [k: string]: unknown
 }
 
-export function isProfileViewBasic(v: unknown): v is ProfileViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileViewBasic'
-  )
+const hashProfileViewBasic = 'profileViewBasic'
+
+export function isProfileViewBasic<V>(v: V) {
+  return is$typed(v, id, hashProfileViewBasic)
 }
 
-export function validateProfileViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileViewBasic', v)
+export function validateProfileViewBasic<V>(v: V) {
+  return validate<ProfileViewBasic & V>(v, id, hashProfileViewBasic)
 }
 
 export interface ProfileView {
+  $type?: 'app.bsky.actor.defs#profileView'
   did: string
   handle: string
   displayName?: string
@@ -46,22 +49,20 @@ export interface ProfileView {
   createdAt?: string
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isProfileView(v: unknown): v is ProfileView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileView'
-  )
+const hashProfileView = 'profileView'
+
+export function isProfileView<V>(v: V) {
+  return is$typed(v, id, hashProfileView)
 }
 
-export function validateProfileView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileView', v)
+export function validateProfileView<V>(v: V) {
+  return validate<ProfileView & V>(v, id, hashProfileView)
 }
 
 export interface ProfileViewDetailed {
+  $type?: 'app.bsky.actor.defs#profileViewDetailed'
   did: string
   handle: string
   displayName?: string
@@ -78,63 +79,55 @@ export interface ProfileViewDetailed {
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
   pinnedPost?: ComAtprotoRepoStrongRef.Main
-  [k: string]: unknown
 }
 
-export function isProfileViewDetailed(v: unknown): v is ProfileViewDetailed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileViewDetailed'
-  )
+const hashProfileViewDetailed = 'profileViewDetailed'
+
+export function isProfileViewDetailed<V>(v: V) {
+  return is$typed(v, id, hashProfileViewDetailed)
 }
 
-export function validateProfileViewDetailed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileViewDetailed', v)
+export function validateProfileViewDetailed<V>(v: V) {
+  return validate<ProfileViewDetailed & V>(v, id, hashProfileViewDetailed)
 }
 
 export interface ProfileAssociated {
+  $type?: 'app.bsky.actor.defs#profileAssociated'
   lists?: number
   feedgens?: number
   starterPacks?: number
   labeler?: boolean
   chat?: ProfileAssociatedChat
-  [k: string]: unknown
 }
 
-export function isProfileAssociated(v: unknown): v is ProfileAssociated {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileAssociated'
-  )
+const hashProfileAssociated = 'profileAssociated'
+
+export function isProfileAssociated<V>(v: V) {
+  return is$typed(v, id, hashProfileAssociated)
 }
 
-export function validateProfileAssociated(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileAssociated', v)
+export function validateProfileAssociated<V>(v: V) {
+  return validate<ProfileAssociated & V>(v, id, hashProfileAssociated)
 }
 
 export interface ProfileAssociatedChat {
+  $type?: 'app.bsky.actor.defs#profileAssociatedChat'
   allowIncoming: 'all' | 'none' | 'following' | (string & {})
-  [k: string]: unknown
 }
 
-export function isProfileAssociatedChat(
-  v: unknown,
-): v is ProfileAssociatedChat {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileAssociatedChat'
-  )
+const hashProfileAssociatedChat = 'profileAssociatedChat'
+
+export function isProfileAssociatedChat<V>(v: V) {
+  return is$typed(v, id, hashProfileAssociatedChat)
 }
 
-export function validateProfileAssociatedChat(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileAssociatedChat', v)
+export function validateProfileAssociatedChat<V>(v: V) {
+  return validate<ProfileAssociatedChat & V>(v, id, hashProfileAssociatedChat)
 }
 
 /** Metadata about the requesting account's relationship with the subject account. Only has meaningful content for authed requests. */
 export interface ViewerState {
+  $type?: 'app.bsky.actor.defs#viewerState'
   muted?: boolean
   mutedByList?: AppBskyGraphDefs.ListViewBasic
   blockedBy?: boolean
@@ -143,169 +136,153 @@ export interface ViewerState {
   following?: string
   followedBy?: string
   knownFollowers?: KnownFollowers
-  [k: string]: unknown
 }
 
-export function isViewerState(v: unknown): v is ViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#viewerState'
-  )
+const hashViewerState = 'viewerState'
+
+export function isViewerState<V>(v: V) {
+  return is$typed(v, id, hashViewerState)
 }
 
-export function validateViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#viewerState', v)
+export function validateViewerState<V>(v: V) {
+  return validate<ViewerState & V>(v, id, hashViewerState)
 }
 
 /** The subject's followers whom you also follow */
 export interface KnownFollowers {
+  $type?: 'app.bsky.actor.defs#knownFollowers'
   count: number
   followers: ProfileViewBasic[]
-  [k: string]: unknown
 }
 
-export function isKnownFollowers(v: unknown): v is KnownFollowers {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#knownFollowers'
-  )
+const hashKnownFollowers = 'knownFollowers'
+
+export function isKnownFollowers<V>(v: V) {
+  return is$typed(v, id, hashKnownFollowers)
 }
 
-export function validateKnownFollowers(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#knownFollowers', v)
+export function validateKnownFollowers<V>(v: V) {
+  return validate<KnownFollowers & V>(v, id, hashKnownFollowers)
 }
 
 export type Preferences = (
-  | AdultContentPref
-  | ContentLabelPref
-  | SavedFeedsPref
-  | SavedFeedsPrefV2
-  | PersonalDetailsPref
-  | FeedViewPref
-  | ThreadViewPref
-  | InterestsPref
-  | MutedWordsPref
-  | HiddenPostsPref
-  | BskyAppStatePref
-  | LabelersPref
-  | PostInteractionSettingsPref
-  | { $type: string; [k: string]: unknown }
+  | $Typed<AdultContentPref>
+  | $Typed<ContentLabelPref>
+  | $Typed<SavedFeedsPref>
+  | $Typed<SavedFeedsPrefV2>
+  | $Typed<PersonalDetailsPref>
+  | $Typed<FeedViewPref>
+  | $Typed<ThreadViewPref>
+  | $Typed<InterestsPref>
+  | $Typed<MutedWordsPref>
+  | $Typed<HiddenPostsPref>
+  | $Typed<BskyAppStatePref>
+  | $Typed<LabelersPref>
+  | $Typed<PostInteractionSettingsPref>
+  | { $type: string }
 )[]
 
 export interface AdultContentPref {
+  $type?: 'app.bsky.actor.defs#adultContentPref'
   enabled: boolean
-  [k: string]: unknown
 }
 
-export function isAdultContentPref(v: unknown): v is AdultContentPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#adultContentPref'
-  )
+const hashAdultContentPref = 'adultContentPref'
+
+export function isAdultContentPref<V>(v: V) {
+  return is$typed(v, id, hashAdultContentPref)
 }
 
-export function validateAdultContentPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#adultContentPref', v)
+export function validateAdultContentPref<V>(v: V) {
+  return validate<AdultContentPref & V>(v, id, hashAdultContentPref)
 }
 
 export interface ContentLabelPref {
+  $type?: 'app.bsky.actor.defs#contentLabelPref'
   /** Which labeler does this preference apply to? If undefined, applies globally. */
   labelerDid?: string
   label: string
   visibility: 'ignore' | 'show' | 'warn' | 'hide' | (string & {})
-  [k: string]: unknown
 }
 
-export function isContentLabelPref(v: unknown): v is ContentLabelPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#contentLabelPref'
-  )
+const hashContentLabelPref = 'contentLabelPref'
+
+export function isContentLabelPref<V>(v: V) {
+  return is$typed(v, id, hashContentLabelPref)
 }
 
-export function validateContentLabelPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#contentLabelPref', v)
+export function validateContentLabelPref<V>(v: V) {
+  return validate<ContentLabelPref & V>(v, id, hashContentLabelPref)
 }
 
 export interface SavedFeed {
+  $type?: 'app.bsky.actor.defs#savedFeed'
   id: string
   type: 'feed' | 'list' | 'timeline' | (string & {})
   value: string
   pinned: boolean
-  [k: string]: unknown
 }
 
-export function isSavedFeed(v: unknown): v is SavedFeed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeed'
-  )
+const hashSavedFeed = 'savedFeed'
+
+export function isSavedFeed<V>(v: V) {
+  return is$typed(v, id, hashSavedFeed)
 }
 
-export function validateSavedFeed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeed', v)
+export function validateSavedFeed<V>(v: V) {
+  return validate<SavedFeed & V>(v, id, hashSavedFeed)
 }
 
 export interface SavedFeedsPrefV2 {
+  $type?: 'app.bsky.actor.defs#savedFeedsPrefV2'
   items: SavedFeed[]
-  [k: string]: unknown
 }
 
-export function isSavedFeedsPrefV2(v: unknown): v is SavedFeedsPrefV2 {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeedsPrefV2'
-  )
+const hashSavedFeedsPrefV2 = 'savedFeedsPrefV2'
+
+export function isSavedFeedsPrefV2<V>(v: V) {
+  return is$typed(v, id, hashSavedFeedsPrefV2)
 }
 
-export function validateSavedFeedsPrefV2(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeedsPrefV2', v)
+export function validateSavedFeedsPrefV2<V>(v: V) {
+  return validate<SavedFeedsPrefV2 & V>(v, id, hashSavedFeedsPrefV2)
 }
 
 export interface SavedFeedsPref {
+  $type?: 'app.bsky.actor.defs#savedFeedsPref'
   pinned: string[]
   saved: string[]
   timelineIndex?: number
-  [k: string]: unknown
 }
 
-export function isSavedFeedsPref(v: unknown): v is SavedFeedsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeedsPref'
-  )
+const hashSavedFeedsPref = 'savedFeedsPref'
+
+export function isSavedFeedsPref<V>(v: V) {
+  return is$typed(v, id, hashSavedFeedsPref)
 }
 
-export function validateSavedFeedsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeedsPref', v)
+export function validateSavedFeedsPref<V>(v: V) {
+  return validate<SavedFeedsPref & V>(v, id, hashSavedFeedsPref)
 }
 
 export interface PersonalDetailsPref {
+  $type?: 'app.bsky.actor.defs#personalDetailsPref'
   /** The birth date of account owner. */
   birthDate?: string
-  [k: string]: unknown
 }
 
-export function isPersonalDetailsPref(v: unknown): v is PersonalDetailsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#personalDetailsPref'
-  )
+const hashPersonalDetailsPref = 'personalDetailsPref'
+
+export function isPersonalDetailsPref<V>(v: V) {
+  return is$typed(v, id, hashPersonalDetailsPref)
 }
 
-export function validatePersonalDetailsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#personalDetailsPref', v)
+export function validatePersonalDetailsPref<V>(v: V) {
+  return validate<PersonalDetailsPref & V>(v, id, hashPersonalDetailsPref)
 }
 
 export interface FeedViewPref {
+  $type?: 'app.bsky.actor.defs#feedViewPref'
   /** The URI of the feed, or an identifier which describes the feed. */
   feed: string
   /** Hide replies in the feed. */
@@ -318,22 +295,20 @@ export interface FeedViewPref {
   hideReposts?: boolean
   /** Hide quote posts in the feed. */
   hideQuotePosts?: boolean
-  [k: string]: unknown
 }
 
-export function isFeedViewPref(v: unknown): v is FeedViewPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#feedViewPref'
-  )
+const hashFeedViewPref = 'feedViewPref'
+
+export function isFeedViewPref<V>(v: V) {
+  return is$typed(v, id, hashFeedViewPref)
 }
 
-export function validateFeedViewPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#feedViewPref', v)
+export function validateFeedViewPref<V>(v: V) {
+  return validate<FeedViewPref & V>(v, id, hashFeedViewPref)
 }
 
 export interface ThreadViewPref {
+  $type?: 'app.bsky.actor.defs#threadViewPref'
   /** Sorting mode for threads. */
   sort?:
     | 'oldest'
@@ -344,43 +319,39 @@ export interface ThreadViewPref {
     | (string & {})
   /** Show followed users at the top of all replies. */
   prioritizeFollowedUsers?: boolean
-  [k: string]: unknown
 }
 
-export function isThreadViewPref(v: unknown): v is ThreadViewPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#threadViewPref'
-  )
+const hashThreadViewPref = 'threadViewPref'
+
+export function isThreadViewPref<V>(v: V) {
+  return is$typed(v, id, hashThreadViewPref)
 }
 
-export function validateThreadViewPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#threadViewPref', v)
+export function validateThreadViewPref<V>(v: V) {
+  return validate<ThreadViewPref & V>(v, id, hashThreadViewPref)
 }
 
 export interface InterestsPref {
+  $type?: 'app.bsky.actor.defs#interestsPref'
   /** A list of tags which describe the account owner's interests gathered during onboarding. */
   tags: string[]
-  [k: string]: unknown
 }
 
-export function isInterestsPref(v: unknown): v is InterestsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#interestsPref'
-  )
+const hashInterestsPref = 'interestsPref'
+
+export function isInterestsPref<V>(v: V) {
+  return is$typed(v, id, hashInterestsPref)
 }
 
-export function validateInterestsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#interestsPref', v)
+export function validateInterestsPref<V>(v: V) {
+  return validate<InterestsPref & V>(v, id, hashInterestsPref)
 }
 
 export type MutedWordTarget = 'content' | 'tag' | (string & {})
 
 /** A word that the account owner has muted. */
 export interface MutedWord {
+  $type?: 'app.bsky.actor.defs#mutedWord'
   id?: string
   /** The muted word itself. */
   value: string
@@ -390,182 +361,165 @@ export interface MutedWord {
   actorTarget: 'all' | 'exclude-following' | (string & {})
   /** The date and time at which the muted word will expire and no longer be applied. */
   expiresAt?: string
-  [k: string]: unknown
 }
 
-export function isMutedWord(v: unknown): v is MutedWord {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#mutedWord'
-  )
+const hashMutedWord = 'mutedWord'
+
+export function isMutedWord<V>(v: V) {
+  return is$typed(v, id, hashMutedWord)
 }
 
-export function validateMutedWord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#mutedWord', v)
+export function validateMutedWord<V>(v: V) {
+  return validate<MutedWord & V>(v, id, hashMutedWord)
 }
 
 export interface MutedWordsPref {
+  $type?: 'app.bsky.actor.defs#mutedWordsPref'
   /** A list of words the account owner has muted. */
   items: MutedWord[]
-  [k: string]: unknown
 }
 
-export function isMutedWordsPref(v: unknown): v is MutedWordsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#mutedWordsPref'
-  )
+const hashMutedWordsPref = 'mutedWordsPref'
+
+export function isMutedWordsPref<V>(v: V) {
+  return is$typed(v, id, hashMutedWordsPref)
 }
 
-export function validateMutedWordsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#mutedWordsPref', v)
+export function validateMutedWordsPref<V>(v: V) {
+  return validate<MutedWordsPref & V>(v, id, hashMutedWordsPref)
 }
 
 export interface HiddenPostsPref {
+  $type?: 'app.bsky.actor.defs#hiddenPostsPref'
   /** A list of URIs of posts the account owner has hidden. */
   items: string[]
-  [k: string]: unknown
 }
 
-export function isHiddenPostsPref(v: unknown): v is HiddenPostsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#hiddenPostsPref'
-  )
+const hashHiddenPostsPref = 'hiddenPostsPref'
+
+export function isHiddenPostsPref<V>(v: V) {
+  return is$typed(v, id, hashHiddenPostsPref)
 }
 
-export function validateHiddenPostsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#hiddenPostsPref', v)
+export function validateHiddenPostsPref<V>(v: V) {
+  return validate<HiddenPostsPref & V>(v, id, hashHiddenPostsPref)
 }
 
 export interface LabelersPref {
+  $type?: 'app.bsky.actor.defs#labelersPref'
   labelers: LabelerPrefItem[]
-  [k: string]: unknown
 }
 
-export function isLabelersPref(v: unknown): v is LabelersPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#labelersPref'
-  )
+const hashLabelersPref = 'labelersPref'
+
+export function isLabelersPref<V>(v: V) {
+  return is$typed(v, id, hashLabelersPref)
 }
 
-export function validateLabelersPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#labelersPref', v)
+export function validateLabelersPref<V>(v: V) {
+  return validate<LabelersPref & V>(v, id, hashLabelersPref)
 }
 
 export interface LabelerPrefItem {
+  $type?: 'app.bsky.actor.defs#labelerPrefItem'
   did: string
-  [k: string]: unknown
 }
 
-export function isLabelerPrefItem(v: unknown): v is LabelerPrefItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#labelerPrefItem'
-  )
+const hashLabelerPrefItem = 'labelerPrefItem'
+
+export function isLabelerPrefItem<V>(v: V) {
+  return is$typed(v, id, hashLabelerPrefItem)
 }
 
-export function validateLabelerPrefItem(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#labelerPrefItem', v)
+export function validateLabelerPrefItem<V>(v: V) {
+  return validate<LabelerPrefItem & V>(v, id, hashLabelerPrefItem)
 }
 
 /** A grab bag of state that's specific to the bsky.app program. Third-party apps shouldn't use this. */
 export interface BskyAppStatePref {
+  $type?: 'app.bsky.actor.defs#bskyAppStatePref'
   activeProgressGuide?: BskyAppProgressGuide
   /** An array of tokens which identify nudges (modals, popups, tours, highlight dots) that should be shown to the user. */
   queuedNudges?: string[]
   /** Storage for NUXs the user has encountered. */
   nuxs?: Nux[]
-  [k: string]: unknown
 }
 
-export function isBskyAppStatePref(v: unknown): v is BskyAppStatePref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#bskyAppStatePref'
-  )
+const hashBskyAppStatePref = 'bskyAppStatePref'
+
+export function isBskyAppStatePref<V>(v: V) {
+  return is$typed(v, id, hashBskyAppStatePref)
 }
 
-export function validateBskyAppStatePref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#bskyAppStatePref', v)
+export function validateBskyAppStatePref<V>(v: V) {
+  return validate<BskyAppStatePref & V>(v, id, hashBskyAppStatePref)
 }
 
 /** If set, an active progress guide. Once completed, can be set to undefined. Should have unspecced fields tracking progress. */
 export interface BskyAppProgressGuide {
+  $type?: 'app.bsky.actor.defs#bskyAppProgressGuide'
   guide: string
-  [k: string]: unknown
 }
 
-export function isBskyAppProgressGuide(v: unknown): v is BskyAppProgressGuide {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#bskyAppProgressGuide'
-  )
+const hashBskyAppProgressGuide = 'bskyAppProgressGuide'
+
+export function isBskyAppProgressGuide<V>(v: V) {
+  return is$typed(v, id, hashBskyAppProgressGuide)
 }
 
-export function validateBskyAppProgressGuide(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#bskyAppProgressGuide', v)
+export function validateBskyAppProgressGuide<V>(v: V) {
+  return validate<BskyAppProgressGuide & V>(v, id, hashBskyAppProgressGuide)
 }
 
 /** A new user experiences (NUX) storage object */
 export interface Nux {
+  $type?: 'app.bsky.actor.defs#nux'
   id: string
   completed: boolean
   /** Arbitrary data for the NUX. The structure is defined by the NUX itself. Limited to 300 characters. */
   data?: string
   /** The date and time at which the NUX will expire and should be considered completed. */
   expiresAt?: string
-  [k: string]: unknown
 }
 
-export function isNux(v: unknown): v is Nux {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.actor.defs#nux'
-  )
+const hashNux = 'nux'
+
+export function isNux<V>(v: V) {
+  return is$typed(v, id, hashNux)
 }
 
-export function validateNux(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#nux', v)
+export function validateNux<V>(v: V) {
+  return validate<Nux & V>(v, id, hashNux)
 }
 
 /** Default post interaction settings for the account. These values should be applied as default values when creating new posts. These refs should mirror the threadgate and postgate records exactly. */
 export interface PostInteractionSettingsPref {
+  $type?: 'app.bsky.actor.defs#postInteractionSettingsPref'
   /** Matches threadgate record. List of rules defining who can reply to this users posts. If value is an empty array, no one can reply. If value is undefined, anyone can reply. */
   threadgateAllowRules?: (
-    | AppBskyFeedThreadgate.MentionRule
-    | AppBskyFeedThreadgate.FollowerRule
-    | AppBskyFeedThreadgate.FollowingRule
-    | AppBskyFeedThreadgate.ListRule
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyFeedThreadgate.MentionRule>
+    | $Typed<AppBskyFeedThreadgate.FollowerRule>
+    | $Typed<AppBskyFeedThreadgate.FollowingRule>
+    | $Typed<AppBskyFeedThreadgate.ListRule>
+    | { $type: string }
   )[]
   /** Matches postgate record. List of rules defining who can embed this users posts. If value is an empty array or is undefined, no particular rules apply and anyone can embed. */
   postgateEmbeddingRules?: (
-    | AppBskyFeedPostgate.DisableRule
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyFeedPostgate.DisableRule>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
-export function isPostInteractionSettingsPref(
-  v: unknown,
-): v is PostInteractionSettingsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#postInteractionSettingsPref'
-  )
+const hashPostInteractionSettingsPref = 'postInteractionSettingsPref'
+
+export function isPostInteractionSettingsPref<V>(v: V) {
+  return is$typed(v, id, hashPostInteractionSettingsPref)
 }
 
-export function validatePostInteractionSettingsPref(
-  v: unknown,
-): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#postInteractionSettingsPref', v)
+export function validatePostInteractionSettingsPref<V>(v: V) {
+  return validate<PostInteractionSettingsPref & V>(
+    v,
+    id,
+    hashPostInteractionSettingsPref,
+  )
 }
diff --git a/packages/api/src/client/types/app/bsky/actor/getPreferences.ts b/packages/api/src/client/types/app/bsky/actor/getPreferences.ts
index 6cc35cc3c62..93d459356af 100644
--- a/packages/api/src/client/types/app/bsky/actor/getPreferences.ts
+++ b/packages/api/src/client/types/app/bsky/actor/getPreferences.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyActorDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.getPreferences'
 
 export interface QueryParams {}
 
@@ -14,7 +18,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   preferences: AppBskyActorDefs.Preferences
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/actor/getProfile.ts b/packages/api/src/client/types/app/bsky/actor/getProfile.ts
index 13618b6c2f7..89a28a6e77d 100644
--- a/packages/api/src/client/types/app/bsky/actor/getProfile.ts
+++ b/packages/api/src/client/types/app/bsky/actor/getProfile.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyActorDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.getProfile'
 
 export interface QueryParams {
   /** Handle or DID of account to fetch profile of. */
diff --git a/packages/api/src/client/types/app/bsky/actor/getProfiles.ts b/packages/api/src/client/types/app/bsky/actor/getProfiles.ts
index 2207218ac69..1c8cd6d9e68 100644
--- a/packages/api/src/client/types/app/bsky/actor/getProfiles.ts
+++ b/packages/api/src/client/types/app/bsky/actor/getProfiles.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyActorDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.getProfiles'
 
 export interface QueryParams {
   actors: string[]
@@ -16,7 +20,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   profiles: AppBskyActorDefs.ProfileViewDetailed[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/actor/getSuggestions.ts b/packages/api/src/client/types/app/bsky/actor/getSuggestions.ts
index 4bce936a4dd..3af53eb2798 100644
--- a/packages/api/src/client/types/app/bsky/actor/getSuggestions.ts
+++ b/packages/api/src/client/types/app/bsky/actor/getSuggestions.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyActorDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.getSuggestions'
 
 export interface QueryParams {
   limit?: number
@@ -20,7 +24,6 @@ export interface OutputSchema {
   actors: AppBskyActorDefs.ProfileView[]
   /** Snowflake for this recommendation, use when submitting recommendation events. */
   recId?: number
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/actor/profile.ts b/packages/api/src/client/types/app/bsky/actor/profile.ts
index c109e93f9ab..e5bb9da321b 100644
--- a/packages/api/src/client/types/app/bsky/actor/profile.ts
+++ b/packages/api/src/client/types/app/bsky/actor/profile.ts
@@ -2,13 +2,18 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.profile'
 
 export interface Record {
+  $type: 'app.bsky.actor.profile'
   displayName?: string
   /** Free-form profile description text. */
   description?: string
@@ -16,24 +21,19 @@ export interface Record {
   avatar?: BlobRef
   /** Larger horizontal image to display behind profile view. */
   banner?: BlobRef
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   joinedViaStarterPack?: ComAtprotoRepoStrongRef.Main
   pinnedPost?: ComAtprotoRepoStrongRef.Main
   createdAt?: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.actor.profile#main' ||
-      v.$type === 'app.bsky.actor.profile')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.profile#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/api/src/client/types/app/bsky/actor/putPreferences.ts b/packages/api/src/client/types/app/bsky/actor/putPreferences.ts
index 834b1bd247c..76c120101d8 100644
--- a/packages/api/src/client/types/app/bsky/actor/putPreferences.ts
+++ b/packages/api/src/client/types/app/bsky/actor/putPreferences.ts
@@ -3,16 +3,19 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyActorDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.putPreferences'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   preferences: AppBskyActorDefs.Preferences
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/actor/searchActors.ts b/packages/api/src/client/types/app/bsky/actor/searchActors.ts
index bcbde2b7bfb..cfc1679fe89 100644
--- a/packages/api/src/client/types/app/bsky/actor/searchActors.ts
+++ b/packages/api/src/client/types/app/bsky/actor/searchActors.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyActorDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.searchActors'
 
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead. */
@@ -22,7 +26,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   actors: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/actor/searchActorsTypeahead.ts b/packages/api/src/client/types/app/bsky/actor/searchActorsTypeahead.ts
index abed0289f27..bacf32803a9 100644
--- a/packages/api/src/client/types/app/bsky/actor/searchActorsTypeahead.ts
+++ b/packages/api/src/client/types/app/bsky/actor/searchActorsTypeahead.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyActorDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.searchActorsTypeahead'
 
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead. */
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   actors: AppBskyActorDefs.ProfileViewBasic[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/embed/defs.ts b/packages/api/src/client/types/app/bsky/embed/defs.ts
index b7b753d65f6..adf61115464 100644
--- a/packages/api/src/client/types/app/bsky/embed/defs.ts
+++ b/packages/api/src/client/types/app/bsky/embed/defs.ts
@@ -2,25 +2,27 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.embed.defs'
 
 /** width:height represents an aspect ratio. It may be approximate, and may not correspond to absolute dimensions in any given unit. */
 export interface AspectRatio {
+  $type?: 'app.bsky.embed.defs#aspectRatio'
   width: number
   height: number
-  [k: string]: unknown
 }
 
-export function isAspectRatio(v: unknown): v is AspectRatio {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.defs#aspectRatio'
-  )
+const hashAspectRatio = 'aspectRatio'
+
+export function isAspectRatio<V>(v: V) {
+  return is$typed(v, id, hashAspectRatio)
 }
 
-export function validateAspectRatio(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.defs#aspectRatio', v)
+export function validateAspectRatio<V>(v: V) {
+  return validate<AspectRatio & V>(v, id, hashAspectRatio)
 }
diff --git a/packages/api/src/client/types/app/bsky/embed/external.ts b/packages/api/src/client/types/app/bsky/embed/external.ts
index 5832cbb3987..5a38d1e3846 100644
--- a/packages/api/src/client/types/app/bsky/embed/external.ts
+++ b/packages/api/src/client/types/app/bsky/embed/external.ts
@@ -2,82 +2,77 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.embed.external'
 
 /** A representation of some externally linked content (eg, a URL and 'card'), embedded in a Bluesky record (eg, a post). */
 export interface Main {
+  $type?: 'app.bsky.embed.external'
   external: External
-  [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.external#main' ||
-      v.$type === 'app.bsky.embed.external')
-  )
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#main', v)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
 export interface External {
+  $type?: 'app.bsky.embed.external#external'
   uri: string
   title: string
   description: string
   thumb?: BlobRef
-  [k: string]: unknown
 }
 
-export function isExternal(v: unknown): v is External {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#external'
-  )
+const hashExternal = 'external'
+
+export function isExternal<V>(v: V) {
+  return is$typed(v, id, hashExternal)
 }
 
-export function validateExternal(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#external', v)
+export function validateExternal<V>(v: V) {
+  return validate<External & V>(v, id, hashExternal)
 }
 
 export interface View {
+  $type?: 'app.bsky.embed.external#view'
   external: ViewExternal
-  [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#view'
-  )
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#view', v)
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
 
 export interface ViewExternal {
+  $type?: 'app.bsky.embed.external#viewExternal'
   uri: string
   title: string
   description: string
   thumb?: string
-  [k: string]: unknown
 }
 
-export function isViewExternal(v: unknown): v is ViewExternal {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#viewExternal'
-  )
+const hashViewExternal = 'viewExternal'
+
+export function isViewExternal<V>(v: V) {
+  return is$typed(v, id, hashViewExternal)
 }
 
-export function validateViewExternal(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#viewExternal', v)
+export function validateViewExternal<V>(v: V) {
+  return validate<ViewExternal & V>(v, id, hashViewExternal)
 }
diff --git a/packages/api/src/client/types/app/bsky/embed/images.ts b/packages/api/src/client/types/app/bsky/embed/images.ts
index 886ad7c5c5b..26b6d965235 100644
--- a/packages/api/src/client/types/app/bsky/embed/images.ts
+++ b/packages/api/src/client/types/app/bsky/embed/images.ts
@@ -2,63 +2,65 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyEmbedDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyEmbedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.embed.images'
 
 export interface Main {
+  $type?: 'app.bsky.embed.images'
   images: Image[]
-  [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.images#main' ||
-      v.$type === 'app.bsky.embed.images')
-  )
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#main', v)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
 export interface Image {
+  $type?: 'app.bsky.embed.images#image'
   image: BlobRef
   /** Alt text description of the image, for accessibility. */
   alt: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isImage(v: unknown): v is Image {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.images#image'
-  )
+const hashImage = 'image'
+
+export function isImage<V>(v: V) {
+  return is$typed(v, id, hashImage)
 }
 
-export function validateImage(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#image', v)
+export function validateImage<V>(v: V) {
+  return validate<Image & V>(v, id, hashImage)
 }
 
 export interface View {
+  $type?: 'app.bsky.embed.images#view'
   images: ViewImage[]
-  [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.images#view'
-  )
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#view', v)
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
 
 export interface ViewImage {
+  $type?: 'app.bsky.embed.images#viewImage'
   /** Fully-qualified URL where a thumbnail of the image can be fetched. For example, CDN location provided by the App View. */
   thumb: string
   /** Fully-qualified URL where a large version of the image can be fetched. May or may not be the exact original blob. For example, CDN location provided by the App View. */
@@ -66,17 +68,14 @@ export interface ViewImage {
   /** Alt text description of the image, for accessibility. */
   alt: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isViewImage(v: unknown): v is ViewImage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.images#viewImage'
-  )
+const hashViewImage = 'viewImage'
+
+export function isViewImage<V>(v: V) {
+  return is$typed(v, id, hashViewImage)
 }
 
-export function validateViewImage(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#viewImage', v)
+export function validateViewImage<V>(v: V) {
+  return validate<ViewImage & V>(v, id, hashViewImage)
 }
diff --git a/packages/api/src/client/types/app/bsky/embed/record.ts b/packages/api/src/client/types/app/bsky/embed/record.ts
index a3744c29246..9fd1aee2be3 100644
--- a/packages/api/src/client/types/app/bsky/embed/record.ts
+++ b/packages/api/src/client/types/app/bsky/embed/record.ts
@@ -2,148 +2,141 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
-import * as AppBskyFeedDefs from '../feed/defs'
-import * as AppBskyGraphDefs from '../graph/defs'
-import * as AppBskyLabelerDefs from '../labeler/defs'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as AppBskyEmbedImages from './images'
-import * as AppBskyEmbedVideo from './video'
-import * as AppBskyEmbedExternal from './external'
-import * as AppBskyEmbedRecordWithMedia from './recordWithMedia'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
+import type * as AppBskyFeedDefs from '../feed/defs.js'
+import type * as AppBskyGraphDefs from '../graph/defs.js'
+import type * as AppBskyLabelerDefs from '../labeler/defs.js'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as AppBskyEmbedImages from './images.js'
+import type * as AppBskyEmbedVideo from './video.js'
+import type * as AppBskyEmbedExternal from './external.js'
+import type * as AppBskyEmbedRecordWithMedia from './recordWithMedia.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.embed.record'
 
 export interface Main {
+  $type?: 'app.bsky.embed.record'
   record: ComAtprotoRepoStrongRef.Main
-  [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.record#main' ||
-      v.$type === 'app.bsky.embed.record')
-  )
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#main', v)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
 export interface View {
+  $type?: 'app.bsky.embed.record#view'
   record:
-    | ViewRecord
-    | ViewNotFound
-    | ViewBlocked
-    | ViewDetached
-    | AppBskyFeedDefs.GeneratorView
-    | AppBskyGraphDefs.ListView
-    | AppBskyLabelerDefs.LabelerView
-    | AppBskyGraphDefs.StarterPackViewBasic
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<ViewRecord>
+    | $Typed<ViewNotFound>
+    | $Typed<ViewBlocked>
+    | $Typed<ViewDetached>
+    | $Typed<AppBskyFeedDefs.GeneratorView>
+    | $Typed<AppBskyGraphDefs.ListView>
+    | $Typed<AppBskyLabelerDefs.LabelerView>
+    | $Typed<AppBskyGraphDefs.StarterPackViewBasic>
+    | { $type: string }
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.record#view'
-  )
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#view', v)
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
 
 export interface ViewRecord {
+  $type?: 'app.bsky.embed.record#viewRecord'
   uri: string
   cid: string
   author: AppBskyActorDefs.ProfileViewBasic
   /** The record data itself. */
-  value: {}
+  value: { [_ in string]: unknown }
   labels?: ComAtprotoLabelDefs.Label[]
   replyCount?: number
   repostCount?: number
   likeCount?: number
   quoteCount?: number
   embeds?: (
-    | AppBskyEmbedImages.View
-    | AppBskyEmbedVideo.View
-    | AppBskyEmbedExternal.View
-    | View
-    | AppBskyEmbedRecordWithMedia.View
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyEmbedImages.View>
+    | $Typed<AppBskyEmbedVideo.View>
+    | $Typed<AppBskyEmbedExternal.View>
+    | $Typed<View>
+    | $Typed<AppBskyEmbedRecordWithMedia.View>
+    | { $type: string }
   )[]
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isViewRecord(v: unknown): v is ViewRecord {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewRecord'
-  )
+const hashViewRecord = 'viewRecord'
+
+export function isViewRecord<V>(v: V) {
+  return is$typed(v, id, hashViewRecord)
 }
 
-export function validateViewRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewRecord', v)
+export function validateViewRecord<V>(v: V) {
+  return validate<ViewRecord & V>(v, id, hashViewRecord)
 }
 
 export interface ViewNotFound {
+  $type?: 'app.bsky.embed.record#viewNotFound'
   uri: string
   notFound: true
-  [k: string]: unknown
 }
 
-export function isViewNotFound(v: unknown): v is ViewNotFound {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewNotFound'
-  )
+const hashViewNotFound = 'viewNotFound'
+
+export function isViewNotFound<V>(v: V) {
+  return is$typed(v, id, hashViewNotFound)
 }
 
-export function validateViewNotFound(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewNotFound', v)
+export function validateViewNotFound<V>(v: V) {
+  return validate<ViewNotFound & V>(v, id, hashViewNotFound)
 }
 
 export interface ViewBlocked {
+  $type?: 'app.bsky.embed.record#viewBlocked'
   uri: string
   blocked: true
   author: AppBskyFeedDefs.BlockedAuthor
-  [k: string]: unknown
 }
 
-export function isViewBlocked(v: unknown): v is ViewBlocked {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewBlocked'
-  )
+const hashViewBlocked = 'viewBlocked'
+
+export function isViewBlocked<V>(v: V) {
+  return is$typed(v, id, hashViewBlocked)
 }
 
-export function validateViewBlocked(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewBlocked', v)
+export function validateViewBlocked<V>(v: V) {
+  return validate<ViewBlocked & V>(v, id, hashViewBlocked)
 }
 
 export interface ViewDetached {
+  $type?: 'app.bsky.embed.record#viewDetached'
   uri: string
   detached: true
-  [k: string]: unknown
 }
 
-export function isViewDetached(v: unknown): v is ViewDetached {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewDetached'
-  )
+const hashViewDetached = 'viewDetached'
+
+export function isViewDetached<V>(v: V) {
+  return is$typed(v, id, hashViewDetached)
 }
 
-export function validateViewDetached(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewDetached', v)
+export function validateViewDetached<V>(v: V) {
+  return validate<ViewDetached & V>(v, id, hashViewDetached)
 }
diff --git a/packages/api/src/client/types/app/bsky/embed/recordWithMedia.ts b/packages/api/src/client/types/app/bsky/embed/recordWithMedia.ts
index 2b2b3ae6251..2c36a988cc7 100644
--- a/packages/api/src/client/types/app/bsky/embed/recordWithMedia.ts
+++ b/packages/api/src/client/types/app/bsky/embed/recordWithMedia.ts
@@ -2,55 +2,54 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyEmbedRecord from './record'
-import * as AppBskyEmbedImages from './images'
-import * as AppBskyEmbedVideo from './video'
-import * as AppBskyEmbedExternal from './external'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyEmbedRecord from './record.js'
+import type * as AppBskyEmbedImages from './images.js'
+import type * as AppBskyEmbedVideo from './video.js'
+import type * as AppBskyEmbedExternal from './external.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.embed.recordWithMedia'
 
 export interface Main {
+  $type?: 'app.bsky.embed.recordWithMedia'
   record: AppBskyEmbedRecord.Main
   media:
-    | AppBskyEmbedImages.Main
-    | AppBskyEmbedVideo.Main
-    | AppBskyEmbedExternal.Main
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<AppBskyEmbedImages.Main>
+    | $Typed<AppBskyEmbedVideo.Main>
+    | $Typed<AppBskyEmbedExternal.Main>
+    | { $type: string }
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.recordWithMedia#main' ||
-      v.$type === 'app.bsky.embed.recordWithMedia')
-  )
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.recordWithMedia#main', v)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
 export interface View {
+  $type?: 'app.bsky.embed.recordWithMedia#view'
   record: AppBskyEmbedRecord.View
   media:
-    | AppBskyEmbedImages.View
-    | AppBskyEmbedVideo.View
-    | AppBskyEmbedExternal.View
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<AppBskyEmbedImages.View>
+    | $Typed<AppBskyEmbedVideo.View>
+    | $Typed<AppBskyEmbedExternal.View>
+    | { $type: string }
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.recordWithMedia#view'
-  )
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.recordWithMedia#view', v)
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
diff --git a/packages/api/src/client/types/app/bsky/embed/video.ts b/packages/api/src/client/types/app/bsky/embed/video.ts
index 2be451b85ed..10e59e37539 100644
--- a/packages/api/src/client/types/app/bsky/embed/video.ts
+++ b/packages/api/src/client/types/app/bsky/embed/video.ts
@@ -2,66 +2,65 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyEmbedDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyEmbedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.embed.video'
 
 export interface Main {
+  $type?: 'app.bsky.embed.video'
   video: BlobRef
   captions?: Caption[]
   /** Alt text description of the video, for accessibility. */
   alt?: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.video#main' ||
-      v.$type === 'app.bsky.embed.video')
-  )
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#main', v)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
 export interface Caption {
+  $type?: 'app.bsky.embed.video#caption'
   lang: string
   file: BlobRef
-  [k: string]: unknown
 }
 
-export function isCaption(v: unknown): v is Caption {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.video#caption'
-  )
+const hashCaption = 'caption'
+
+export function isCaption<V>(v: V) {
+  return is$typed(v, id, hashCaption)
 }
 
-export function validateCaption(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#caption', v)
+export function validateCaption<V>(v: V) {
+  return validate<Caption & V>(v, id, hashCaption)
 }
 
 export interface View {
+  $type?: 'app.bsky.embed.video#view'
   cid: string
   playlist: string
   thumbnail?: string
   alt?: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.video#view'
-  )
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#view', v)
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
diff --git a/packages/api/src/client/types/app/bsky/feed/defs.ts b/packages/api/src/client/types/app/bsky/feed/defs.ts
index 760c634d35f..f94aaefa7e9 100644
--- a/packages/api/src/client/types/app/bsky/feed/defs.ts
+++ b/packages/api/src/client/types/app/bsky/feed/defs.ts
@@ -2,31 +2,36 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as AppBskyEmbedImages from '../embed/images'
-import * as AppBskyEmbedVideo from '../embed/video'
-import * as AppBskyEmbedExternal from '../embed/external'
-import * as AppBskyEmbedRecord from '../embed/record'
-import * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as AppBskyGraphDefs from '../graph/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+import type * as AppBskyEmbedImages from '../embed/images.js'
+import type * as AppBskyEmbedVideo from '../embed/video.js'
+import type * as AppBskyEmbedExternal from '../embed/external.js'
+import type * as AppBskyEmbedRecord from '../embed/record.js'
+import type * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as AppBskyRichtextFacet from '../richtext/facet.js'
+import type * as AppBskyGraphDefs from '../graph/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.defs'
 
 export interface PostView {
+  $type?: 'app.bsky.feed.defs#postView'
   uri: string
   cid: string
   author: AppBskyActorDefs.ProfileViewBasic
-  record: {}
+  record: { [_ in string]: unknown }
   embed?:
-    | AppBskyEmbedImages.View
-    | AppBskyEmbedVideo.View
-    | AppBskyEmbedExternal.View
-    | AppBskyEmbedRecord.View
-    | AppBskyEmbedRecordWithMedia.View
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyEmbedImages.View>
+    | $Typed<AppBskyEmbedVideo.View>
+    | $Typed<AppBskyEmbedExternal.View>
+    | $Typed<AppBskyEmbedRecord.View>
+    | $Typed<AppBskyEmbedRecordWithMedia.View>
+    | { $type: string }
   replyCount?: number
   repostCount?: number
   likeCount?: number
@@ -35,225 +40,207 @@ export interface PostView {
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
   threadgate?: ThreadgateView
-  [k: string]: unknown
 }
 
-export function isPostView(v: unknown): v is PostView {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.defs#postView'
-  )
+const hashPostView = 'postView'
+
+export function isPostView<V>(v: V) {
+  return is$typed(v, id, hashPostView)
 }
 
-export function validatePostView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#postView', v)
+export function validatePostView<V>(v: V) {
+  return validate<PostView & V>(v, id, hashPostView)
 }
 
 /** Metadata about the requesting account's relationship with the subject content. Only has meaningful content for authed requests. */
 export interface ViewerState {
+  $type?: 'app.bsky.feed.defs#viewerState'
   repost?: string
   like?: string
   threadMuted?: boolean
   replyDisabled?: boolean
   embeddingDisabled?: boolean
   pinned?: boolean
-  [k: string]: unknown
 }
 
-export function isViewerState(v: unknown): v is ViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#viewerState'
-  )
+const hashViewerState = 'viewerState'
+
+export function isViewerState<V>(v: V) {
+  return is$typed(v, id, hashViewerState)
 }
 
-export function validateViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#viewerState', v)
+export function validateViewerState<V>(v: V) {
+  return validate<ViewerState & V>(v, id, hashViewerState)
 }
 
 /** Metadata about this post within the context of the thread it is in. */
 export interface ThreadContext {
+  $type?: 'app.bsky.feed.defs#threadContext'
   rootAuthorLike?: string
-  [k: string]: unknown
 }
 
-export function isThreadContext(v: unknown): v is ThreadContext {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#threadContext'
-  )
+const hashThreadContext = 'threadContext'
+
+export function isThreadContext<V>(v: V) {
+  return is$typed(v, id, hashThreadContext)
 }
 
-export function validateThreadContext(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#threadContext', v)
+export function validateThreadContext<V>(v: V) {
+  return validate<ThreadContext & V>(v, id, hashThreadContext)
 }
 
 export interface FeedViewPost {
+  $type?: 'app.bsky.feed.defs#feedViewPost'
   post: PostView
   reply?: ReplyRef
-  reason?: ReasonRepost | ReasonPin | { $type: string; [k: string]: unknown }
+  reason?: $Typed<ReasonRepost> | $Typed<ReasonPin> | { $type: string }
   /** Context provided by feed generator that may be passed back alongside interactions. */
   feedContext?: string
-  [k: string]: unknown
 }
 
-export function isFeedViewPost(v: unknown): v is FeedViewPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#feedViewPost'
-  )
+const hashFeedViewPost = 'feedViewPost'
+
+export function isFeedViewPost<V>(v: V) {
+  return is$typed(v, id, hashFeedViewPost)
 }
 
-export function validateFeedViewPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#feedViewPost', v)
+export function validateFeedViewPost<V>(v: V) {
+  return validate<FeedViewPost & V>(v, id, hashFeedViewPost)
 }
 
 export interface ReplyRef {
+  $type?: 'app.bsky.feed.defs#replyRef'
   root:
-    | PostView
-    | NotFoundPost
-    | BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<PostView>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | { $type: string }
   parent:
-    | PostView
-    | NotFoundPost
-    | BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<PostView>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | { $type: string }
   grandparentAuthor?: AppBskyActorDefs.ProfileViewBasic
-  [k: string]: unknown
 }
 
-export function isReplyRef(v: unknown): v is ReplyRef {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.defs#replyRef'
-  )
+const hashReplyRef = 'replyRef'
+
+export function isReplyRef<V>(v: V) {
+  return is$typed(v, id, hashReplyRef)
 }
 
-export function validateReplyRef(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#replyRef', v)
+export function validateReplyRef<V>(v: V) {
+  return validate<ReplyRef & V>(v, id, hashReplyRef)
 }
 
 export interface ReasonRepost {
+  $type?: 'app.bsky.feed.defs#reasonRepost'
   by: AppBskyActorDefs.ProfileViewBasic
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isReasonRepost(v: unknown): v is ReasonRepost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#reasonRepost'
-  )
+const hashReasonRepost = 'reasonRepost'
+
+export function isReasonRepost<V>(v: V) {
+  return is$typed(v, id, hashReasonRepost)
 }
 
-export function validateReasonRepost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#reasonRepost', v)
+export function validateReasonRepost<V>(v: V) {
+  return validate<ReasonRepost & V>(v, id, hashReasonRepost)
 }
 
 export interface ReasonPin {
-  [k: string]: unknown
+  $type?: 'app.bsky.feed.defs#reasonPin'
 }
 
-export function isReasonPin(v: unknown): v is ReasonPin {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#reasonPin'
-  )
+const hashReasonPin = 'reasonPin'
+
+export function isReasonPin<V>(v: V) {
+  return is$typed(v, id, hashReasonPin)
 }
 
-export function validateReasonPin(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#reasonPin', v)
+export function validateReasonPin<V>(v: V) {
+  return validate<ReasonPin & V>(v, id, hashReasonPin)
 }
 
 export interface ThreadViewPost {
+  $type?: 'app.bsky.feed.defs#threadViewPost'
   post: PostView
   parent?:
-    | ThreadViewPost
-    | NotFoundPost
-    | BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ThreadViewPost>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | { $type: string }
   replies?: (
-    | ThreadViewPost
-    | NotFoundPost
-    | BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ThreadViewPost>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | { $type: string }
   )[]
   threadContext?: ThreadContext
-  [k: string]: unknown
 }
 
-export function isThreadViewPost(v: unknown): v is ThreadViewPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#threadViewPost'
-  )
+const hashThreadViewPost = 'threadViewPost'
+
+export function isThreadViewPost<V>(v: V) {
+  return is$typed(v, id, hashThreadViewPost)
 }
 
-export function validateThreadViewPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#threadViewPost', v)
+export function validateThreadViewPost<V>(v: V) {
+  return validate<ThreadViewPost & V>(v, id, hashThreadViewPost)
 }
 
 export interface NotFoundPost {
+  $type?: 'app.bsky.feed.defs#notFoundPost'
   uri: string
   notFound: true
-  [k: string]: unknown
 }
 
-export function isNotFoundPost(v: unknown): v is NotFoundPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#notFoundPost'
-  )
+const hashNotFoundPost = 'notFoundPost'
+
+export function isNotFoundPost<V>(v: V) {
+  return is$typed(v, id, hashNotFoundPost)
 }
 
-export function validateNotFoundPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#notFoundPost', v)
+export function validateNotFoundPost<V>(v: V) {
+  return validate<NotFoundPost & V>(v, id, hashNotFoundPost)
 }
 
 export interface BlockedPost {
+  $type?: 'app.bsky.feed.defs#blockedPost'
   uri: string
   blocked: true
   author: BlockedAuthor
-  [k: string]: unknown
 }
 
-export function isBlockedPost(v: unknown): v is BlockedPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#blockedPost'
-  )
+const hashBlockedPost = 'blockedPost'
+
+export function isBlockedPost<V>(v: V) {
+  return is$typed(v, id, hashBlockedPost)
 }
 
-export function validateBlockedPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#blockedPost', v)
+export function validateBlockedPost<V>(v: V) {
+  return validate<BlockedPost & V>(v, id, hashBlockedPost)
 }
 
 export interface BlockedAuthor {
+  $type?: 'app.bsky.feed.defs#blockedAuthor'
   did: string
   viewer?: AppBskyActorDefs.ViewerState
-  [k: string]: unknown
 }
 
-export function isBlockedAuthor(v: unknown): v is BlockedAuthor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#blockedAuthor'
-  )
+const hashBlockedAuthor = 'blockedAuthor'
+
+export function isBlockedAuthor<V>(v: V) {
+  return is$typed(v, id, hashBlockedAuthor)
 }
 
-export function validateBlockedAuthor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#blockedAuthor', v)
+export function validateBlockedAuthor<V>(v: V) {
+  return validate<BlockedAuthor & V>(v, id, hashBlockedAuthor)
 }
 
 export interface GeneratorView {
+  $type?: 'app.bsky.feed.defs#generatorView'
   uri: string
   cid: string
   did: string
@@ -271,115 +258,103 @@ export interface GeneratorView {
     | 'app.bsky.feed.defs#contentModeVideo'
     | (string & {})
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isGeneratorView(v: unknown): v is GeneratorView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#generatorView'
-  )
+const hashGeneratorView = 'generatorView'
+
+export function isGeneratorView<V>(v: V) {
+  return is$typed(v, id, hashGeneratorView)
 }
 
-export function validateGeneratorView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#generatorView', v)
+export function validateGeneratorView<V>(v: V) {
+  return validate<GeneratorView & V>(v, id, hashGeneratorView)
 }
 
 export interface GeneratorViewerState {
+  $type?: 'app.bsky.feed.defs#generatorViewerState'
   like?: string
-  [k: string]: unknown
 }
 
-export function isGeneratorViewerState(v: unknown): v is GeneratorViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#generatorViewerState'
-  )
+const hashGeneratorViewerState = 'generatorViewerState'
+
+export function isGeneratorViewerState<V>(v: V) {
+  return is$typed(v, id, hashGeneratorViewerState)
 }
 
-export function validateGeneratorViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#generatorViewerState', v)
+export function validateGeneratorViewerState<V>(v: V) {
+  return validate<GeneratorViewerState & V>(v, id, hashGeneratorViewerState)
 }
 
 export interface SkeletonFeedPost {
+  $type?: 'app.bsky.feed.defs#skeletonFeedPost'
   post: string
   reason?:
-    | SkeletonReasonRepost
-    | SkeletonReasonPin
-    | { $type: string; [k: string]: unknown }
+    | $Typed<SkeletonReasonRepost>
+    | $Typed<SkeletonReasonPin>
+    | { $type: string }
   /** Context that will be passed through to client and may be passed to feed generator back alongside interactions. */
   feedContext?: string
-  [k: string]: unknown
 }
 
-export function isSkeletonFeedPost(v: unknown): v is SkeletonFeedPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonFeedPost'
-  )
+const hashSkeletonFeedPost = 'skeletonFeedPost'
+
+export function isSkeletonFeedPost<V>(v: V) {
+  return is$typed(v, id, hashSkeletonFeedPost)
 }
 
-export function validateSkeletonFeedPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonFeedPost', v)
+export function validateSkeletonFeedPost<V>(v: V) {
+  return validate<SkeletonFeedPost & V>(v, id, hashSkeletonFeedPost)
 }
 
 export interface SkeletonReasonRepost {
+  $type?: 'app.bsky.feed.defs#skeletonReasonRepost'
   repost: string
-  [k: string]: unknown
 }
 
-export function isSkeletonReasonRepost(v: unknown): v is SkeletonReasonRepost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonReasonRepost'
-  )
+const hashSkeletonReasonRepost = 'skeletonReasonRepost'
+
+export function isSkeletonReasonRepost<V>(v: V) {
+  return is$typed(v, id, hashSkeletonReasonRepost)
 }
 
-export function validateSkeletonReasonRepost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonReasonRepost', v)
+export function validateSkeletonReasonRepost<V>(v: V) {
+  return validate<SkeletonReasonRepost & V>(v, id, hashSkeletonReasonRepost)
 }
 
 export interface SkeletonReasonPin {
-  [k: string]: unknown
+  $type?: 'app.bsky.feed.defs#skeletonReasonPin'
 }
 
-export function isSkeletonReasonPin(v: unknown): v is SkeletonReasonPin {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonReasonPin'
-  )
+const hashSkeletonReasonPin = 'skeletonReasonPin'
+
+export function isSkeletonReasonPin<V>(v: V) {
+  return is$typed(v, id, hashSkeletonReasonPin)
 }
 
-export function validateSkeletonReasonPin(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonReasonPin', v)
+export function validateSkeletonReasonPin<V>(v: V) {
+  return validate<SkeletonReasonPin & V>(v, id, hashSkeletonReasonPin)
 }
 
 export interface ThreadgateView {
+  $type?: 'app.bsky.feed.defs#threadgateView'
   uri?: string
   cid?: string
-  record?: {}
+  record?: { [_ in string]: unknown }
   lists?: AppBskyGraphDefs.ListViewBasic[]
-  [k: string]: unknown
 }
 
-export function isThreadgateView(v: unknown): v is ThreadgateView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#threadgateView'
-  )
+const hashThreadgateView = 'threadgateView'
+
+export function isThreadgateView<V>(v: V) {
+  return is$typed(v, id, hashThreadgateView)
 }
 
-export function validateThreadgateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#threadgateView', v)
+export function validateThreadgateView<V>(v: V) {
+  return validate<ThreadgateView & V>(v, id, hashThreadgateView)
 }
 
 export interface Interaction {
+  $type?: 'app.bsky.feed.defs#interaction'
   item?: string
   event?:
     | 'app.bsky.feed.defs#requestLess'
@@ -397,47 +372,43 @@ export interface Interaction {
     | (string & {})
   /** Context on a feed item that was originally supplied by the feed generator on getFeedSkeleton. */
   feedContext?: string
-  [k: string]: unknown
 }
 
-export function isInteraction(v: unknown): v is Interaction {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#interaction'
-  )
+const hashInteraction = 'interaction'
+
+export function isInteraction<V>(v: V) {
+  return is$typed(v, id, hashInteraction)
 }
 
-export function validateInteraction(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#interaction', v)
+export function validateInteraction<V>(v: V) {
+  return validate<Interaction & V>(v, id, hashInteraction)
 }
 
 /** Request that less content like the given feed item be shown in the feed */
-export const REQUESTLESS = 'app.bsky.feed.defs#requestLess'
+export const REQUESTLESS = `${id}#requestLess`
 /** Request that more content like the given feed item be shown in the feed */
-export const REQUESTMORE = 'app.bsky.feed.defs#requestMore'
+export const REQUESTMORE = `${id}#requestMore`
 /** User clicked through to the feed item */
-export const CLICKTHROUGHITEM = 'app.bsky.feed.defs#clickthroughItem'
+export const CLICKTHROUGHITEM = `${id}#clickthroughItem`
 /** User clicked through to the author of the feed item */
-export const CLICKTHROUGHAUTHOR = 'app.bsky.feed.defs#clickthroughAuthor'
+export const CLICKTHROUGHAUTHOR = `${id}#clickthroughAuthor`
 /** User clicked through to the reposter of the feed item */
-export const CLICKTHROUGHREPOSTER = 'app.bsky.feed.defs#clickthroughReposter'
+export const CLICKTHROUGHREPOSTER = `${id}#clickthroughReposter`
 /** User clicked through to the embedded content of the feed item */
-export const CLICKTHROUGHEMBED = 'app.bsky.feed.defs#clickthroughEmbed'
+export const CLICKTHROUGHEMBED = `${id}#clickthroughEmbed`
 /** Declares the feed generator returns any types of posts. */
-export const CONTENTMODEUNSPECIFIED =
-  'app.bsky.feed.defs#contentModeUnspecified'
+export const CONTENTMODEUNSPECIFIED = `${id}#contentModeUnspecified`
 /** Declares the feed generator returns posts containing app.bsky.embed.video embeds. */
-export const CONTENTMODEVIDEO = 'app.bsky.feed.defs#contentModeVideo'
+export const CONTENTMODEVIDEO = `${id}#contentModeVideo`
 /** Feed item was seen by user */
-export const INTERACTIONSEEN = 'app.bsky.feed.defs#interactionSeen'
+export const INTERACTIONSEEN = `${id}#interactionSeen`
 /** User liked the feed item */
-export const INTERACTIONLIKE = 'app.bsky.feed.defs#interactionLike'
+export const INTERACTIONLIKE = `${id}#interactionLike`
 /** User reposted the feed item */
-export const INTERACTIONREPOST = 'app.bsky.feed.defs#interactionRepost'
+export const INTERACTIONREPOST = `${id}#interactionRepost`
 /** User replied to the feed item */
-export const INTERACTIONREPLY = 'app.bsky.feed.defs#interactionReply'
+export const INTERACTIONREPLY = `${id}#interactionReply`
 /** User quoted the feed item */
-export const INTERACTIONQUOTE = 'app.bsky.feed.defs#interactionQuote'
+export const INTERACTIONQUOTE = `${id}#interactionQuote`
 /** User shared the feed item */
-export const INTERACTIONSHARE = 'app.bsky.feed.defs#interactionShare'
+export const INTERACTIONSHARE = `${id}#interactionShare`
diff --git a/packages/api/src/client/types/app/bsky/feed/describeFeedGenerator.ts b/packages/api/src/client/types/app/bsky/feed/describeFeedGenerator.ts
index b974f496144..6792d3a377f 100644
--- a/packages/api/src/client/types/app/bsky/feed/describeFeedGenerator.ts
+++ b/packages/api/src/client/types/app/bsky/feed/describeFeedGenerator.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.describeFeedGenerator'
 
 export interface QueryParams {}
 
@@ -15,7 +19,6 @@ export interface OutputSchema {
   did: string
   feeds: Feed[]
   links?: Links
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -34,36 +37,32 @@ export function toKnownErr(e: any) {
 }
 
 export interface Feed {
+  $type?: 'app.bsky.feed.describeFeedGenerator#feed'
   uri: string
-  [k: string]: unknown
 }
 
-export function isFeed(v: unknown): v is Feed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.describeFeedGenerator#feed'
-  )
+const hashFeed = 'feed'
+
+export function isFeed<V>(v: V) {
+  return is$typed(v, id, hashFeed)
 }
 
-export function validateFeed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.describeFeedGenerator#feed', v)
+export function validateFeed<V>(v: V) {
+  return validate<Feed & V>(v, id, hashFeed)
 }
 
 export interface Links {
+  $type?: 'app.bsky.feed.describeFeedGenerator#links'
   privacyPolicy?: string
   termsOfService?: string
-  [k: string]: unknown
 }
 
-export function isLinks(v: unknown): v is Links {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.describeFeedGenerator#links'
-  )
+const hashLinks = 'links'
+
+export function isLinks<V>(v: V) {
+  return is$typed(v, id, hashLinks)
 }
 
-export function validateLinks(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.describeFeedGenerator#links', v)
+export function validateLinks<V>(v: V) {
+  return validate<Links & V>(v, id, hashLinks)
 }
diff --git a/packages/api/src/client/types/app/bsky/feed/generator.ts b/packages/api/src/client/types/app/bsky/feed/generator.ts
index 8e1dd9e9c80..3cddbae534b 100644
--- a/packages/api/src/client/types/app/bsky/feed/generator.ts
+++ b/packages/api/src/client/types/app/bsky/feed/generator.ts
@@ -2,13 +2,18 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyRichtextFacet from '../richtext/facet.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.generator'
 
 export interface Record {
+  $type: 'app.bsky.feed.generator'
   did: string
   displayName: string
   description?: string
@@ -16,9 +21,7 @@ export interface Record {
   avatar?: BlobRef
   /** Declaration that a feed accepts feedback interactions from a client through app.bsky.feed.sendInteractions */
   acceptsInteractions?: boolean
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   contentMode?:
     | 'app.bsky.feed.defs#contentModeUnspecified'
     | 'app.bsky.feed.defs#contentModeVideo'
@@ -27,15 +30,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.generator#main' ||
-      v.$type === 'app.bsky.feed.generator')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.generator#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/api/src/client/types/app/bsky/feed/getActorFeeds.ts b/packages/api/src/client/types/app/bsky/feed/getActorFeeds.ts
index e8a0cb94bd3..f44942711ac 100644
--- a/packages/api/src/client/types/app/bsky/feed/getActorFeeds.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getActorFeeds.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyFeedDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getActorFeeds'
 
 export interface QueryParams {
   actor: string
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feeds: AppBskyFeedDefs.GeneratorView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/feed/getActorLikes.ts b/packages/api/src/client/types/app/bsky/feed/getActorLikes.ts
index 1da239d96f3..0552f5a18b3 100644
--- a/packages/api/src/client/types/app/bsky/feed/getActorLikes.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getActorLikes.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyFeedDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getActorLikes'
 
 export interface QueryParams {
   actor: string
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/feed/getAuthorFeed.ts b/packages/api/src/client/types/app/bsky/feed/getAuthorFeed.ts
index 8fc58a4e46c..5e25ae8ed88 100644
--- a/packages/api/src/client/types/app/bsky/feed/getAuthorFeed.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getAuthorFeed.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyFeedDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getAuthorFeed'
 
 export interface QueryParams {
   actor: string
@@ -28,7 +32,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/feed/getFeed.ts b/packages/api/src/client/types/app/bsky/feed/getFeed.ts
index b61a1248e2a..abc65bfe8aa 100644
--- a/packages/api/src/client/types/app/bsky/feed/getFeed.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getFeed.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyFeedDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getFeed'
 
 export interface QueryParams {
   feed: string
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/feed/getFeedGenerator.ts b/packages/api/src/client/types/app/bsky/feed/getFeedGenerator.ts
index 8d222f8d521..7ff259ec8cb 100644
--- a/packages/api/src/client/types/app/bsky/feed/getFeedGenerator.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getFeedGenerator.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyFeedDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getFeedGenerator'
 
 export interface QueryParams {
   /** AT-URI of the feed generator record. */
@@ -21,7 +25,6 @@ export interface OutputSchema {
   isOnline: boolean
   /** Indicates whether the feed generator service is compatible with the record declaration. */
   isValid: boolean
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/feed/getFeedGenerators.ts b/packages/api/src/client/types/app/bsky/feed/getFeedGenerators.ts
index 1d99fd6608c..2b51e794beb 100644
--- a/packages/api/src/client/types/app/bsky/feed/getFeedGenerators.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getFeedGenerators.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyFeedDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getFeedGenerators'
 
 export interface QueryParams {
   feeds: string[]
@@ -16,7 +20,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   feeds: AppBskyFeedDefs.GeneratorView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/feed/getFeedSkeleton.ts b/packages/api/src/client/types/app/bsky/feed/getFeedSkeleton.ts
index bf859cc1e87..9ebcd480e7e 100644
--- a/packages/api/src/client/types/app/bsky/feed/getFeedSkeleton.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getFeedSkeleton.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyFeedDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getFeedSkeleton'
 
 export interface QueryParams {
   /** Reference to feed generator record describing the specific feed being requested. */
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.SkeletonFeedPost[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/feed/getLikes.ts b/packages/api/src/client/types/app/bsky/feed/getLikes.ts
index 35af1b3aae5..f1448981f77 100644
--- a/packages/api/src/client/types/app/bsky/feed/getLikes.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getLikes.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyActorDefs from '../actor/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getLikes'
 
 export interface QueryParams {
   /** AT-URI of the subject (eg, a post record). */
@@ -24,7 +28,6 @@ export interface OutputSchema {
   cid?: string
   cursor?: string
   likes: Like[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -43,18 +46,18 @@ export function toKnownErr(e: any) {
 }
 
 export interface Like {
+  $type?: 'app.bsky.feed.getLikes#like'
   indexedAt: string
   createdAt: string
   actor: AppBskyActorDefs.ProfileView
-  [k: string]: unknown
 }
 
-export function isLike(v: unknown): v is Like {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.getLikes#like'
-  )
+const hashLike = 'like'
+
+export function isLike<V>(v: V) {
+  return is$typed(v, id, hashLike)
 }
 
-export function validateLike(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.getLikes#like', v)
+export function validateLike<V>(v: V) {
+  return validate<Like & V>(v, id, hashLike)
 }
diff --git a/packages/api/src/client/types/app/bsky/feed/getListFeed.ts b/packages/api/src/client/types/app/bsky/feed/getListFeed.ts
index 4e47e597afd..484b3213139 100644
--- a/packages/api/src/client/types/app/bsky/feed/getListFeed.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getListFeed.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyFeedDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getListFeed'
 
 export interface QueryParams {
   /** Reference (AT-URI) to the list record. */
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/feed/getPostThread.ts b/packages/api/src/client/types/app/bsky/feed/getPostThread.ts
index df012607df1..5782a534529 100644
--- a/packages/api/src/client/types/app/bsky/feed/getPostThread.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getPostThread.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyFeedDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getPostThread'
 
 export interface QueryParams {
   /** Reference (AT-URI) to post record. */
@@ -21,12 +25,11 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   thread:
-    | AppBskyFeedDefs.ThreadViewPost
-    | AppBskyFeedDefs.NotFoundPost
-    | AppBskyFeedDefs.BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyFeedDefs.ThreadViewPost>
+    | $Typed<AppBskyFeedDefs.NotFoundPost>
+    | $Typed<AppBskyFeedDefs.BlockedPost>
+    | { $type: string }
   threadgate?: AppBskyFeedDefs.ThreadgateView
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/feed/getPosts.ts b/packages/api/src/client/types/app/bsky/feed/getPosts.ts
index 0ae8657de94..2467a092a4d 100644
--- a/packages/api/src/client/types/app/bsky/feed/getPosts.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getPosts.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyFeedDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getPosts'
 
 export interface QueryParams {
   /** List of post AT-URIs to return hydrated views for. */
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   posts: AppBskyFeedDefs.PostView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/feed/getQuotes.ts b/packages/api/src/client/types/app/bsky/feed/getQuotes.ts
index aafc487cd43..7397d3bb51b 100644
--- a/packages/api/src/client/types/app/bsky/feed/getQuotes.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getQuotes.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyFeedDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getQuotes'
 
 export interface QueryParams {
   /** Reference (AT-URI) of post record */
@@ -24,7 +28,6 @@ export interface OutputSchema {
   cid?: string
   cursor?: string
   posts: AppBskyFeedDefs.PostView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/feed/getRepostedBy.ts b/packages/api/src/client/types/app/bsky/feed/getRepostedBy.ts
index dfbac97453b..d8666e827f2 100644
--- a/packages/api/src/client/types/app/bsky/feed/getRepostedBy.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getRepostedBy.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyActorDefs from '../actor/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getRepostedBy'
 
 export interface QueryParams {
   /** Reference (AT-URI) of post record */
@@ -24,7 +28,6 @@ export interface OutputSchema {
   cid?: string
   cursor?: string
   repostedBy: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/feed/getSuggestedFeeds.ts b/packages/api/src/client/types/app/bsky/feed/getSuggestedFeeds.ts
index 2e9495d8c19..38b63d048e9 100644
--- a/packages/api/src/client/types/app/bsky/feed/getSuggestedFeeds.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getSuggestedFeeds.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyFeedDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getSuggestedFeeds'
 
 export interface QueryParams {
   limit?: number
@@ -18,7 +22,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feeds: AppBskyFeedDefs.GeneratorView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/feed/getTimeline.ts b/packages/api/src/client/types/app/bsky/feed/getTimeline.ts
index 6c5280443a9..66202f764e7 100644
--- a/packages/api/src/client/types/app/bsky/feed/getTimeline.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getTimeline.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyFeedDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getTimeline'
 
 export interface QueryParams {
   /** Variant 'algorithm' for timeline. Implementation-specific. NOTE: most feed flexibility has been moved to feed generator mechanism. */
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/feed/like.ts b/packages/api/src/client/types/app/bsky/feed/like.ts
index 10237e45f0d..504023db951 100644
--- a/packages/api/src/client/types/app/bsky/feed/like.ts
+++ b/packages/api/src/client/types/app/bsky/feed/like.ts
@@ -2,25 +2,28 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.like'
 
 export interface Record {
+  $type: 'app.bsky.feed.like'
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.like#main' || v.$type === 'app.bsky.feed.like')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.like#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/api/src/client/types/app/bsky/feed/post.ts b/packages/api/src/client/types/app/bsky/feed/post.ts
index e358409c0e0..1c921bf4331 100644
--- a/packages/api/src/client/types/app/bsky/feed/post.ts
+++ b/packages/api/src/client/types/app/bsky/feed/post.ts
@@ -2,19 +2,24 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as AppBskyEmbedImages from '../embed/images'
-import * as AppBskyEmbedVideo from '../embed/video'
-import * as AppBskyEmbedExternal from '../embed/external'
-import * as AppBskyEmbedRecord from '../embed/record'
-import * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyRichtextFacet from '../richtext/facet.js'
+import type * as AppBskyEmbedImages from '../embed/images.js'
+import type * as AppBskyEmbedVideo from '../embed/video.js'
+import type * as AppBskyEmbedExternal from '../embed/external.js'
+import type * as AppBskyEmbedRecord from '../embed/record.js'
+import type * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.post'
 
 export interface Record {
+  $type: 'app.bsky.feed.post'
   /** The primary post content. May be an empty string, if there are embeds. */
   text: string
   /** DEPRECATED: replaced by app.bsky.richtext.facet. */
@@ -23,17 +28,15 @@ export interface Record {
   facets?: AppBskyRichtextFacet.Main[]
   reply?: ReplyRef
   embed?:
-    | AppBskyEmbedImages.Main
-    | AppBskyEmbedVideo.Main
-    | AppBskyEmbedExternal.Main
-    | AppBskyEmbedRecord.Main
-    | AppBskyEmbedRecordWithMedia.Main
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyEmbedImages.Main>
+    | $Typed<AppBskyEmbedVideo.Main>
+    | $Typed<AppBskyEmbedExternal.Main>
+    | $Typed<AppBskyEmbedRecord.Main>
+    | $Typed<AppBskyEmbedRecordWithMedia.Main>
+    | { $type: string }
   /** Indicates human language of post primary text content. */
   langs?: string[]
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   /** Additional hashtags, in addition to any included in post text and facets. */
   tags?: string[]
   /** Client-declared timestamp when this post was originally created. */
@@ -41,68 +44,64 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.post#main' || v.$type === 'app.bsky.feed.post')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
 
 export interface ReplyRef {
+  $type?: 'app.bsky.feed.post#replyRef'
   root: ComAtprotoRepoStrongRef.Main
   parent: ComAtprotoRepoStrongRef.Main
-  [k: string]: unknown
 }
 
-export function isReplyRef(v: unknown): v is ReplyRef {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.post#replyRef'
-  )
+const hashReplyRef = 'replyRef'
+
+export function isReplyRef<V>(v: V) {
+  return is$typed(v, id, hashReplyRef)
 }
 
-export function validateReplyRef(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#replyRef', v)
+export function validateReplyRef<V>(v: V) {
+  return validate<ReplyRef & V>(v, id, hashReplyRef)
 }
 
 /** Deprecated: use facets instead. */
 export interface Entity {
+  $type?: 'app.bsky.feed.post#entity'
   index: TextSlice
   /** Expected values are 'mention' and 'link'. */
   type: string
   value: string
-  [k: string]: unknown
 }
 
-export function isEntity(v: unknown): v is Entity {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.post#entity'
-  )
+const hashEntity = 'entity'
+
+export function isEntity<V>(v: V) {
+  return is$typed(v, id, hashEntity)
 }
 
-export function validateEntity(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#entity', v)
+export function validateEntity<V>(v: V) {
+  return validate<Entity & V>(v, id, hashEntity)
 }
 
 /** Deprecated. Use app.bsky.richtext instead -- A text segment. Start is inclusive, end is exclusive. Indices are for utf16-encoded strings. */
 export interface TextSlice {
+  $type?: 'app.bsky.feed.post#textSlice'
   start: number
   end: number
-  [k: string]: unknown
 }
 
-export function isTextSlice(v: unknown): v is TextSlice {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.post#textSlice'
-  )
+const hashTextSlice = 'textSlice'
+
+export function isTextSlice<V>(v: V) {
+  return is$typed(v, id, hashTextSlice)
 }
 
-export function validateTextSlice(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#textSlice', v)
+export function validateTextSlice<V>(v: V) {
+  return validate<TextSlice & V>(v, id, hashTextSlice)
 }
diff --git a/packages/api/src/client/types/app/bsky/feed/postgate.ts b/packages/api/src/client/types/app/bsky/feed/postgate.ts
index e3028385873..3bb6fa929ef 100644
--- a/packages/api/src/client/types/app/bsky/feed/postgate.ts
+++ b/packages/api/src/client/types/app/bsky/feed/postgate.ts
@@ -2,47 +2,47 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.postgate'
 
 export interface Record {
+  $type: 'app.bsky.feed.postgate'
   createdAt: string
   /** Reference (AT-URI) to the post record. */
   post: string
   /** List of AT-URIs embedding this post that the author has detached from. */
   detachedEmbeddingUris?: string[]
   /** List of rules defining who can embed this post. If value is an empty array or is undefined, no particular rules apply and anyone can embed. */
-  embeddingRules?: (DisableRule | { $type: string; [k: string]: unknown })[]
+  embeddingRules?: ($Typed<DisableRule> | { $type: string })[]
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.postgate#main' ||
-      v.$type === 'app.bsky.feed.postgate')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.postgate#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
 
 /** Disables embedding of this post. */
 export interface DisableRule {
-  [k: string]: unknown
+  $type?: 'app.bsky.feed.postgate#disableRule'
 }
 
-export function isDisableRule(v: unknown): v is DisableRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.postgate#disableRule'
-  )
+const hashDisableRule = 'disableRule'
+
+export function isDisableRule<V>(v: V) {
+  return is$typed(v, id, hashDisableRule)
 }
 
-export function validateDisableRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.postgate#disableRule', v)
+export function validateDisableRule<V>(v: V) {
+  return validate<DisableRule & V>(v, id, hashDisableRule)
 }
diff --git a/packages/api/src/client/types/app/bsky/feed/repost.ts b/packages/api/src/client/types/app/bsky/feed/repost.ts
index 2e8f6e75548..00a74c8b617 100644
--- a/packages/api/src/client/types/app/bsky/feed/repost.ts
+++ b/packages/api/src/client/types/app/bsky/feed/repost.ts
@@ -2,26 +2,28 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.repost'
 
 export interface Record {
+  $type: 'app.bsky.feed.repost'
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.repost#main' ||
-      v.$type === 'app.bsky.feed.repost')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.repost#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/api/src/client/types/app/bsky/feed/searchPosts.ts b/packages/api/src/client/types/app/bsky/feed/searchPosts.ts
index 1a2ec64dcd2..0d477a7d7ae 100644
--- a/packages/api/src/client/types/app/bsky/feed/searchPosts.ts
+++ b/packages/api/src/client/types/app/bsky/feed/searchPosts.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyFeedDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.searchPosts'
 
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
@@ -41,7 +45,6 @@ export interface OutputSchema {
   /** Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. */
   hitsTotal?: number
   posts: AppBskyFeedDefs.PostView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/feed/sendInteractions.ts b/packages/api/src/client/types/app/bsky/feed/sendInteractions.ts
index 4d43e26f3dd..8535c458f08 100644
--- a/packages/api/src/client/types/app/bsky/feed/sendInteractions.ts
+++ b/packages/api/src/client/types/app/bsky/feed/sendInteractions.ts
@@ -3,21 +3,22 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyFeedDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.sendInteractions'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   interactions: AppBskyFeedDefs.Interaction[]
-  [k: string]: unknown
 }
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export interface CallOptions {
   signal?: AbortSignal
diff --git a/packages/api/src/client/types/app/bsky/feed/threadgate.ts b/packages/api/src/client/types/app/bsky/feed/threadgate.ts
index 1fe87016dce..e15cda096aa 100644
--- a/packages/api/src/client/types/app/bsky/feed/threadgate.ts
+++ b/packages/api/src/client/types/app/bsky/feed/threadgate.ts
@@ -2,20 +2,25 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.threadgate'
 
 export interface Record {
+  $type: 'app.bsky.feed.threadgate'
   /** Reference (AT-URI) to the post record. */
   post: string
   /** List of rules defining who can reply to this post. If value is an empty array, no one can reply. If value is undefined, anyone can reply. */
   allow?: (
-    | MentionRule
-    | FollowerRule
-    | FollowingRule
-    | ListRule
-    | { $type: string; [k: string]: unknown }
+    | $Typed<MentionRule>
+    | $Typed<FollowerRule>
+    | $Typed<FollowingRule>
+    | $Typed<ListRule>
+    | { $type: string }
   )[]
   createdAt: string
   /** List of hidden reply URIs. */
@@ -23,84 +28,73 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.threadgate#main' ||
-      v.$type === 'app.bsky.feed.threadgate')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
 
 /** Allow replies from actors mentioned in your post. */
 export interface MentionRule {
-  [k: string]: unknown
+  $type?: 'app.bsky.feed.threadgate#mentionRule'
 }
 
-export function isMentionRule(v: unknown): v is MentionRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#mentionRule'
-  )
+const hashMentionRule = 'mentionRule'
+
+export function isMentionRule<V>(v: V) {
+  return is$typed(v, id, hashMentionRule)
 }
 
-export function validateMentionRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#mentionRule', v)
+export function validateMentionRule<V>(v: V) {
+  return validate<MentionRule & V>(v, id, hashMentionRule)
 }
 
 /** Allow replies from actors who follow you. */
 export interface FollowerRule {
-  [k: string]: unknown
+  $type?: 'app.bsky.feed.threadgate#followerRule'
 }
 
-export function isFollowerRule(v: unknown): v is FollowerRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#followerRule'
-  )
+const hashFollowerRule = 'followerRule'
+
+export function isFollowerRule<V>(v: V) {
+  return is$typed(v, id, hashFollowerRule)
 }
 
-export function validateFollowerRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#followerRule', v)
+export function validateFollowerRule<V>(v: V) {
+  return validate<FollowerRule & V>(v, id, hashFollowerRule)
 }
 
 /** Allow replies from actors you follow. */
 export interface FollowingRule {
-  [k: string]: unknown
+  $type?: 'app.bsky.feed.threadgate#followingRule'
 }
 
-export function isFollowingRule(v: unknown): v is FollowingRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#followingRule'
-  )
+const hashFollowingRule = 'followingRule'
+
+export function isFollowingRule<V>(v: V) {
+  return is$typed(v, id, hashFollowingRule)
 }
 
-export function validateFollowingRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#followingRule', v)
+export function validateFollowingRule<V>(v: V) {
+  return validate<FollowingRule & V>(v, id, hashFollowingRule)
 }
 
 /** Allow replies from actors on a list. */
 export interface ListRule {
+  $type?: 'app.bsky.feed.threadgate#listRule'
   list: string
-  [k: string]: unknown
 }
 
-export function isListRule(v: unknown): v is ListRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#listRule'
-  )
+const hashListRule = 'listRule'
+
+export function isListRule<V>(v: V) {
+  return is$typed(v, id, hashListRule)
 }
 
-export function validateListRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#listRule', v)
+export function validateListRule<V>(v: V) {
+  return validate<ListRule & V>(v, id, hashListRule)
 }
diff --git a/packages/api/src/client/types/app/bsky/graph/block.ts b/packages/api/src/client/types/app/bsky/graph/block.ts
index f2455fc08a2..25ff38bd60d 100644
--- a/packages/api/src/client/types/app/bsky/graph/block.ts
+++ b/packages/api/src/client/types/app/bsky/graph/block.ts
@@ -2,26 +2,28 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.block'
 
 export interface Record {
+  $type: 'app.bsky.graph.block'
   /** DID of the account to be blocked. */
   subject: string
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.block#main' ||
-      v.$type === 'app.bsky.graph.block')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.block#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/api/src/client/types/app/bsky/graph/defs.ts b/packages/api/src/client/types/app/bsky/graph/defs.ts
index aa7e2c068b5..bd9a4d6c07e 100644
--- a/packages/api/src/client/types/app/bsky/graph/defs.ts
+++ b/packages/api/src/client/types/app/bsky/graph/defs.ts
@@ -2,15 +2,20 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as AppBskyFeedDefs from '../feed/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+import type * as AppBskyRichtextFacet from '../richtext/facet.js'
+import type * as AppBskyFeedDefs from '../feed/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.defs'
 
 export interface ListViewBasic {
+  $type?: 'app.bsky.graph.defs#listViewBasic'
   uri: string
   cid: string
   name: string
@@ -20,22 +25,20 @@ export interface ListViewBasic {
   labels?: ComAtprotoLabelDefs.Label[]
   viewer?: ListViewerState
   indexedAt?: string
-  [k: string]: unknown
 }
 
-export function isListViewBasic(v: unknown): v is ListViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listViewBasic'
-  )
+const hashListViewBasic = 'listViewBasic'
+
+export function isListViewBasic<V>(v: V) {
+  return is$typed(v, id, hashListViewBasic)
 }
 
-export function validateListViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listViewBasic', v)
+export function validateListViewBasic<V>(v: V) {
+  return validate<ListViewBasic & V>(v, id, hashListViewBasic)
 }
 
 export interface ListView {
+  $type?: 'app.bsky.graph.defs#listView'
   uri: string
   cid: string
   creator: AppBskyActorDefs.ProfileView
@@ -48,43 +51,39 @@ export interface ListView {
   labels?: ComAtprotoLabelDefs.Label[]
   viewer?: ListViewerState
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isListView(v: unknown): v is ListView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listView'
-  )
+const hashListView = 'listView'
+
+export function isListView<V>(v: V) {
+  return is$typed(v, id, hashListView)
 }
 
-export function validateListView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listView', v)
+export function validateListView<V>(v: V) {
+  return validate<ListView & V>(v, id, hashListView)
 }
 
 export interface ListItemView {
+  $type?: 'app.bsky.graph.defs#listItemView'
   uri: string
   subject: AppBskyActorDefs.ProfileView
-  [k: string]: unknown
 }
 
-export function isListItemView(v: unknown): v is ListItemView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listItemView'
-  )
+const hashListItemView = 'listItemView'
+
+export function isListItemView<V>(v: V) {
+  return is$typed(v, id, hashListItemView)
 }
 
-export function validateListItemView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listItemView', v)
+export function validateListItemView<V>(v: V) {
+  return validate<ListItemView & V>(v, id, hashListItemView)
 }
 
 export interface StarterPackView {
+  $type?: 'app.bsky.graph.defs#starterPackView'
   uri: string
   cid: string
-  record: {}
+  record: { [_ in string]: unknown }
   creator: AppBskyActorDefs.ProfileViewBasic
   list?: ListViewBasic
   listItemsSample?: ListItemView[]
@@ -93,44 +92,39 @@ export interface StarterPackView {
   joinedAllTimeCount?: number
   labels?: ComAtprotoLabelDefs.Label[]
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isStarterPackView(v: unknown): v is StarterPackView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#starterPackView'
-  )
+const hashStarterPackView = 'starterPackView'
+
+export function isStarterPackView<V>(v: V) {
+  return is$typed(v, id, hashStarterPackView)
 }
 
-export function validateStarterPackView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#starterPackView', v)
+export function validateStarterPackView<V>(v: V) {
+  return validate<StarterPackView & V>(v, id, hashStarterPackView)
 }
 
 export interface StarterPackViewBasic {
+  $type?: 'app.bsky.graph.defs#starterPackViewBasic'
   uri: string
   cid: string
-  record: {}
+  record: { [_ in string]: unknown }
   creator: AppBskyActorDefs.ProfileViewBasic
   listItemCount?: number
   joinedWeekCount?: number
   joinedAllTimeCount?: number
   labels?: ComAtprotoLabelDefs.Label[]
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isStarterPackViewBasic(v: unknown): v is StarterPackViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#starterPackViewBasic'
-  )
+const hashStarterPackViewBasic = 'starterPackViewBasic'
+
+export function isStarterPackViewBasic<V>(v: V) {
+  return is$typed(v, id, hashStarterPackViewBasic)
 }
 
-export function validateStarterPackViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#starterPackViewBasic', v)
+export function validateStarterPackViewBasic<V>(v: V) {
+  return validate<StarterPackViewBasic & V>(v, id, hashStarterPackViewBasic)
 }
 
 export type ListPurpose =
@@ -140,67 +134,61 @@ export type ListPurpose =
   | (string & {})
 
 /** A list of actors to apply an aggregate moderation action (mute/block) on. */
-export const MODLIST = 'app.bsky.graph.defs#modlist'
+export const MODLIST = `${id}#modlist`
 /** A list of actors used for curation purposes such as list feeds or interaction gating. */
-export const CURATELIST = 'app.bsky.graph.defs#curatelist'
+export const CURATELIST = `${id}#curatelist`
 /** A list of actors used for only for reference purposes such as within a starter pack. */
-export const REFERENCELIST = 'app.bsky.graph.defs#referencelist'
+export const REFERENCELIST = `${id}#referencelist`
 
 export interface ListViewerState {
+  $type?: 'app.bsky.graph.defs#listViewerState'
   muted?: boolean
   blocked?: string
-  [k: string]: unknown
 }
 
-export function isListViewerState(v: unknown): v is ListViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listViewerState'
-  )
+const hashListViewerState = 'listViewerState'
+
+export function isListViewerState<V>(v: V) {
+  return is$typed(v, id, hashListViewerState)
 }
 
-export function validateListViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listViewerState', v)
+export function validateListViewerState<V>(v: V) {
+  return validate<ListViewerState & V>(v, id, hashListViewerState)
 }
 
 /** indicates that a handle or DID could not be resolved */
 export interface NotFoundActor {
+  $type?: 'app.bsky.graph.defs#notFoundActor'
   actor: string
   notFound: true
-  [k: string]: unknown
 }
 
-export function isNotFoundActor(v: unknown): v is NotFoundActor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#notFoundActor'
-  )
+const hashNotFoundActor = 'notFoundActor'
+
+export function isNotFoundActor<V>(v: V) {
+  return is$typed(v, id, hashNotFoundActor)
 }
 
-export function validateNotFoundActor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#notFoundActor', v)
+export function validateNotFoundActor<V>(v: V) {
+  return validate<NotFoundActor & V>(v, id, hashNotFoundActor)
 }
 
 /** lists the bi-directional graph relationships between one actor (not indicated in the object), and the target actors (the DID included in the object) */
 export interface Relationship {
+  $type?: 'app.bsky.graph.defs#relationship'
   did: string
   /** if the actor follows this DID, this is the AT-URI of the follow record */
   following?: string
   /** if the actor is followed by this DID, contains the AT-URI of the follow record */
   followedBy?: string
-  [k: string]: unknown
 }
 
-export function isRelationship(v: unknown): v is Relationship {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#relationship'
-  )
+const hashRelationship = 'relationship'
+
+export function isRelationship<V>(v: V) {
+  return is$typed(v, id, hashRelationship)
 }
 
-export function validateRelationship(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#relationship', v)
+export function validateRelationship<V>(v: V) {
+  return validate<Relationship & V>(v, id, hashRelationship)
 }
diff --git a/packages/api/src/client/types/app/bsky/graph/follow.ts b/packages/api/src/client/types/app/bsky/graph/follow.ts
index a68f434f3c8..79478d39135 100644
--- a/packages/api/src/client/types/app/bsky/graph/follow.ts
+++ b/packages/api/src/client/types/app/bsky/graph/follow.ts
@@ -2,25 +2,27 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.follow'
 
 export interface Record {
+  $type: 'app.bsky.graph.follow'
   subject: string
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.follow#main' ||
-      v.$type === 'app.bsky.graph.follow')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.follow#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/api/src/client/types/app/bsky/graph/getActorStarterPacks.ts b/packages/api/src/client/types/app/bsky/graph/getActorStarterPacks.ts
index bb374e2318d..cb5d0ddea69 100644
--- a/packages/api/src/client/types/app/bsky/graph/getActorStarterPacks.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getActorStarterPacks.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyGraphDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getActorStarterPacks'
 
 export interface QueryParams {
   actor: string
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   starterPacks: AppBskyGraphDefs.StarterPackViewBasic[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/getBlocks.ts b/packages/api/src/client/types/app/bsky/graph/getBlocks.ts
index f0e4bd96bc8..3f622163750 100644
--- a/packages/api/src/client/types/app/bsky/graph/getBlocks.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getBlocks.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyActorDefs from '../actor/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getBlocks'
 
 export interface QueryParams {
   limit?: number
@@ -18,7 +22,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   blocks: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/getFollowers.ts b/packages/api/src/client/types/app/bsky/graph/getFollowers.ts
index f55649dc769..faf9e102588 100644
--- a/packages/api/src/client/types/app/bsky/graph/getFollowers.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getFollowers.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyActorDefs from '../actor/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getFollowers'
 
 export interface QueryParams {
   actor: string
@@ -20,7 +24,6 @@ export interface OutputSchema {
   subject: AppBskyActorDefs.ProfileView
   cursor?: string
   followers: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/getFollows.ts b/packages/api/src/client/types/app/bsky/graph/getFollows.ts
index 8570c4a14c0..f56600a6426 100644
--- a/packages/api/src/client/types/app/bsky/graph/getFollows.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getFollows.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyActorDefs from '../actor/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getFollows'
 
 export interface QueryParams {
   actor: string
@@ -20,7 +24,6 @@ export interface OutputSchema {
   subject: AppBskyActorDefs.ProfileView
   cursor?: string
   follows: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/getKnownFollowers.ts b/packages/api/src/client/types/app/bsky/graph/getKnownFollowers.ts
index f55649dc769..c91899bcd81 100644
--- a/packages/api/src/client/types/app/bsky/graph/getKnownFollowers.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getKnownFollowers.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyActorDefs from '../actor/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getKnownFollowers'
 
 export interface QueryParams {
   actor: string
@@ -20,7 +24,6 @@ export interface OutputSchema {
   subject: AppBskyActorDefs.ProfileView
   cursor?: string
   followers: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/getList.ts b/packages/api/src/client/types/app/bsky/graph/getList.ts
index bebde2b49c3..1e133181af6 100644
--- a/packages/api/src/client/types/app/bsky/graph/getList.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getList.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyGraphDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getList'
 
 export interface QueryParams {
   /** Reference (AT-URI) of the list record to hydrate. */
@@ -21,7 +25,6 @@ export interface OutputSchema {
   cursor?: string
   list: AppBskyGraphDefs.ListView
   items: AppBskyGraphDefs.ListItemView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/getListBlocks.ts b/packages/api/src/client/types/app/bsky/graph/getListBlocks.ts
index d3c7ad5ed7b..31a21664739 100644
--- a/packages/api/src/client/types/app/bsky/graph/getListBlocks.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getListBlocks.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyGraphDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getListBlocks'
 
 export interface QueryParams {
   limit?: number
@@ -18,7 +22,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   lists: AppBskyGraphDefs.ListView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/getListMutes.ts b/packages/api/src/client/types/app/bsky/graph/getListMutes.ts
index d3c7ad5ed7b..82bab605ecc 100644
--- a/packages/api/src/client/types/app/bsky/graph/getListMutes.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getListMutes.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyGraphDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getListMutes'
 
 export interface QueryParams {
   limit?: number
@@ -18,7 +22,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   lists: AppBskyGraphDefs.ListView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/getLists.ts b/packages/api/src/client/types/app/bsky/graph/getLists.ts
index 89a4bfd58df..4066a3c7c9a 100644
--- a/packages/api/src/client/types/app/bsky/graph/getLists.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getLists.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyGraphDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getLists'
 
 export interface QueryParams {
   /** The account (actor) to enumerate lists from. */
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   lists: AppBskyGraphDefs.ListView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/getMutes.ts b/packages/api/src/client/types/app/bsky/graph/getMutes.ts
index 0ee441cf9eb..db4ece098be 100644
--- a/packages/api/src/client/types/app/bsky/graph/getMutes.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getMutes.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyActorDefs from '../actor/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getMutes'
 
 export interface QueryParams {
   limit?: number
@@ -18,7 +22,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   mutes: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/getRelationships.ts b/packages/api/src/client/types/app/bsky/graph/getRelationships.ts
index 20194662b71..5d67dbbf731 100644
--- a/packages/api/src/client/types/app/bsky/graph/getRelationships.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getRelationships.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyGraphDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getRelationships'
 
 export interface QueryParams {
   /** Primary account requesting relationships for. */
@@ -20,11 +24,10 @@ export type InputSchema = undefined
 export interface OutputSchema {
   actor?: string
   relationships: (
-    | AppBskyGraphDefs.Relationship
-    | AppBskyGraphDefs.NotFoundActor
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyGraphDefs.Relationship>
+    | $Typed<AppBskyGraphDefs.NotFoundActor>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/getStarterPack.ts b/packages/api/src/client/types/app/bsky/graph/getStarterPack.ts
index 7eafb2d228d..11f41a3f3ce 100644
--- a/packages/api/src/client/types/app/bsky/graph/getStarterPack.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getStarterPack.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyGraphDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getStarterPack'
 
 export interface QueryParams {
   /** Reference (AT-URI) of the starter pack record. */
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   starterPack: AppBskyGraphDefs.StarterPackView
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/getStarterPacks.ts b/packages/api/src/client/types/app/bsky/graph/getStarterPacks.ts
index 50dbfdbaeda..b354f6e5a42 100644
--- a/packages/api/src/client/types/app/bsky/graph/getStarterPacks.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getStarterPacks.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyGraphDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getStarterPacks'
 
 export interface QueryParams {
   uris: string[]
@@ -16,7 +20,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   starterPacks: AppBskyGraphDefs.StarterPackViewBasic[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/getSuggestedFollowsByActor.ts b/packages/api/src/client/types/app/bsky/graph/getSuggestedFollowsByActor.ts
index fb27392d1b7..744c34a5dd4 100644
--- a/packages/api/src/client/types/app/bsky/graph/getSuggestedFollowsByActor.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getSuggestedFollowsByActor.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyActorDefs from '../actor/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getSuggestedFollowsByActor'
 
 export interface QueryParams {
   actor: string
@@ -20,7 +24,6 @@ export interface OutputSchema {
   isFallback: boolean
   /** Snowflake for this recommendation, use when submitting recommendation events. */
   recId?: number
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/list.ts b/packages/api/src/client/types/app/bsky/graph/list.ts
index fec652ccb12..f899e73317a 100644
--- a/packages/api/src/client/types/app/bsky/graph/list.ts
+++ b/packages/api/src/client/types/app/bsky/graph/list.ts
@@ -2,36 +2,36 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyGraphDefs from './defs'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyGraphDefs from './defs.js'
+import type * as AppBskyRichtextFacet from '../richtext/facet.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.list'
 
 export interface Record {
+  $type: 'app.bsky.graph.list'
   purpose: AppBskyGraphDefs.ListPurpose
   /** Display name for list; can not be empty. */
   name: string
   description?: string
   descriptionFacets?: AppBskyRichtextFacet.Main[]
   avatar?: BlobRef
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.list#main' ||
-      v.$type === 'app.bsky.graph.list')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.list#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/api/src/client/types/app/bsky/graph/listblock.ts b/packages/api/src/client/types/app/bsky/graph/listblock.ts
index e0f02be268f..05a204fa3b5 100644
--- a/packages/api/src/client/types/app/bsky/graph/listblock.ts
+++ b/packages/api/src/client/types/app/bsky/graph/listblock.ts
@@ -2,26 +2,28 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.listblock'
 
 export interface Record {
+  $type: 'app.bsky.graph.listblock'
   /** Reference (AT-URI) to the mod list record. */
   subject: string
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.listblock#main' ||
-      v.$type === 'app.bsky.graph.listblock')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.listblock#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/api/src/client/types/app/bsky/graph/listitem.ts b/packages/api/src/client/types/app/bsky/graph/listitem.ts
index d4fb5631e84..46e0ccbf206 100644
--- a/packages/api/src/client/types/app/bsky/graph/listitem.ts
+++ b/packages/api/src/client/types/app/bsky/graph/listitem.ts
@@ -2,11 +2,16 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.listitem'
 
 export interface Record {
+  $type: 'app.bsky.graph.listitem'
   /** The account which is included on the list. */
   subject: string
   /** Reference (AT-URI) to the list record (app.bsky.graph.list). */
@@ -15,15 +20,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.listitem#main' ||
-      v.$type === 'app.bsky.graph.listitem')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.listitem#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/api/src/client/types/app/bsky/graph/muteActor.ts b/packages/api/src/client/types/app/bsky/graph/muteActor.ts
index c21c00b2069..87007e9b0ec 100644
--- a/packages/api/src/client/types/app/bsky/graph/muteActor.ts
+++ b/packages/api/src/client/types/app/bsky/graph/muteActor.ts
@@ -3,15 +3,18 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.muteActor'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   actor: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/muteActorList.ts b/packages/api/src/client/types/app/bsky/graph/muteActorList.ts
index 8a0e8586deb..8b4b818d2e9 100644
--- a/packages/api/src/client/types/app/bsky/graph/muteActorList.ts
+++ b/packages/api/src/client/types/app/bsky/graph/muteActorList.ts
@@ -3,15 +3,18 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.muteActorList'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   list: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/muteThread.ts b/packages/api/src/client/types/app/bsky/graph/muteThread.ts
index 275ba7a0f22..fb8bc07bc14 100644
--- a/packages/api/src/client/types/app/bsky/graph/muteThread.ts
+++ b/packages/api/src/client/types/app/bsky/graph/muteThread.ts
@@ -3,15 +3,18 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.muteThread'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   root: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/searchStarterPacks.ts b/packages/api/src/client/types/app/bsky/graph/searchStarterPacks.ts
index 8291b219a62..162234851e5 100644
--- a/packages/api/src/client/types/app/bsky/graph/searchStarterPacks.ts
+++ b/packages/api/src/client/types/app/bsky/graph/searchStarterPacks.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyGraphDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.searchStarterPacks'
 
 export interface QueryParams {
   /** Search query string. Syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   starterPacks: AppBskyGraphDefs.StarterPackViewBasic[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/starterpack.ts b/packages/api/src/client/types/app/bsky/graph/starterpack.ts
index 7cb0aa26c3f..d7761245080 100644
--- a/packages/api/src/client/types/app/bsky/graph/starterpack.ts
+++ b/packages/api/src/client/types/app/bsky/graph/starterpack.ts
@@ -2,12 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyRichtextFacet from '../richtext/facet'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyRichtextFacet from '../richtext/facet.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.starterpack'
 
 export interface Record {
+  $type: 'app.bsky.graph.starterpack'
   /** Display name for starter pack; can not be empty. */
   name: string
   description?: string
@@ -19,32 +24,27 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.starterpack#main' ||
-      v.$type === 'app.bsky.graph.starterpack')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.starterpack#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
 
 export interface FeedItem {
+  $type?: 'app.bsky.graph.starterpack#feedItem'
   uri: string
-  [k: string]: unknown
 }
 
-export function isFeedItem(v: unknown): v is FeedItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.starterpack#feedItem'
-  )
+const hashFeedItem = 'feedItem'
+
+export function isFeedItem<V>(v: V) {
+  return is$typed(v, id, hashFeedItem)
 }
 
-export function validateFeedItem(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.starterpack#feedItem', v)
+export function validateFeedItem<V>(v: V) {
+  return validate<FeedItem & V>(v, id, hashFeedItem)
 }
diff --git a/packages/api/src/client/types/app/bsky/graph/unmuteActor.ts b/packages/api/src/client/types/app/bsky/graph/unmuteActor.ts
index c21c00b2069..b6e4394b5be 100644
--- a/packages/api/src/client/types/app/bsky/graph/unmuteActor.ts
+++ b/packages/api/src/client/types/app/bsky/graph/unmuteActor.ts
@@ -3,15 +3,18 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.unmuteActor'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   actor: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/unmuteActorList.ts b/packages/api/src/client/types/app/bsky/graph/unmuteActorList.ts
index 8a0e8586deb..de8f3676ebe 100644
--- a/packages/api/src/client/types/app/bsky/graph/unmuteActorList.ts
+++ b/packages/api/src/client/types/app/bsky/graph/unmuteActorList.ts
@@ -3,15 +3,18 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.unmuteActorList'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   list: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/graph/unmuteThread.ts b/packages/api/src/client/types/app/bsky/graph/unmuteThread.ts
index 275ba7a0f22..fafceb748b5 100644
--- a/packages/api/src/client/types/app/bsky/graph/unmuteThread.ts
+++ b/packages/api/src/client/types/app/bsky/graph/unmuteThread.ts
@@ -3,15 +3,18 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.unmuteThread'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   root: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/labeler/defs.ts b/packages/api/src/client/types/app/bsky/labeler/defs.ts
index 3d9b1d77f8a..453b010db5e 100644
--- a/packages/api/src/client/types/app/bsky/labeler/defs.ts
+++ b/packages/api/src/client/types/app/bsky/labeler/defs.ts
@@ -2,13 +2,18 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.labeler.defs'
 
 export interface LabelerView {
+  $type?: 'app.bsky.labeler.defs#labelerView'
   uri: string
   cid: string
   creator: AppBskyActorDefs.ProfileView
@@ -16,22 +21,20 @@ export interface LabelerView {
   viewer?: LabelerViewerState
   indexedAt: string
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isLabelerView(v: unknown): v is LabelerView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerView'
-  )
+const hashLabelerView = 'labelerView'
+
+export function isLabelerView<V>(v: V) {
+  return is$typed(v, id, hashLabelerView)
 }
 
-export function validateLabelerView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerView', v)
+export function validateLabelerView<V>(v: V) {
+  return validate<LabelerView & V>(v, id, hashLabelerView)
 }
 
 export interface LabelerViewDetailed {
+  $type?: 'app.bsky.labeler.defs#labelerViewDetailed'
   uri: string
   cid: string
   creator: AppBskyActorDefs.ProfileView
@@ -40,54 +43,47 @@ export interface LabelerViewDetailed {
   viewer?: LabelerViewerState
   indexedAt: string
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isLabelerViewDetailed(v: unknown): v is LabelerViewDetailed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerViewDetailed'
-  )
+const hashLabelerViewDetailed = 'labelerViewDetailed'
+
+export function isLabelerViewDetailed<V>(v: V) {
+  return is$typed(v, id, hashLabelerViewDetailed)
 }
 
-export function validateLabelerViewDetailed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerViewDetailed', v)
+export function validateLabelerViewDetailed<V>(v: V) {
+  return validate<LabelerViewDetailed & V>(v, id, hashLabelerViewDetailed)
 }
 
 export interface LabelerViewerState {
+  $type?: 'app.bsky.labeler.defs#labelerViewerState'
   like?: string
-  [k: string]: unknown
 }
 
-export function isLabelerViewerState(v: unknown): v is LabelerViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerViewerState'
-  )
+const hashLabelerViewerState = 'labelerViewerState'
+
+export function isLabelerViewerState<V>(v: V) {
+  return is$typed(v, id, hashLabelerViewerState)
 }
 
-export function validateLabelerViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerViewerState', v)
+export function validateLabelerViewerState<V>(v: V) {
+  return validate<LabelerViewerState & V>(v, id, hashLabelerViewerState)
 }
 
 export interface LabelerPolicies {
+  $type?: 'app.bsky.labeler.defs#labelerPolicies'
   /** The label values which this labeler publishes. May include global or custom labels. */
   labelValues: ComAtprotoLabelDefs.LabelValue[]
   /** Label values created by this labeler and scoped exclusively to it. Labels defined here will override global label definitions for this labeler. */
   labelValueDefinitions?: ComAtprotoLabelDefs.LabelValueDefinition[]
-  [k: string]: unknown
 }
 
-export function isLabelerPolicies(v: unknown): v is LabelerPolicies {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerPolicies'
-  )
+const hashLabelerPolicies = 'labelerPolicies'
+
+export function isLabelerPolicies<V>(v: V) {
+  return is$typed(v, id, hashLabelerPolicies)
 }
 
-export function validateLabelerPolicies(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerPolicies', v)
+export function validateLabelerPolicies<V>(v: V) {
+  return validate<LabelerPolicies & V>(v, id, hashLabelerPolicies)
 }
diff --git a/packages/api/src/client/types/app/bsky/labeler/getServices.ts b/packages/api/src/client/types/app/bsky/labeler/getServices.ts
index 688f847d508..51875290cde 100644
--- a/packages/api/src/client/types/app/bsky/labeler/getServices.ts
+++ b/packages/api/src/client/types/app/bsky/labeler/getServices.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyLabelerDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyLabelerDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.labeler.getServices'
 
 export interface QueryParams {
   dids: string[]
@@ -17,11 +21,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   views: (
-    | AppBskyLabelerDefs.LabelerView
-    | AppBskyLabelerDefs.LabelerViewDetailed
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyLabelerDefs.LabelerView>
+    | $Typed<AppBskyLabelerDefs.LabelerViewDetailed>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/labeler/service.ts b/packages/api/src/client/types/app/bsky/labeler/service.ts
index 818249468ec..368f71e53bc 100644
--- a/packages/api/src/client/types/app/bsky/labeler/service.ts
+++ b/packages/api/src/client/types/app/bsky/labeler/service.ts
@@ -2,30 +2,30 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyLabelerDefs from './defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyLabelerDefs from './defs.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.labeler.service'
 
 export interface Record {
+  $type: 'app.bsky.labeler.service'
   policies: AppBskyLabelerDefs.LabelerPolicies
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.labeler.service#main' ||
-      v.$type === 'app.bsky.labeler.service')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.service#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/api/src/client/types/app/bsky/notification/getUnreadCount.ts b/packages/api/src/client/types/app/bsky/notification/getUnreadCount.ts
index 00600ea54e7..77e8c5626be 100644
--- a/packages/api/src/client/types/app/bsky/notification/getUnreadCount.ts
+++ b/packages/api/src/client/types/app/bsky/notification/getUnreadCount.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.notification.getUnreadCount'
 
 export interface QueryParams {
   priority?: boolean
@@ -16,7 +20,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   count: number
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/notification/listNotifications.ts b/packages/api/src/client/types/app/bsky/notification/listNotifications.ts
index 92b3a27fece..13cc4367875 100644
--- a/packages/api/src/client/types/app/bsky/notification/listNotifications.ts
+++ b/packages/api/src/client/types/app/bsky/notification/listNotifications.ts
@@ -3,11 +3,15 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.notification.listNotifications'
 
 export interface QueryParams {
   /** Notification reasons to include in response. */
@@ -25,7 +29,6 @@ export interface OutputSchema {
   notifications: Notification[]
   priority?: boolean
   seenAt?: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -44,6 +47,7 @@ export function toKnownErr(e: any) {
 }
 
 export interface Notification {
+  $type?: 'app.bsky.notification.listNotifications#notification'
   uri: string
   cid: string
   author: AppBskyActorDefs.ProfileView
@@ -58,24 +62,18 @@ export interface Notification {
     | 'starterpack-joined'
     | (string & {})
   reasonSubject?: string
-  record: {}
+  record: { [_ in string]: unknown }
   isRead: boolean
   indexedAt: string
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isNotification(v: unknown): v is Notification {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.notification.listNotifications#notification'
-  )
+const hashNotification = 'notification'
+
+export function isNotification<V>(v: V) {
+  return is$typed(v, id, hashNotification)
 }
 
-export function validateNotification(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'app.bsky.notification.listNotifications#notification',
-    v,
-  )
+export function validateNotification<V>(v: V) {
+  return validate<Notification & V>(v, id, hashNotification)
 }
diff --git a/packages/api/src/client/types/app/bsky/notification/putPreferences.ts b/packages/api/src/client/types/app/bsky/notification/putPreferences.ts
index bc79909f459..fb6f0054c05 100644
--- a/packages/api/src/client/types/app/bsky/notification/putPreferences.ts
+++ b/packages/api/src/client/types/app/bsky/notification/putPreferences.ts
@@ -3,15 +3,18 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.notification.putPreferences'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   priority: boolean
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/notification/registerPush.ts b/packages/api/src/client/types/app/bsky/notification/registerPush.ts
index ddc9d438537..87ebb721451 100644
--- a/packages/api/src/client/types/app/bsky/notification/registerPush.ts
+++ b/packages/api/src/client/types/app/bsky/notification/registerPush.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.notification.registerPush'
 
 export interface QueryParams {}
 
@@ -14,7 +18,6 @@ export interface InputSchema {
   token: string
   platform: 'ios' | 'android' | 'web' | (string & {})
   appId: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/notification/updateSeen.ts b/packages/api/src/client/types/app/bsky/notification/updateSeen.ts
index 7151e9b0cd4..dc2e4905fbe 100644
--- a/packages/api/src/client/types/app/bsky/notification/updateSeen.ts
+++ b/packages/api/src/client/types/app/bsky/notification/updateSeen.ts
@@ -3,15 +3,18 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.notification.updateSeen'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   seenAt: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/richtext/facet.ts b/packages/api/src/client/types/app/bsky/richtext/facet.ts
index 836136b7dac..8085d33c8ee 100644
--- a/packages/api/src/client/types/app/bsky/richtext/facet.ts
+++ b/packages/api/src/client/types/app/bsky/richtext/facet.ts
@@ -2,97 +2,92 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.richtext.facet'
 
 /** Annotation of a sub-string within rich text. */
 export interface Main {
+  $type?: 'app.bsky.richtext.facet'
   index: ByteSlice
-  features: (Mention | Link | Tag | { $type: string; [k: string]: unknown })[]
-  [k: string]: unknown
+  features: ($Typed<Mention> | $Typed<Link> | $Typed<Tag> | { $type: string })[]
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.richtext.facet#main' ||
-      v.$type === 'app.bsky.richtext.facet')
-  )
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#main', v)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
 /** Facet feature for mention of another account. The text is usually a handle, including a '@' prefix, but the facet reference is a DID. */
 export interface Mention {
+  $type?: 'app.bsky.richtext.facet#mention'
   did: string
-  [k: string]: unknown
 }
 
-export function isMention(v: unknown): v is Mention {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#mention'
-  )
+const hashMention = 'mention'
+
+export function isMention<V>(v: V) {
+  return is$typed(v, id, hashMention)
 }
 
-export function validateMention(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#mention', v)
+export function validateMention<V>(v: V) {
+  return validate<Mention & V>(v, id, hashMention)
 }
 
 /** Facet feature for a URL. The text URL may have been simplified or truncated, but the facet reference should be a complete URL. */
 export interface Link {
+  $type?: 'app.bsky.richtext.facet#link'
   uri: string
-  [k: string]: unknown
 }
 
-export function isLink(v: unknown): v is Link {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#link'
-  )
+const hashLink = 'link'
+
+export function isLink<V>(v: V) {
+  return is$typed(v, id, hashLink)
 }
 
-export function validateLink(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#link', v)
+export function validateLink<V>(v: V) {
+  return validate<Link & V>(v, id, hashLink)
 }
 
 /** Facet feature for a hashtag. The text usually includes a '#' prefix, but the facet reference should not (except in the case of 'double hash tags'). */
 export interface Tag {
+  $type?: 'app.bsky.richtext.facet#tag'
   tag: string
-  [k: string]: unknown
 }
 
-export function isTag(v: unknown): v is Tag {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.richtext.facet#tag'
-  )
+const hashTag = 'tag'
+
+export function isTag<V>(v: V) {
+  return is$typed(v, id, hashTag)
 }
 
-export function validateTag(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#tag', v)
+export function validateTag<V>(v: V) {
+  return validate<Tag & V>(v, id, hashTag)
 }
 
 /** Specifies the sub-string range a facet feature applies to. Start index is inclusive, end index is exclusive. Indices are zero-indexed, counting bytes of the UTF-8 encoded text. NOTE: some languages, like Javascript, use UTF-16 or Unicode codepoints for string slice indexing; in these languages, convert to byte arrays before working with facets. */
 export interface ByteSlice {
+  $type?: 'app.bsky.richtext.facet#byteSlice'
   byteStart: number
   byteEnd: number
-  [k: string]: unknown
 }
 
-export function isByteSlice(v: unknown): v is ByteSlice {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#byteSlice'
-  )
+const hashByteSlice = 'byteSlice'
+
+export function isByteSlice<V>(v: V) {
+  return is$typed(v, id, hashByteSlice)
 }
 
-export function validateByteSlice(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#byteSlice', v)
+export function validateByteSlice<V>(v: V) {
+  return validate<ByteSlice & V>(v, id, hashByteSlice)
 }
diff --git a/packages/api/src/client/types/app/bsky/unspecced/defs.ts b/packages/api/src/client/types/app/bsky/unspecced/defs.ts
index 81f821ecf73..6bde35e5709 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/defs.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/defs.ts
@@ -2,84 +2,77 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.defs'
 
 export interface SkeletonSearchPost {
+  $type?: 'app.bsky.unspecced.defs#skeletonSearchPost'
   uri: string
-  [k: string]: unknown
 }
 
-export function isSkeletonSearchPost(v: unknown): v is SkeletonSearchPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#skeletonSearchPost'
-  )
+const hashSkeletonSearchPost = 'skeletonSearchPost'
+
+export function isSkeletonSearchPost<V>(v: V) {
+  return is$typed(v, id, hashSkeletonSearchPost)
 }
 
-export function validateSkeletonSearchPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.unspecced.defs#skeletonSearchPost', v)
+export function validateSkeletonSearchPost<V>(v: V) {
+  return validate<SkeletonSearchPost & V>(v, id, hashSkeletonSearchPost)
 }
 
 export interface SkeletonSearchActor {
+  $type?: 'app.bsky.unspecced.defs#skeletonSearchActor'
   did: string
-  [k: string]: unknown
 }
 
-export function isSkeletonSearchActor(v: unknown): v is SkeletonSearchActor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#skeletonSearchActor'
-  )
+const hashSkeletonSearchActor = 'skeletonSearchActor'
+
+export function isSkeletonSearchActor<V>(v: V) {
+  return is$typed(v, id, hashSkeletonSearchActor)
 }
 
-export function validateSkeletonSearchActor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.unspecced.defs#skeletonSearchActor', v)
+export function validateSkeletonSearchActor<V>(v: V) {
+  return validate<SkeletonSearchActor & V>(v, id, hashSkeletonSearchActor)
 }
 
 export interface SkeletonSearchStarterPack {
+  $type?: 'app.bsky.unspecced.defs#skeletonSearchStarterPack'
   uri: string
-  [k: string]: unknown
 }
 
-export function isSkeletonSearchStarterPack(
-  v: unknown,
-): v is SkeletonSearchStarterPack {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#skeletonSearchStarterPack'
-  )
+const hashSkeletonSearchStarterPack = 'skeletonSearchStarterPack'
+
+export function isSkeletonSearchStarterPack<V>(v: V) {
+  return is$typed(v, id, hashSkeletonSearchStarterPack)
 }
 
-export function validateSkeletonSearchStarterPack(
-  v: unknown,
-): ValidationResult {
-  return lexicons.validate(
-    'app.bsky.unspecced.defs#skeletonSearchStarterPack',
+export function validateSkeletonSearchStarterPack<V>(v: V) {
+  return validate<SkeletonSearchStarterPack & V>(
     v,
+    id,
+    hashSkeletonSearchStarterPack,
   )
 }
 
 export interface TrendingTopic {
+  $type?: 'app.bsky.unspecced.defs#trendingTopic'
   topic: string
   displayName?: string
   description?: string
   link: string
-  [k: string]: unknown
 }
 
-export function isTrendingTopic(v: unknown): v is TrendingTopic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#trendingTopic'
-  )
+const hashTrendingTopic = 'trendingTopic'
+
+export function isTrendingTopic<V>(v: V) {
+  return is$typed(v, id, hashTrendingTopic)
 }
 
-export function validateTrendingTopic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.unspecced.defs#trendingTopic', v)
+export function validateTrendingTopic<V>(v: V) {
+  return validate<TrendingTopic & V>(v, id, hashTrendingTopic)
 }
diff --git a/packages/api/src/client/types/app/bsky/unspecced/getConfig.ts b/packages/api/src/client/types/app/bsky/unspecced/getConfig.ts
index d1ee6f7957d..b75201aec3a 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/getConfig.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/getConfig.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.getConfig'
 
 export interface QueryParams {}
 
@@ -13,7 +17,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   checkEmailConfirmed?: boolean
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/unspecced/getPopularFeedGenerators.ts b/packages/api/src/client/types/app/bsky/unspecced/getPopularFeedGenerators.ts
index 780b4b6641c..7d08a854ede 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/getPopularFeedGenerators.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/getPopularFeedGenerators.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyFeedDefs from '../feed/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyFeedDefs from '../feed/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.getPopularFeedGenerators'
 
 export interface QueryParams {
   limit?: number
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feeds: AppBskyFeedDefs.GeneratorView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/unspecced/getSuggestionsSkeleton.ts b/packages/api/src/client/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
index 0759165f1d0..45d7c11df39 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyUnspeccedDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyUnspeccedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.getSuggestionsSkeleton'
 
 export interface QueryParams {
   /** DID of the account making the request (not included for public/unauthenticated queries). Used to boost followed accounts in ranking. */
@@ -26,7 +30,6 @@ export interface OutputSchema {
   relativeToDid?: string
   /** Snowflake for this recommendation, use when submitting recommendation events. */
   recId?: number
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/unspecced/getTaggedSuggestions.ts b/packages/api/src/client/types/app/bsky/unspecced/getTaggedSuggestions.ts
index 0ee04b8e85d..28efdc1ad7a 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/getTaggedSuggestions.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/getTaggedSuggestions.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.getTaggedSuggestions'
 
 export interface QueryParams {}
 
@@ -13,7 +17,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   suggestions: Suggestion[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -32,23 +35,18 @@ export function toKnownErr(e: any) {
 }
 
 export interface Suggestion {
+  $type?: 'app.bsky.unspecced.getTaggedSuggestions#suggestion'
   tag: string
   subjectType: 'actor' | 'feed' | (string & {})
   subject: string
-  [k: string]: unknown
 }
 
-export function isSuggestion(v: unknown): v is Suggestion {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.getTaggedSuggestions#suggestion'
-  )
+const hashSuggestion = 'suggestion'
+
+export function isSuggestion<V>(v: V) {
+  return is$typed(v, id, hashSuggestion)
 }
 
-export function validateSuggestion(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'app.bsky.unspecced.getTaggedSuggestions#suggestion',
-    v,
-  )
+export function validateSuggestion<V>(v: V) {
+  return validate<Suggestion & V>(v, id, hashSuggestion)
 }
diff --git a/packages/api/src/client/types/app/bsky/unspecced/getTrendingTopics.ts b/packages/api/src/client/types/app/bsky/unspecced/getTrendingTopics.ts
index 70e790e14ba..9877d3744aa 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/getTrendingTopics.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/getTrendingTopics.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyUnspeccedDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyUnspeccedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.getTrendingTopics'
 
 export interface QueryParams {
   /** DID of the account making the request (not included for public/unauthenticated queries). Used to boost followed accounts in ranking. */
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   topics: AppBskyUnspeccedDefs.TrendingTopic[]
   suggested: AppBskyUnspeccedDefs.TrendingTopic[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/unspecced/searchActorsSkeleton.ts b/packages/api/src/client/types/app/bsky/unspecced/searchActorsSkeleton.ts
index d9fe6737d37..4bd5de8572a 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/searchActorsSkeleton.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/searchActorsSkeleton.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyUnspeccedDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyUnspeccedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.searchActorsSkeleton'
 
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. For typeahead search, only simple term match is supported, not full syntax. */
@@ -27,7 +31,6 @@ export interface OutputSchema {
   /** Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. */
   hitsTotal?: number
   actors: AppBskyUnspeccedDefs.SkeletonSearchActor[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/unspecced/searchPostsSkeleton.ts b/packages/api/src/client/types/app/bsky/unspecced/searchPostsSkeleton.ts
index ea0135dde83..a75698c27b7 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/searchPostsSkeleton.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/searchPostsSkeleton.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyUnspeccedDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyUnspeccedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.searchPostsSkeleton'
 
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
@@ -43,7 +47,6 @@ export interface OutputSchema {
   /** Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. */
   hitsTotal?: number
   posts: AppBskyUnspeccedDefs.SkeletonSearchPost[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts b/packages/api/src/client/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
index c331b86d3e1..525d71af30b 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyUnspeccedDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyUnspeccedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.searchStarterPacksSkeleton'
 
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
@@ -25,7 +29,6 @@ export interface OutputSchema {
   /** Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. */
   hitsTotal?: number
   starterPacks: AppBskyUnspeccedDefs.SkeletonSearchStarterPack[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/video/defs.ts b/packages/api/src/client/types/app/bsky/video/defs.ts
index a7ec84316b6..15079613e68 100644
--- a/packages/api/src/client/types/app/bsky/video/defs.ts
+++ b/packages/api/src/client/types/app/bsky/video/defs.ts
@@ -2,11 +2,16 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.video.defs'
 
 export interface JobStatus {
+  $type?: 'app.bsky.video.defs#jobStatus'
   jobId: string
   did: string
   /** The state of the video processing job. All values not listed as a known value indicate that the job is in process. */
@@ -16,17 +21,14 @@ export interface JobStatus {
   blob?: BlobRef
   error?: string
   message?: string
-  [k: string]: unknown
 }
 
-export function isJobStatus(v: unknown): v is JobStatus {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.video.defs#jobStatus'
-  )
+const hashJobStatus = 'jobStatus'
+
+export function isJobStatus<V>(v: V) {
+  return is$typed(v, id, hashJobStatus)
 }
 
-export function validateJobStatus(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.video.defs#jobStatus', v)
+export function validateJobStatus<V>(v: V) {
+  return validate<JobStatus & V>(v, id, hashJobStatus)
 }
diff --git a/packages/api/src/client/types/app/bsky/video/getJobStatus.ts b/packages/api/src/client/types/app/bsky/video/getJobStatus.ts
index 0e9638311c0..d9ff3c1c2a4 100644
--- a/packages/api/src/client/types/app/bsky/video/getJobStatus.ts
+++ b/packages/api/src/client/types/app/bsky/video/getJobStatus.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyVideoDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyVideoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.video.getJobStatus'
 
 export interface QueryParams {
   jobId: string
@@ -16,7 +20,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   jobStatus: AppBskyVideoDefs.JobStatus
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/video/getUploadLimits.ts b/packages/api/src/client/types/app/bsky/video/getUploadLimits.ts
index 4a2f13617b3..08780b06455 100644
--- a/packages/api/src/client/types/app/bsky/video/getUploadLimits.ts
+++ b/packages/api/src/client/types/app/bsky/video/getUploadLimits.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.video.getUploadLimits'
 
 export interface QueryParams {}
 
@@ -17,7 +21,6 @@ export interface OutputSchema {
   remainingDailyBytes?: number
   message?: string
   error?: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/app/bsky/video/uploadVideo.ts b/packages/api/src/client/types/app/bsky/video/uploadVideo.ts
index f51ba897bbe..2881aee071e 100644
--- a/packages/api/src/client/types/app/bsky/video/uploadVideo.ts
+++ b/packages/api/src/client/types/app/bsky/video/uploadVideo.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyVideoDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyVideoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.video.uploadVideo'
 
 export interface QueryParams {}
 
@@ -14,7 +18,6 @@ export type InputSchema = string | Uint8Array | Blob
 
 export interface OutputSchema {
   jobStatus: AppBskyVideoDefs.JobStatus
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/chat/bsky/actor/declaration.ts b/packages/api/src/client/types/chat/bsky/actor/declaration.ts
index 99b14f45608..b153d13a088 100644
--- a/packages/api/src/client/types/chat/bsky/actor/declaration.ts
+++ b/packages/api/src/client/types/chat/bsky/actor/declaration.ts
@@ -2,24 +2,26 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.actor.declaration'
 
 export interface Record {
+  $type: 'chat.bsky.actor.declaration'
   allowIncoming: 'all' | 'none' | 'following' | (string & {})
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'chat.bsky.actor.declaration#main' ||
-      v.$type === 'chat.bsky.actor.declaration')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.actor.declaration#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/api/src/client/types/chat/bsky/actor/defs.ts b/packages/api/src/client/types/chat/bsky/actor/defs.ts
index 87aaac96218..031c1d1a87c 100644
--- a/packages/api/src/client/types/chat/bsky/actor/defs.ts
+++ b/packages/api/src/client/types/chat/bsky/actor/defs.ts
@@ -2,13 +2,18 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../../../app/bsky/actor/defs.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.actor.defs'
 
 export interface ProfileViewBasic {
+  $type?: 'chat.bsky.actor.defs#profileViewBasic'
   did: string
   handle: string
   displayName?: string
@@ -18,17 +23,14 @@ export interface ProfileViewBasic {
   labels?: ComAtprotoLabelDefs.Label[]
   /** Set to true when the actor cannot actively participate in converations */
   chatDisabled?: boolean
-  [k: string]: unknown
 }
 
-export function isProfileViewBasic(v: unknown): v is ProfileViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.actor.defs#profileViewBasic'
-  )
+const hashProfileViewBasic = 'profileViewBasic'
+
+export function isProfileViewBasic<V>(v: V) {
+  return is$typed(v, id, hashProfileViewBasic)
 }
 
-export function validateProfileViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.actor.defs#profileViewBasic', v)
+export function validateProfileViewBasic<V>(v: V) {
+  return validate<ProfileViewBasic & V>(v, id, hashProfileViewBasic)
 }
diff --git a/packages/api/src/client/types/chat/bsky/actor/deleteAccount.ts b/packages/api/src/client/types/chat/bsky/actor/deleteAccount.ts
index 1a045c21c29..7d65ebe0483 100644
--- a/packages/api/src/client/types/chat/bsky/actor/deleteAccount.ts
+++ b/packages/api/src/client/types/chat/bsky/actor/deleteAccount.ts
@@ -3,17 +3,19 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.actor.deleteAccount'
 
 export interface QueryParams {}
 
 export type InputSchema = undefined
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export interface CallOptions {
   signal?: AbortSignal
diff --git a/packages/api/src/client/types/chat/bsky/actor/exportAccountData.ts b/packages/api/src/client/types/chat/bsky/actor/exportAccountData.ts
index 0142436b05e..730dbdf381d 100644
--- a/packages/api/src/client/types/chat/bsky/actor/exportAccountData.ts
+++ b/packages/api/src/client/types/chat/bsky/actor/exportAccountData.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.actor.exportAccountData'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/chat/bsky/convo/defs.ts b/packages/api/src/client/types/chat/bsky/convo/defs.ts
index 4908b2dc46a..4d458fb798e 100644
--- a/packages/api/src/client/types/chat/bsky/convo/defs.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/defs.ts
@@ -2,215 +2,193 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyRichtextFacet from '../../../app/bsky/richtext/facet'
-import * as AppBskyEmbedRecord from '../../../app/bsky/embed/record'
-import * as ChatBskyActorDefs from '../actor/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyRichtextFacet from '../../../app/bsky/richtext/facet.js'
+import type * as AppBskyEmbedRecord from '../../../app/bsky/embed/record.js'
+import type * as ChatBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.defs'
 
 export interface MessageRef {
+  $type?: 'chat.bsky.convo.defs#messageRef'
   did: string
   convoId: string
   messageId: string
-  [k: string]: unknown
 }
 
-export function isMessageRef(v: unknown): v is MessageRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageRef'
-  )
+const hashMessageRef = 'messageRef'
+
+export function isMessageRef<V>(v: V) {
+  return is$typed(v, id, hashMessageRef)
 }
 
-export function validateMessageRef(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageRef', v)
+export function validateMessageRef<V>(v: V) {
+  return validate<MessageRef & V>(v, id, hashMessageRef)
 }
 
 export interface MessageInput {
+  $type?: 'chat.bsky.convo.defs#messageInput'
   text: string
   /** Annotations of text (mentions, URLs, hashtags, etc) */
   facets?: AppBskyRichtextFacet.Main[]
-  embed?: AppBskyEmbedRecord.Main | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+  embed?: $Typed<AppBskyEmbedRecord.Main> | { $type: string }
 }
 
-export function isMessageInput(v: unknown): v is MessageInput {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageInput'
-  )
+const hashMessageInput = 'messageInput'
+
+export function isMessageInput<V>(v: V) {
+  return is$typed(v, id, hashMessageInput)
 }
 
-export function validateMessageInput(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageInput', v)
+export function validateMessageInput<V>(v: V) {
+  return validate<MessageInput & V>(v, id, hashMessageInput)
 }
 
 export interface MessageView {
+  $type?: 'chat.bsky.convo.defs#messageView'
   id: string
   rev: string
   text: string
   /** Annotations of text (mentions, URLs, hashtags, etc) */
   facets?: AppBskyRichtextFacet.Main[]
-  embed?: AppBskyEmbedRecord.View | { $type: string; [k: string]: unknown }
+  embed?: $Typed<AppBskyEmbedRecord.View> | { $type: string }
   sender: MessageViewSender
   sentAt: string
-  [k: string]: unknown
 }
 
-export function isMessageView(v: unknown): v is MessageView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageView'
-  )
+const hashMessageView = 'messageView'
+
+export function isMessageView<V>(v: V) {
+  return is$typed(v, id, hashMessageView)
 }
 
-export function validateMessageView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageView', v)
+export function validateMessageView<V>(v: V) {
+  return validate<MessageView & V>(v, id, hashMessageView)
 }
 
 export interface DeletedMessageView {
+  $type?: 'chat.bsky.convo.defs#deletedMessageView'
   id: string
   rev: string
   sender: MessageViewSender
   sentAt: string
-  [k: string]: unknown
 }
 
-export function isDeletedMessageView(v: unknown): v is DeletedMessageView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#deletedMessageView'
-  )
+const hashDeletedMessageView = 'deletedMessageView'
+
+export function isDeletedMessageView<V>(v: V) {
+  return is$typed(v, id, hashDeletedMessageView)
 }
 
-export function validateDeletedMessageView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#deletedMessageView', v)
+export function validateDeletedMessageView<V>(v: V) {
+  return validate<DeletedMessageView & V>(v, id, hashDeletedMessageView)
 }
 
 export interface MessageViewSender {
+  $type?: 'chat.bsky.convo.defs#messageViewSender'
   did: string
-  [k: string]: unknown
 }
 
-export function isMessageViewSender(v: unknown): v is MessageViewSender {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageViewSender'
-  )
+const hashMessageViewSender = 'messageViewSender'
+
+export function isMessageViewSender<V>(v: V) {
+  return is$typed(v, id, hashMessageViewSender)
 }
 
-export function validateMessageViewSender(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageViewSender', v)
+export function validateMessageViewSender<V>(v: V) {
+  return validate<MessageViewSender & V>(v, id, hashMessageViewSender)
 }
 
 export interface ConvoView {
+  $type?: 'chat.bsky.convo.defs#convoView'
   id: string
   rev: string
   members: ChatBskyActorDefs.ProfileViewBasic[]
   lastMessage?:
-    | MessageView
-    | DeletedMessageView
-    | { $type: string; [k: string]: unknown }
+    | $Typed<MessageView>
+    | $Typed<DeletedMessageView>
+    | { $type: string }
   muted: boolean
   opened?: boolean
   unreadCount: number
-  [k: string]: unknown
 }
 
-export function isConvoView(v: unknown): v is ConvoView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#convoView'
-  )
+const hashConvoView = 'convoView'
+
+export function isConvoView<V>(v: V) {
+  return is$typed(v, id, hashConvoView)
 }
 
-export function validateConvoView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#convoView', v)
+export function validateConvoView<V>(v: V) {
+  return validate<ConvoView & V>(v, id, hashConvoView)
 }
 
 export interface LogBeginConvo {
+  $type?: 'chat.bsky.convo.defs#logBeginConvo'
   rev: string
   convoId: string
-  [k: string]: unknown
 }
 
-export function isLogBeginConvo(v: unknown): v is LogBeginConvo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logBeginConvo'
-  )
+const hashLogBeginConvo = 'logBeginConvo'
+
+export function isLogBeginConvo<V>(v: V) {
+  return is$typed(v, id, hashLogBeginConvo)
 }
 
-export function validateLogBeginConvo(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logBeginConvo', v)
+export function validateLogBeginConvo<V>(v: V) {
+  return validate<LogBeginConvo & V>(v, id, hashLogBeginConvo)
 }
 
 export interface LogLeaveConvo {
+  $type?: 'chat.bsky.convo.defs#logLeaveConvo'
   rev: string
   convoId: string
-  [k: string]: unknown
 }
 
-export function isLogLeaveConvo(v: unknown): v is LogLeaveConvo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logLeaveConvo'
-  )
+const hashLogLeaveConvo = 'logLeaveConvo'
+
+export function isLogLeaveConvo<V>(v: V) {
+  return is$typed(v, id, hashLogLeaveConvo)
 }
 
-export function validateLogLeaveConvo(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logLeaveConvo', v)
+export function validateLogLeaveConvo<V>(v: V) {
+  return validate<LogLeaveConvo & V>(v, id, hashLogLeaveConvo)
 }
 
 export interface LogCreateMessage {
+  $type?: 'chat.bsky.convo.defs#logCreateMessage'
   rev: string
   convoId: string
-  message:
-    | MessageView
-    | DeletedMessageView
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+  message: $Typed<MessageView> | $Typed<DeletedMessageView> | { $type: string }
 }
 
-export function isLogCreateMessage(v: unknown): v is LogCreateMessage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logCreateMessage'
-  )
+const hashLogCreateMessage = 'logCreateMessage'
+
+export function isLogCreateMessage<V>(v: V) {
+  return is$typed(v, id, hashLogCreateMessage)
 }
 
-export function validateLogCreateMessage(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logCreateMessage', v)
+export function validateLogCreateMessage<V>(v: V) {
+  return validate<LogCreateMessage & V>(v, id, hashLogCreateMessage)
 }
 
 export interface LogDeleteMessage {
+  $type?: 'chat.bsky.convo.defs#logDeleteMessage'
   rev: string
   convoId: string
-  message:
-    | MessageView
-    | DeletedMessageView
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+  message: $Typed<MessageView> | $Typed<DeletedMessageView> | { $type: string }
 }
 
-export function isLogDeleteMessage(v: unknown): v is LogDeleteMessage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logDeleteMessage'
-  )
+const hashLogDeleteMessage = 'logDeleteMessage'
+
+export function isLogDeleteMessage<V>(v: V) {
+  return is$typed(v, id, hashLogDeleteMessage)
 }
 
-export function validateLogDeleteMessage(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logDeleteMessage', v)
+export function validateLogDeleteMessage<V>(v: V) {
+  return validate<LogDeleteMessage & V>(v, id, hashLogDeleteMessage)
 }
diff --git a/packages/api/src/client/types/chat/bsky/convo/deleteMessageForSelf.ts b/packages/api/src/client/types/chat/bsky/convo/deleteMessageForSelf.ts
index 863d2208cb8..0b26480e9ad 100644
--- a/packages/api/src/client/types/chat/bsky/convo/deleteMessageForSelf.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/deleteMessageForSelf.ts
@@ -3,17 +3,20 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ChatBskyConvoDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.deleteMessageForSelf'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
   messageId: string
-  [k: string]: unknown
 }
 
 export type OutputSchema = ChatBskyConvoDefs.DeletedMessageView
diff --git a/packages/api/src/client/types/chat/bsky/convo/getConvo.ts b/packages/api/src/client/types/chat/bsky/convo/getConvo.ts
index b3834234b5f..6a44fb581e4 100644
--- a/packages/api/src/client/types/chat/bsky/convo/getConvo.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/getConvo.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ChatBskyConvoDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.getConvo'
 
 export interface QueryParams {
   convoId: string
@@ -16,7 +20,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/chat/bsky/convo/getConvoForMembers.ts b/packages/api/src/client/types/chat/bsky/convo/getConvoForMembers.ts
index 9db44887410..bca156adc3b 100644
--- a/packages/api/src/client/types/chat/bsky/convo/getConvoForMembers.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/getConvoForMembers.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ChatBskyConvoDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.getConvoForMembers'
 
 export interface QueryParams {
   members: string[]
@@ -16,7 +20,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/chat/bsky/convo/getLog.ts b/packages/api/src/client/types/chat/bsky/convo/getLog.ts
index f1470fd89ba..27ad0960d93 100644
--- a/packages/api/src/client/types/chat/bsky/convo/getLog.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/getLog.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ChatBskyConvoDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.getLog'
 
 export interface QueryParams {
   cursor?: string
@@ -17,13 +21,12 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   logs: (
-    | ChatBskyConvoDefs.LogBeginConvo
-    | ChatBskyConvoDefs.LogLeaveConvo
-    | ChatBskyConvoDefs.LogCreateMessage
-    | ChatBskyConvoDefs.LogDeleteMessage
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ChatBskyConvoDefs.LogBeginConvo>
+    | $Typed<ChatBskyConvoDefs.LogLeaveConvo>
+    | $Typed<ChatBskyConvoDefs.LogCreateMessage>
+    | $Typed<ChatBskyConvoDefs.LogDeleteMessage>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/chat/bsky/convo/getMessages.ts b/packages/api/src/client/types/chat/bsky/convo/getMessages.ts
index eea7cba82e1..065c8678ad0 100644
--- a/packages/api/src/client/types/chat/bsky/convo/getMessages.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/getMessages.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ChatBskyConvoDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.getMessages'
 
 export interface QueryParams {
   convoId: string
@@ -19,11 +23,10 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   messages: (
-    | ChatBskyConvoDefs.MessageView
-    | ChatBskyConvoDefs.DeletedMessageView
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ChatBskyConvoDefs.MessageView>
+    | $Typed<ChatBskyConvoDefs.DeletedMessageView>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/chat/bsky/convo/leaveConvo.ts b/packages/api/src/client/types/chat/bsky/convo/leaveConvo.ts
index 4124db1855d..82e044b3d32 100644
--- a/packages/api/src/client/types/chat/bsky/convo/leaveConvo.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/leaveConvo.ts
@@ -3,21 +3,23 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.leaveConvo'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convoId: string
   rev: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/chat/bsky/convo/listConvos.ts b/packages/api/src/client/types/chat/bsky/convo/listConvos.ts
index 3cd1ad68516..ae6a16f8661 100644
--- a/packages/api/src/client/types/chat/bsky/convo/listConvos.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/listConvos.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ChatBskyConvoDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.listConvos'
 
 export interface QueryParams {
   limit?: number
@@ -18,7 +22,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   convos: ChatBskyConvoDefs.ConvoView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/chat/bsky/convo/muteConvo.ts b/packages/api/src/client/types/chat/bsky/convo/muteConvo.ts
index 93ac8785db7..d21c235354b 100644
--- a/packages/api/src/client/types/chat/bsky/convo/muteConvo.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/muteConvo.ts
@@ -3,21 +3,23 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ChatBskyConvoDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.muteConvo'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/chat/bsky/convo/sendMessage.ts b/packages/api/src/client/types/chat/bsky/convo/sendMessage.ts
index e260ba6eee0..f8c69b61ecc 100644
--- a/packages/api/src/client/types/chat/bsky/convo/sendMessage.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/sendMessage.ts
@@ -3,17 +3,20 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ChatBskyConvoDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.sendMessage'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
   message: ChatBskyConvoDefs.MessageInput
-  [k: string]: unknown
 }
 
 export type OutputSchema = ChatBskyConvoDefs.MessageView
diff --git a/packages/api/src/client/types/chat/bsky/convo/sendMessageBatch.ts b/packages/api/src/client/types/chat/bsky/convo/sendMessageBatch.ts
index 68ff2711df5..0a80a238673 100644
--- a/packages/api/src/client/types/chat/bsky/convo/sendMessageBatch.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/sendMessageBatch.ts
@@ -3,21 +3,23 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ChatBskyConvoDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.sendMessageBatch'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   items: BatchItem[]
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   items: ChatBskyConvoDefs.MessageView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -38,19 +40,17 @@ export function toKnownErr(e: any) {
 }
 
 export interface BatchItem {
+  $type?: 'chat.bsky.convo.sendMessageBatch#batchItem'
   convoId: string
   message: ChatBskyConvoDefs.MessageInput
-  [k: string]: unknown
 }
 
-export function isBatchItem(v: unknown): v is BatchItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.sendMessageBatch#batchItem'
-  )
+const hashBatchItem = 'batchItem'
+
+export function isBatchItem<V>(v: V) {
+  return is$typed(v, id, hashBatchItem)
 }
 
-export function validateBatchItem(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.sendMessageBatch#batchItem', v)
+export function validateBatchItem<V>(v: V) {
+  return validate<BatchItem & V>(v, id, hashBatchItem)
 }
diff --git a/packages/api/src/client/types/chat/bsky/convo/unmuteConvo.ts b/packages/api/src/client/types/chat/bsky/convo/unmuteConvo.ts
index 93ac8785db7..12457078ee3 100644
--- a/packages/api/src/client/types/chat/bsky/convo/unmuteConvo.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/unmuteConvo.ts
@@ -3,21 +3,23 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ChatBskyConvoDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.unmuteConvo'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/chat/bsky/convo/updateRead.ts b/packages/api/src/client/types/chat/bsky/convo/updateRead.ts
index b7a8041dbd7..7003bf0e544 100644
--- a/packages/api/src/client/types/chat/bsky/convo/updateRead.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/updateRead.ts
@@ -3,22 +3,24 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ChatBskyConvoDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.updateRead'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
   messageId?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/chat/bsky/moderation/getActorMetadata.ts b/packages/api/src/client/types/chat/bsky/moderation/getActorMetadata.ts
index 6761c9939b5..ed3fbcb964d 100644
--- a/packages/api/src/client/types/chat/bsky/moderation/getActorMetadata.ts
+++ b/packages/api/src/client/types/chat/bsky/moderation/getActorMetadata.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.moderation.getActorMetadata'
 
 export interface QueryParams {
   actor: string
@@ -17,7 +21,6 @@ export interface OutputSchema {
   day: Metadata
   month: Metadata
   all: Metadata
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -36,21 +39,19 @@ export function toKnownErr(e: any) {
 }
 
 export interface Metadata {
+  $type?: 'chat.bsky.moderation.getActorMetadata#metadata'
   messagesSent: number
   messagesReceived: number
   convos: number
   convosStarted: number
-  [k: string]: unknown
 }
 
-export function isMetadata(v: unknown): v is Metadata {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.moderation.getActorMetadata#metadata'
-  )
+const hashMetadata = 'metadata'
+
+export function isMetadata<V>(v: V) {
+  return is$typed(v, id, hashMetadata)
 }
 
-export function validateMetadata(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.moderation.getActorMetadata#metadata', v)
+export function validateMetadata<V>(v: V) {
+  return validate<Metadata & V>(v, id, hashMetadata)
 }
diff --git a/packages/api/src/client/types/chat/bsky/moderation/getMessageContext.ts b/packages/api/src/client/types/chat/bsky/moderation/getMessageContext.ts
index 2315bfd4ad8..fb13f5ac6bb 100644
--- a/packages/api/src/client/types/chat/bsky/moderation/getMessageContext.ts
+++ b/packages/api/src/client/types/chat/bsky/moderation/getMessageContext.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ChatBskyConvoDefs from '../convo/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ChatBskyConvoDefs from '../convo/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.moderation.getMessageContext'
 
 export interface QueryParams {
   /** Conversation that the message is from. NOTE: this field will eventually be required. */
@@ -20,11 +24,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   messages: (
-    | ChatBskyConvoDefs.MessageView
-    | ChatBskyConvoDefs.DeletedMessageView
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ChatBskyConvoDefs.MessageView>
+    | $Typed<ChatBskyConvoDefs.DeletedMessageView>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/chat/bsky/moderation/updateActorAccess.ts b/packages/api/src/client/types/chat/bsky/moderation/updateActorAccess.ts
index d6f0205672e..94950f5a5c2 100644
--- a/packages/api/src/client/types/chat/bsky/moderation/updateActorAccess.ts
+++ b/packages/api/src/client/types/chat/bsky/moderation/updateActorAccess.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.moderation.updateActorAccess'
 
 export interface QueryParams {}
 
@@ -13,7 +17,6 @@ export interface InputSchema {
   actor: string
   allowAccess: boolean
   ref?: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/admin/defs.ts b/packages/api/src/client/types/com/atproto/admin/defs.ts
index 26510680347..c130e5bb0c2 100644
--- a/packages/api/src/client/types/com/atproto/admin/defs.ts
+++ b/packages/api/src/client/types/com/atproto/admin/defs.ts
@@ -2,34 +2,37 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoServerDefs from '../server/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoServerDefs from '../server/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.defs'
 
 export interface StatusAttr {
+  $type?: 'com.atproto.admin.defs#statusAttr'
   applied: boolean
   ref?: string
-  [k: string]: unknown
 }
 
-export function isStatusAttr(v: unknown): v is StatusAttr {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#statusAttr'
-  )
+const hashStatusAttr = 'statusAttr'
+
+export function isStatusAttr<V>(v: V) {
+  return is$typed(v, id, hashStatusAttr)
 }
 
-export function validateStatusAttr(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#statusAttr', v)
+export function validateStatusAttr<V>(v: V) {
+  return validate<StatusAttr & V>(v, id, hashStatusAttr)
 }
 
 export interface AccountView {
+  $type?: 'com.atproto.admin.defs#accountView'
   did: string
   handle: string
   email?: string
-  relatedRecords?: {}[]
+  relatedRecords?: { [_ in string]: unknown }[]
   indexedAt: string
   invitedBy?: ComAtprotoServerDefs.InviteCode
   invites?: ComAtprotoServerDefs.InviteCode[]
@@ -38,71 +41,62 @@ export interface AccountView {
   inviteNote?: string
   deactivatedAt?: string
   threatSignatures?: ThreatSignature[]
-  [k: string]: unknown
 }
 
-export function isAccountView(v: unknown): v is AccountView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#accountView'
-  )
+const hashAccountView = 'accountView'
+
+export function isAccountView<V>(v: V) {
+  return is$typed(v, id, hashAccountView)
 }
 
-export function validateAccountView(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#accountView', v)
+export function validateAccountView<V>(v: V) {
+  return validate<AccountView & V>(v, id, hashAccountView)
 }
 
 export interface RepoRef {
+  $type?: 'com.atproto.admin.defs#repoRef'
   did: string
-  [k: string]: unknown
 }
 
-export function isRepoRef(v: unknown): v is RepoRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#repoRef'
-  )
+const hashRepoRef = 'repoRef'
+
+export function isRepoRef<V>(v: V) {
+  return is$typed(v, id, hashRepoRef)
 }
 
-export function validateRepoRef(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#repoRef', v)
+export function validateRepoRef<V>(v: V) {
+  return validate<RepoRef & V>(v, id, hashRepoRef)
 }
 
 export interface RepoBlobRef {
+  $type?: 'com.atproto.admin.defs#repoBlobRef'
   did: string
   cid: string
   recordUri?: string
-  [k: string]: unknown
 }
 
-export function isRepoBlobRef(v: unknown): v is RepoBlobRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#repoBlobRef'
-  )
+const hashRepoBlobRef = 'repoBlobRef'
+
+export function isRepoBlobRef<V>(v: V) {
+  return is$typed(v, id, hashRepoBlobRef)
 }
 
-export function validateRepoBlobRef(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#repoBlobRef', v)
+export function validateRepoBlobRef<V>(v: V) {
+  return validate<RepoBlobRef & V>(v, id, hashRepoBlobRef)
 }
 
 export interface ThreatSignature {
+  $type?: 'com.atproto.admin.defs#threatSignature'
   property: string
   value: string
-  [k: string]: unknown
 }
 
-export function isThreatSignature(v: unknown): v is ThreatSignature {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#threatSignature'
-  )
+const hashThreatSignature = 'threatSignature'
+
+export function isThreatSignature<V>(v: V) {
+  return is$typed(v, id, hashThreatSignature)
 }
 
-export function validateThreatSignature(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#threatSignature', v)
+export function validateThreatSignature<V>(v: V) {
+  return validate<ThreatSignature & V>(v, id, hashThreatSignature)
 }
diff --git a/packages/api/src/client/types/com/atproto/admin/deleteAccount.ts b/packages/api/src/client/types/com/atproto/admin/deleteAccount.ts
index 72066a656b7..b8aa22091d8 100644
--- a/packages/api/src/client/types/com/atproto/admin/deleteAccount.ts
+++ b/packages/api/src/client/types/com/atproto/admin/deleteAccount.ts
@@ -3,15 +3,18 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.deleteAccount'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   did: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/admin/disableAccountInvites.ts b/packages/api/src/client/types/com/atproto/admin/disableAccountInvites.ts
index 8df420239de..dcb96b88673 100644
--- a/packages/api/src/client/types/com/atproto/admin/disableAccountInvites.ts
+++ b/packages/api/src/client/types/com/atproto/admin/disableAccountInvites.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.disableAccountInvites'
 
 export interface QueryParams {}
 
@@ -13,7 +17,6 @@ export interface InputSchema {
   account: string
   /** Optional reason for disabled invites. */
   note?: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/admin/disableInviteCodes.ts b/packages/api/src/client/types/com/atproto/admin/disableInviteCodes.ts
index c264b65dbc2..0afc3772a96 100644
--- a/packages/api/src/client/types/com/atproto/admin/disableInviteCodes.ts
+++ b/packages/api/src/client/types/com/atproto/admin/disableInviteCodes.ts
@@ -3,16 +3,19 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.disableInviteCodes'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   codes?: string[]
   accounts?: string[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/admin/enableAccountInvites.ts b/packages/api/src/client/types/com/atproto/admin/enableAccountInvites.ts
index 094b3dfe0af..71c826d41e3 100644
--- a/packages/api/src/client/types/com/atproto/admin/enableAccountInvites.ts
+++ b/packages/api/src/client/types/com/atproto/admin/enableAccountInvites.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.enableAccountInvites'
 
 export interface QueryParams {}
 
@@ -13,7 +17,6 @@ export interface InputSchema {
   account: string
   /** Optional reason for enabled invites. */
   note?: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/admin/getAccountInfo.ts b/packages/api/src/client/types/com/atproto/admin/getAccountInfo.ts
index 645b9e613ff..9aa44104d7a 100644
--- a/packages/api/src/client/types/com/atproto/admin/getAccountInfo.ts
+++ b/packages/api/src/client/types/com/atproto/admin/getAccountInfo.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoAdminDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoAdminDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.getAccountInfo'
 
 export interface QueryParams {
   did: string
diff --git a/packages/api/src/client/types/com/atproto/admin/getAccountInfos.ts b/packages/api/src/client/types/com/atproto/admin/getAccountInfos.ts
index 9c1c273b9d9..8fa95fb39ab 100644
--- a/packages/api/src/client/types/com/atproto/admin/getAccountInfos.ts
+++ b/packages/api/src/client/types/com/atproto/admin/getAccountInfos.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoAdminDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoAdminDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.getAccountInfos'
 
 export interface QueryParams {
   dids: string[]
@@ -16,7 +20,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   infos: ComAtprotoAdminDefs.AccountView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/admin/getInviteCodes.ts b/packages/api/src/client/types/com/atproto/admin/getInviteCodes.ts
index faa4c8bed25..125d09b54f5 100644
--- a/packages/api/src/client/types/com/atproto/admin/getInviteCodes.ts
+++ b/packages/api/src/client/types/com/atproto/admin/getInviteCodes.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoServerDefs from '../server/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoServerDefs from '../server/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.getInviteCodes'
 
 export interface QueryParams {
   sort?: 'recent' | 'usage' | (string & {})
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   codes: ComAtprotoServerDefs.InviteCode[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/admin/getSubjectStatus.ts b/packages/api/src/client/types/com/atproto/admin/getSubjectStatus.ts
index f11b514507d..b5e1ea1fcc7 100644
--- a/packages/api/src/client/types/com/atproto/admin/getSubjectStatus.ts
+++ b/packages/api/src/client/types/com/atproto/admin/getSubjectStatus.ts
@@ -3,11 +3,15 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoAdminDefs from './defs'
-import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoAdminDefs from './defs.js'
+import type * as ComAtprotoRepoStrongRef from '../repo/strongRef.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.getSubjectStatus'
 
 export interface QueryParams {
   did?: string
@@ -19,13 +23,12 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ComAtprotoAdminDefs.RepoBlobRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ComAtprotoAdminDefs.RepoBlobRef>
+    | { $type: string }
   takedown?: ComAtprotoAdminDefs.StatusAttr
   deactivated?: ComAtprotoAdminDefs.StatusAttr
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/admin/searchAccounts.ts b/packages/api/src/client/types/com/atproto/admin/searchAccounts.ts
index 2d22806238c..d51219d3131 100644
--- a/packages/api/src/client/types/com/atproto/admin/searchAccounts.ts
+++ b/packages/api/src/client/types/com/atproto/admin/searchAccounts.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoAdminDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoAdminDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.searchAccounts'
 
 export interface QueryParams {
   email?: string
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   accounts: ComAtprotoAdminDefs.AccountView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/admin/sendEmail.ts b/packages/api/src/client/types/com/atproto/admin/sendEmail.ts
index 3f7c06d7070..2e0b39ceeab 100644
--- a/packages/api/src/client/types/com/atproto/admin/sendEmail.ts
+++ b/packages/api/src/client/types/com/atproto/admin/sendEmail.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.sendEmail'
 
 export interface QueryParams {}
 
@@ -16,12 +20,10 @@ export interface InputSchema {
   senderDid: string
   /** Additional comment by the sender that won't be used in the email itself but helpful to provide more context for moderators/reviewers */
   comment?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   sent: boolean
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/admin/updateAccountEmail.ts b/packages/api/src/client/types/com/atproto/admin/updateAccountEmail.ts
index d13878711a6..695f6c0f770 100644
--- a/packages/api/src/client/types/com/atproto/admin/updateAccountEmail.ts
+++ b/packages/api/src/client/types/com/atproto/admin/updateAccountEmail.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.updateAccountEmail'
 
 export interface QueryParams {}
 
@@ -13,7 +17,6 @@ export interface InputSchema {
   /** The handle or DID of the repo. */
   account: string
   email: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/admin/updateAccountHandle.ts b/packages/api/src/client/types/com/atproto/admin/updateAccountHandle.ts
index 38fbcae1681..e1d20d19a25 100644
--- a/packages/api/src/client/types/com/atproto/admin/updateAccountHandle.ts
+++ b/packages/api/src/client/types/com/atproto/admin/updateAccountHandle.ts
@@ -3,16 +3,19 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.updateAccountHandle'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   did: string
   handle: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/admin/updateAccountPassword.ts b/packages/api/src/client/types/com/atproto/admin/updateAccountPassword.ts
index 412f0facca2..8494a8f4a53 100644
--- a/packages/api/src/client/types/com/atproto/admin/updateAccountPassword.ts
+++ b/packages/api/src/client/types/com/atproto/admin/updateAccountPassword.ts
@@ -3,16 +3,19 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.updateAccountPassword'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   did: string
   password: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/admin/updateSubjectStatus.ts b/packages/api/src/client/types/com/atproto/admin/updateSubjectStatus.ts
index d890993cf3a..6ef3a83fdfa 100644
--- a/packages/api/src/client/types/com/atproto/admin/updateSubjectStatus.ts
+++ b/packages/api/src/client/types/com/atproto/admin/updateSubjectStatus.ts
@@ -3,33 +3,35 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoAdminDefs from './defs'
-import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoAdminDefs from './defs.js'
+import type * as ComAtprotoRepoStrongRef from '../repo/strongRef.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.updateSubjectStatus'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ComAtprotoAdminDefs.RepoBlobRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ComAtprotoAdminDefs.RepoBlobRef>
+    | { $type: string }
   takedown?: ComAtprotoAdminDefs.StatusAttr
   deactivated?: ComAtprotoAdminDefs.StatusAttr
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ComAtprotoAdminDefs.RepoBlobRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ComAtprotoAdminDefs.RepoBlobRef>
+    | { $type: string }
   takedown?: ComAtprotoAdminDefs.StatusAttr
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/identity/getRecommendedDidCredentials.ts b/packages/api/src/client/types/com/atproto/identity/getRecommendedDidCredentials.ts
index a5e4a0296de..39d0436544e 100644
--- a/packages/api/src/client/types/com/atproto/identity/getRecommendedDidCredentials.ts
+++ b/packages/api/src/client/types/com/atproto/identity/getRecommendedDidCredentials.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.getRecommendedDidCredentials'
 
 export interface QueryParams {}
 
@@ -15,9 +19,8 @@ export interface OutputSchema {
   /** Recommended rotation keys for PLC dids. Should be undefined (or ignored) for did:webs. */
   rotationKeys?: string[]
   alsoKnownAs?: string[]
-  verificationMethods?: {}
-  services?: {}
-  [k: string]: unknown
+  verificationMethods?: { [_ in string]: unknown }
+  services?: { [_ in string]: unknown }
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/identity/requestPlcOperationSignature.ts b/packages/api/src/client/types/com/atproto/identity/requestPlcOperationSignature.ts
index dcab71e2558..bea45b12cf9 100644
--- a/packages/api/src/client/types/com/atproto/identity/requestPlcOperationSignature.ts
+++ b/packages/api/src/client/types/com/atproto/identity/requestPlcOperationSignature.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.requestPlcOperationSignature'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/identity/resolveHandle.ts b/packages/api/src/client/types/com/atproto/identity/resolveHandle.ts
index 32db72138f7..3610d75c0a2 100644
--- a/packages/api/src/client/types/com/atproto/identity/resolveHandle.ts
+++ b/packages/api/src/client/types/com/atproto/identity/resolveHandle.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.resolveHandle'
 
 export interface QueryParams {
   /** The handle to resolve. */
@@ -16,7 +20,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   did: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/identity/signPlcOperation.ts b/packages/api/src/client/types/com/atproto/identity/signPlcOperation.ts
index 88c04c5993c..ee670d1f589 100644
--- a/packages/api/src/client/types/com/atproto/identity/signPlcOperation.ts
+++ b/packages/api/src/client/types/com/atproto/identity/signPlcOperation.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.signPlcOperation'
 
 export interface QueryParams {}
 
@@ -14,15 +18,13 @@ export interface InputSchema {
   token?: string
   rotationKeys?: string[]
   alsoKnownAs?: string[]
-  verificationMethods?: {}
-  services?: {}
-  [k: string]: unknown
+  verificationMethods?: { [_ in string]: unknown }
+  services?: { [_ in string]: unknown }
 }
 
 export interface OutputSchema {
   /** A signed DID PLC operation. */
-  operation: {}
-  [k: string]: unknown
+  operation: { [_ in string]: unknown }
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/identity/submitPlcOperation.ts b/packages/api/src/client/types/com/atproto/identity/submitPlcOperation.ts
index 74dea9f196d..27706159918 100644
--- a/packages/api/src/client/types/com/atproto/identity/submitPlcOperation.ts
+++ b/packages/api/src/client/types/com/atproto/identity/submitPlcOperation.ts
@@ -3,15 +3,18 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.submitPlcOperation'
 
 export interface QueryParams {}
 
 export interface InputSchema {
-  operation: {}
-  [k: string]: unknown
+  operation: { [_ in string]: unknown }
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/identity/updateHandle.ts b/packages/api/src/client/types/com/atproto/identity/updateHandle.ts
index c01d4887a4a..10110120687 100644
--- a/packages/api/src/client/types/com/atproto/identity/updateHandle.ts
+++ b/packages/api/src/client/types/com/atproto/identity/updateHandle.ts
@@ -3,16 +3,19 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.updateHandle'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   /** The new handle. */
   handle: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/label/defs.ts b/packages/api/src/client/types/com/atproto/label/defs.ts
index 131682e550c..b5f75bfce0b 100644
--- a/packages/api/src/client/types/com/atproto/label/defs.ts
+++ b/packages/api/src/client/types/com/atproto/label/defs.ts
@@ -2,12 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.label.defs'
 
 /** Metadata tag on an atproto resource (eg, repo or record). */
 export interface Label {
+  $type?: 'com.atproto.label.defs#label'
   /** The AT Protocol version of the label object. */
   ver?: number
   /** DID of the actor who created this label. */
@@ -26,60 +31,54 @@ export interface Label {
   exp?: string
   /** Signature of dag-cbor encoded label. */
   sig?: Uint8Array
-  [k: string]: unknown
 }
 
-export function isLabel(v: unknown): v is Label {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#label'
-  )
+const hashLabel = 'label'
+
+export function isLabel<V>(v: V) {
+  return is$typed(v, id, hashLabel)
 }
 
-export function validateLabel(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#label', v)
+export function validateLabel<V>(v: V) {
+  return validate<Label & V>(v, id, hashLabel)
 }
 
 /** Metadata tags on an atproto record, published by the author within the record. */
 export interface SelfLabels {
+  $type?: 'com.atproto.label.defs#selfLabels'
   values: SelfLabel[]
-  [k: string]: unknown
 }
 
-export function isSelfLabels(v: unknown): v is SelfLabels {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#selfLabels'
-  )
+const hashSelfLabels = 'selfLabels'
+
+export function isSelfLabels<V>(v: V) {
+  return is$typed(v, id, hashSelfLabels)
 }
 
-export function validateSelfLabels(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#selfLabels', v)
+export function validateSelfLabels<V>(v: V) {
+  return validate<SelfLabels & V>(v, id, hashSelfLabels)
 }
 
 /** Metadata tag on an atproto record, published by the author within the record. Note that schemas should use #selfLabels, not #selfLabel. */
 export interface SelfLabel {
+  $type?: 'com.atproto.label.defs#selfLabel'
   /** The short string name of the value or type of this label. */
   val: string
-  [k: string]: unknown
 }
 
-export function isSelfLabel(v: unknown): v is SelfLabel {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#selfLabel'
-  )
+const hashSelfLabel = 'selfLabel'
+
+export function isSelfLabel<V>(v: V) {
+  return is$typed(v, id, hashSelfLabel)
 }
 
-export function validateSelfLabel(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#selfLabel', v)
+export function validateSelfLabel<V>(v: V) {
+  return validate<SelfLabel & V>(v, id, hashSelfLabel)
 }
 
 /** Declares a label value and its expected interpretations and behaviors. */
 export interface LabelValueDefinition {
+  $type?: 'com.atproto.label.defs#labelValueDefinition'
   /** The value of the label being defined. Must only include lowercase ascii and the '-' character ([a-z-]+). */
   identifier: string
   /** How should a client visually convey this label? 'inform' means neutral and informational; 'alert' means negative and warning; 'none' means show nothing. */
@@ -91,48 +90,40 @@ export interface LabelValueDefinition {
   /** Does the user need to have adult content enabled in order to configure this label? */
   adultOnly?: boolean
   locales: LabelValueDefinitionStrings[]
-  [k: string]: unknown
 }
 
-export function isLabelValueDefinition(v: unknown): v is LabelValueDefinition {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#labelValueDefinition'
-  )
+const hashLabelValueDefinition = 'labelValueDefinition'
+
+export function isLabelValueDefinition<V>(v: V) {
+  return is$typed(v, id, hashLabelValueDefinition)
 }
 
-export function validateLabelValueDefinition(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#labelValueDefinition', v)
+export function validateLabelValueDefinition<V>(v: V) {
+  return validate<LabelValueDefinition & V>(v, id, hashLabelValueDefinition)
 }
 
 /** Strings which describe the label in the UI, localized into a specific language. */
 export interface LabelValueDefinitionStrings {
+  $type?: 'com.atproto.label.defs#labelValueDefinitionStrings'
   /** The code of the language these strings are written in. */
   lang: string
   /** A short human-readable name for the label. */
   name: string
   /** A longer description of what the label means and why it might be applied. */
   description: string
-  [k: string]: unknown
 }
 
-export function isLabelValueDefinitionStrings(
-  v: unknown,
-): v is LabelValueDefinitionStrings {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#labelValueDefinitionStrings'
-  )
+const hashLabelValueDefinitionStrings = 'labelValueDefinitionStrings'
+
+export function isLabelValueDefinitionStrings<V>(v: V) {
+  return is$typed(v, id, hashLabelValueDefinitionStrings)
 }
 
-export function validateLabelValueDefinitionStrings(
-  v: unknown,
-): ValidationResult {
-  return lexicons.validate(
-    'com.atproto.label.defs#labelValueDefinitionStrings',
+export function validateLabelValueDefinitionStrings<V>(v: V) {
+  return validate<LabelValueDefinitionStrings & V>(
     v,
+    id,
+    hashLabelValueDefinitionStrings,
   )
 }
 
diff --git a/packages/api/src/client/types/com/atproto/label/queryLabels.ts b/packages/api/src/client/types/com/atproto/label/queryLabels.ts
index 615770ec978..a2d15bc669b 100644
--- a/packages/api/src/client/types/com/atproto/label/queryLabels.ts
+++ b/packages/api/src/client/types/com/atproto/label/queryLabels.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoLabelDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoLabelDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.label.queryLabels'
 
 export interface QueryParams {
   /** List of AT URI patterns to match (boolean 'OR'). Each may be a prefix (ending with '*'; will match inclusive of the string leading to '*'), or a full URI. */
@@ -22,7 +26,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   labels: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/label/subscribeLabels.ts b/packages/api/src/client/types/com/atproto/label/subscribeLabels.ts
index 044d4d83b30..43134162273 100644
--- a/packages/api/src/client/types/com/atproto/label/subscribeLabels.ts
+++ b/packages/api/src/client/types/com/atproto/label/subscribeLabels.ts
@@ -3,43 +3,43 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoLabelDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoLabelDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.label.subscribeLabels'
 
 export interface Labels {
+  $type?: 'com.atproto.label.subscribeLabels#labels'
   seq: number
   labels: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isLabels(v: unknown): v is Labels {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.subscribeLabels#labels'
-  )
+const hashLabels = 'labels'
+
+export function isLabels<V>(v: V) {
+  return is$typed(v, id, hashLabels)
 }
 
-export function validateLabels(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.subscribeLabels#labels', v)
+export function validateLabels<V>(v: V) {
+  return validate<Labels & V>(v, id, hashLabels)
 }
 
 export interface Info {
+  $type?: 'com.atproto.label.subscribeLabels#info'
   name: 'OutdatedCursor' | (string & {})
   message?: string
-  [k: string]: unknown
 }
 
-export function isInfo(v: unknown): v is Info {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.subscribeLabels#info'
-  )
+const hashInfo = 'info'
+
+export function isInfo<V>(v: V) {
+  return is$typed(v, id, hashInfo)
 }
 
-export function validateInfo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.subscribeLabels#info', v)
+export function validateInfo<V>(v: V) {
+  return validate<Info & V>(v, id, hashInfo)
 }
diff --git a/packages/api/src/client/types/com/atproto/lexicon/schema.ts b/packages/api/src/client/types/com/atproto/lexicon/schema.ts
index f2755960224..4f632560c7f 100644
--- a/packages/api/src/client/types/com/atproto/lexicon/schema.ts
+++ b/packages/api/src/client/types/com/atproto/lexicon/schema.ts
@@ -2,25 +2,27 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.lexicon.schema'
 
 export interface Record {
+  $type: 'com.atproto.lexicon.schema'
   /** Indicates the 'version' of the Lexicon language. Must be '1' for the current atproto/Lexicon schema system. */
   lexicon: number
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'com.atproto.lexicon.schema#main' ||
-      v.$type === 'com.atproto.lexicon.schema')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.lexicon.schema#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/api/src/client/types/com/atproto/moderation/createReport.ts b/packages/api/src/client/types/com/atproto/moderation/createReport.ts
index 16316f585d4..3c4c6c72de2 100644
--- a/packages/api/src/client/types/com/atproto/moderation/createReport.ts
+++ b/packages/api/src/client/types/com/atproto/moderation/createReport.ts
@@ -3,12 +3,16 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoModerationDefs from './defs'
-import * as ComAtprotoAdminDefs from '../admin/defs'
-import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoModerationDefs from './defs.js'
+import type * as ComAtprotoAdminDefs from '../admin/defs.js'
+import type * as ComAtprotoRepoStrongRef from '../repo/strongRef.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.moderation.createReport'
 
 export interface QueryParams {}
 
@@ -17,10 +21,9 @@ export interface InputSchema {
   /** Additional context about the content and violation. */
   reason?: string
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | { $type: string }
 }
 
 export interface OutputSchema {
@@ -28,12 +31,11 @@ export interface OutputSchema {
   reasonType: ComAtprotoModerationDefs.ReasonType
   reason?: string
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | { $type: string }
   reportedBy: string
   createdAt: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/moderation/defs.ts b/packages/api/src/client/types/com/atproto/moderation/defs.ts
index 802cd2bc996..2d7a46f5dd8 100644
--- a/packages/api/src/client/types/com/atproto/moderation/defs.ts
+++ b/packages/api/src/client/types/com/atproto/moderation/defs.ts
@@ -2,9 +2,13 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.moderation.defs'
 
 export type ReasonType =
   | 'com.atproto.moderation.defs#reasonSpam'
@@ -17,16 +21,16 @@ export type ReasonType =
   | (string & {})
 
 /** Spam: frequent unwanted promotion, replies, mentions */
-export const REASONSPAM = 'com.atproto.moderation.defs#reasonSpam'
+export const REASONSPAM = `${id}#reasonSpam`
 /** Direct violation of server rules, laws, terms of service */
-export const REASONVIOLATION = 'com.atproto.moderation.defs#reasonViolation'
+export const REASONVIOLATION = `${id}#reasonViolation`
 /** Misleading identity, affiliation, or content */
-export const REASONMISLEADING = 'com.atproto.moderation.defs#reasonMisleading'
+export const REASONMISLEADING = `${id}#reasonMisleading`
 /** Unwanted or mislabeled sexual content */
-export const REASONSEXUAL = 'com.atproto.moderation.defs#reasonSexual'
+export const REASONSEXUAL = `${id}#reasonSexual`
 /** Rude, harassing, explicit, or otherwise unwelcoming behavior */
-export const REASONRUDE = 'com.atproto.moderation.defs#reasonRude'
+export const REASONRUDE = `${id}#reasonRude`
 /** Other: reports not falling under another report category */
-export const REASONOTHER = 'com.atproto.moderation.defs#reasonOther'
+export const REASONOTHER = `${id}#reasonOther`
 /** Appeal: appeal a previously taken moderation action */
-export const REASONAPPEAL = 'com.atproto.moderation.defs#reasonAppeal'
+export const REASONAPPEAL = `${id}#reasonAppeal`
diff --git a/packages/api/src/client/types/com/atproto/repo/applyWrites.ts b/packages/api/src/client/types/com/atproto/repo/applyWrites.ts
index edebf199a44..2592fc9218a 100644
--- a/packages/api/src/client/types/com/atproto/repo/applyWrites.ts
+++ b/packages/api/src/client/types/com/atproto/repo/applyWrites.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoRepoDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoRepoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.applyWrites'
 
 export interface QueryParams {}
 
@@ -15,16 +19,18 @@ export interface InputSchema {
   repo: string
   /** Can be set to 'false' to skip Lexicon schema validation of record data across all operations, 'true' to require it, or leave unset to validate only for known Lexicons. */
   validate?: boolean
-  writes: (Create | Update | Delete)[]
+  writes: ($Typed<Create> | $Typed<Update> | $Typed<Delete>)[]
   /** If provided, the entire operation will fail if the current repo commit CID does not match this value. Used to prevent conflicting repo mutations. */
   swapCommit?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   commit?: ComAtprotoRepoDefs.CommitMeta
-  results?: (CreateResult | UpdateResult | DeleteResult)[]
-  [k: string]: unknown
+  results?: (
+    | $Typed<CreateResult>
+    | $Typed<UpdateResult>
+    | $Typed<DeleteResult>
+  )[]
 }
 
 export interface CallOptions {
@@ -56,113 +62,101 @@ export function toKnownErr(e: any) {
 
 /** Operation which creates a new record. */
 export interface Create {
+  $type?: 'com.atproto.repo.applyWrites#create'
   collection: string
   rkey?: string
-  value: {}
-  [k: string]: unknown
+  value: { [_ in string]: unknown }
 }
 
-export function isCreate(v: unknown): v is Create {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#create'
-  )
+const hashCreate = 'create'
+
+export function isCreate<V>(v: V) {
+  return is$typed(v, id, hashCreate)
 }
 
-export function validateCreate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#create', v)
+export function validateCreate<V>(v: V) {
+  return validate<Create & V>(v, id, hashCreate)
 }
 
 /** Operation which updates an existing record. */
 export interface Update {
+  $type?: 'com.atproto.repo.applyWrites#update'
   collection: string
   rkey: string
-  value: {}
-  [k: string]: unknown
+  value: { [_ in string]: unknown }
 }
 
-export function isUpdate(v: unknown): v is Update {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#update'
-  )
+const hashUpdate = 'update'
+
+export function isUpdate<V>(v: V) {
+  return is$typed(v, id, hashUpdate)
 }
 
-export function validateUpdate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#update', v)
+export function validateUpdate<V>(v: V) {
+  return validate<Update & V>(v, id, hashUpdate)
 }
 
 /** Operation which deletes an existing record. */
 export interface Delete {
+  $type?: 'com.atproto.repo.applyWrites#delete'
   collection: string
   rkey: string
-  [k: string]: unknown
 }
 
-export function isDelete(v: unknown): v is Delete {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#delete'
-  )
+const hashDelete = 'delete'
+
+export function isDelete<V>(v: V) {
+  return is$typed(v, id, hashDelete)
 }
 
-export function validateDelete(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#delete', v)
+export function validateDelete<V>(v: V) {
+  return validate<Delete & V>(v, id, hashDelete)
 }
 
 export interface CreateResult {
+  $type?: 'com.atproto.repo.applyWrites#createResult'
   uri: string
   cid: string
   validationStatus?: 'valid' | 'unknown' | (string & {})
-  [k: string]: unknown
 }
 
-export function isCreateResult(v: unknown): v is CreateResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#createResult'
-  )
+const hashCreateResult = 'createResult'
+
+export function isCreateResult<V>(v: V) {
+  return is$typed(v, id, hashCreateResult)
 }
 
-export function validateCreateResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#createResult', v)
+export function validateCreateResult<V>(v: V) {
+  return validate<CreateResult & V>(v, id, hashCreateResult)
 }
 
 export interface UpdateResult {
+  $type?: 'com.atproto.repo.applyWrites#updateResult'
   uri: string
   cid: string
   validationStatus?: 'valid' | 'unknown' | (string & {})
-  [k: string]: unknown
 }
 
-export function isUpdateResult(v: unknown): v is UpdateResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#updateResult'
-  )
+const hashUpdateResult = 'updateResult'
+
+export function isUpdateResult<V>(v: V) {
+  return is$typed(v, id, hashUpdateResult)
 }
 
-export function validateUpdateResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#updateResult', v)
+export function validateUpdateResult<V>(v: V) {
+  return validate<UpdateResult & V>(v, id, hashUpdateResult)
 }
 
 export interface DeleteResult {
-  [k: string]: unknown
+  $type?: 'com.atproto.repo.applyWrites#deleteResult'
 }
 
-export function isDeleteResult(v: unknown): v is DeleteResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#deleteResult'
-  )
+const hashDeleteResult = 'deleteResult'
+
+export function isDeleteResult<V>(v: V) {
+  return is$typed(v, id, hashDeleteResult)
 }
 
-export function validateDeleteResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#deleteResult', v)
+export function validateDeleteResult<V>(v: V) {
+  return validate<DeleteResult & V>(v, id, hashDeleteResult)
 }
diff --git a/packages/api/src/client/types/com/atproto/repo/createRecord.ts b/packages/api/src/client/types/com/atproto/repo/createRecord.ts
index b0f921ef986..ba26dcdc105 100644
--- a/packages/api/src/client/types/com/atproto/repo/createRecord.ts
+++ b/packages/api/src/client/types/com/atproto/repo/createRecord.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoRepoDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoRepoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.createRecord'
 
 export interface QueryParams {}
 
@@ -20,10 +24,9 @@ export interface InputSchema {
   /** Can be set to 'false' to skip Lexicon schema validation of record data, 'true' to require it, or leave unset to validate only for known Lexicons. */
   validate?: boolean
   /** The record itself. Must contain a $type field. */
-  record: {}
+  record: { [_ in string]: unknown }
   /** Compare and swap with the previous commit by CID. */
   swapCommit?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
@@ -31,7 +34,6 @@ export interface OutputSchema {
   cid: string
   commit?: ComAtprotoRepoDefs.CommitMeta
   validationStatus?: 'valid' | 'unknown' | (string & {})
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/repo/defs.ts b/packages/api/src/client/types/com/atproto/repo/defs.ts
index d4dfaceabf3..3b02739d7dd 100644
--- a/packages/api/src/client/types/com/atproto/repo/defs.ts
+++ b/packages/api/src/client/types/com/atproto/repo/defs.ts
@@ -2,24 +2,26 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.defs'
 
 export interface CommitMeta {
+  $type?: 'com.atproto.repo.defs#commitMeta'
   cid: string
   rev: string
-  [k: string]: unknown
 }
 
-export function isCommitMeta(v: unknown): v is CommitMeta {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.defs#commitMeta'
-  )
+const hashCommitMeta = 'commitMeta'
+
+export function isCommitMeta<V>(v: V) {
+  return is$typed(v, id, hashCommitMeta)
 }
 
-export function validateCommitMeta(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.defs#commitMeta', v)
+export function validateCommitMeta<V>(v: V) {
+  return validate<CommitMeta & V>(v, id, hashCommitMeta)
 }
diff --git a/packages/api/src/client/types/com/atproto/repo/deleteRecord.ts b/packages/api/src/client/types/com/atproto/repo/deleteRecord.ts
index ed06cbc83fc..6f7b066530c 100644
--- a/packages/api/src/client/types/com/atproto/repo/deleteRecord.ts
+++ b/packages/api/src/client/types/com/atproto/repo/deleteRecord.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoRepoDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoRepoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.deleteRecord'
 
 export interface QueryParams {}
 
@@ -21,12 +25,10 @@ export interface InputSchema {
   swapRecord?: string
   /** Compare and swap with the previous commit by CID. */
   swapCommit?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   commit?: ComAtprotoRepoDefs.CommitMeta
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/repo/describeRepo.ts b/packages/api/src/client/types/com/atproto/repo/describeRepo.ts
index 9b3eb337b5c..332599f236c 100644
--- a/packages/api/src/client/types/com/atproto/repo/describeRepo.ts
+++ b/packages/api/src/client/types/com/atproto/repo/describeRepo.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.describeRepo'
 
 export interface QueryParams {
   /** The handle or DID of the repo. */
@@ -18,12 +22,11 @@ export interface OutputSchema {
   handle: string
   did: string
   /** The complete DID document for this account. */
-  didDoc: {}
+  didDoc: { [_ in string]: unknown }
   /** List of all the collections (NSIDs) for which this repo contains at least one record. */
   collections: string[]
   /** Indicates if handle is currently valid (resolves bi-directionally) */
   handleIsCorrect: boolean
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/repo/getRecord.ts b/packages/api/src/client/types/com/atproto/repo/getRecord.ts
index 85013fb7719..eb9934e65a0 100644
--- a/packages/api/src/client/types/com/atproto/repo/getRecord.ts
+++ b/packages/api/src/client/types/com/atproto/repo/getRecord.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.getRecord'
 
 export interface QueryParams {
   /** The handle or DID of the repo. */
@@ -23,8 +27,7 @@ export type InputSchema = undefined
 export interface OutputSchema {
   uri: string
   cid?: string
-  value: {}
-  [k: string]: unknown
+  value: { [_ in string]: unknown }
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/repo/importRepo.ts b/packages/api/src/client/types/com/atproto/repo/importRepo.ts
index ad093e6ce93..c23ba123404 100644
--- a/packages/api/src/client/types/com/atproto/repo/importRepo.ts
+++ b/packages/api/src/client/types/com/atproto/repo/importRepo.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.importRepo'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/repo/listMissingBlobs.ts b/packages/api/src/client/types/com/atproto/repo/listMissingBlobs.ts
index 9043fd4e1fe..6515cd445a1 100644
--- a/packages/api/src/client/types/com/atproto/repo/listMissingBlobs.ts
+++ b/packages/api/src/client/types/com/atproto/repo/listMissingBlobs.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.listMissingBlobs'
 
 export interface QueryParams {
   limit?: number
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   blobs: RecordBlob[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -36,19 +39,17 @@ export function toKnownErr(e: any) {
 }
 
 export interface RecordBlob {
+  $type?: 'com.atproto.repo.listMissingBlobs#recordBlob'
   cid: string
   recordUri: string
-  [k: string]: unknown
 }
 
-export function isRecordBlob(v: unknown): v is RecordBlob {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.listMissingBlobs#recordBlob'
-  )
+const hashRecordBlob = 'recordBlob'
+
+export function isRecordBlob<V>(v: V) {
+  return is$typed(v, id, hashRecordBlob)
 }
 
-export function validateRecordBlob(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.listMissingBlobs#recordBlob', v)
+export function validateRecordBlob<V>(v: V) {
+  return validate<RecordBlob & V>(v, id, hashRecordBlob)
 }
diff --git a/packages/api/src/client/types/com/atproto/repo/listRecords.ts b/packages/api/src/client/types/com/atproto/repo/listRecords.ts
index 4a97572f74d..5efd63c11de 100644
--- a/packages/api/src/client/types/com/atproto/repo/listRecords.ts
+++ b/packages/api/src/client/types/com/atproto/repo/listRecords.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.listRecords'
 
 export interface QueryParams {
   /** The handle or DID of the repo. */
@@ -28,7 +32,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   records: Record[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -47,20 +50,18 @@ export function toKnownErr(e: any) {
 }
 
 export interface Record {
+  $type?: 'com.atproto.repo.listRecords#record'
   uri: string
   cid: string
-  value: {}
-  [k: string]: unknown
+  value: { [_ in string]: unknown }
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.listRecords#record'
-  )
+const hashRecord = 'record'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.listRecords#record', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
diff --git a/packages/api/src/client/types/com/atproto/repo/putRecord.ts b/packages/api/src/client/types/com/atproto/repo/putRecord.ts
index 9cadf9a2c4d..78dcf6a3c05 100644
--- a/packages/api/src/client/types/com/atproto/repo/putRecord.ts
+++ b/packages/api/src/client/types/com/atproto/repo/putRecord.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoRepoDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoRepoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.putRecord'
 
 export interface QueryParams {}
 
@@ -20,12 +24,11 @@ export interface InputSchema {
   /** Can be set to 'false' to skip Lexicon schema validation of record data, 'true' to require it, or leave unset to validate only for known Lexicons. */
   validate?: boolean
   /** The record to write. */
-  record: {}
+  record: { [_ in string]: unknown }
   /** Compare and swap with the previous record by CID. WARNING: nullable and optional field; may cause problems with golang implementation */
   swapRecord?: string | null
   /** Compare and swap with the previous commit by CID. */
   swapCommit?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
@@ -33,7 +36,6 @@ export interface OutputSchema {
   cid: string
   commit?: ComAtprotoRepoDefs.CommitMeta
   validationStatus?: 'valid' | 'unknown' | (string & {})
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/repo/strongRef.ts b/packages/api/src/client/types/com/atproto/repo/strongRef.ts
index a6734ba3a4a..e2652df53cb 100644
--- a/packages/api/src/client/types/com/atproto/repo/strongRef.ts
+++ b/packages/api/src/client/types/com/atproto/repo/strongRef.ts
@@ -2,25 +2,26 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+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
-  [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'com.atproto.repo.strongRef#main' ||
-      v.$type === 'com.atproto.repo.strongRef')
-  )
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.strongRef#main', v)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
diff --git a/packages/api/src/client/types/com/atproto/repo/uploadBlob.ts b/packages/api/src/client/types/com/atproto/repo/uploadBlob.ts
index 9931cc61e9d..f733edd45f0 100644
--- a/packages/api/src/client/types/com/atproto/repo/uploadBlob.ts
+++ b/packages/api/src/client/types/com/atproto/repo/uploadBlob.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.uploadBlob'
 
 export interface QueryParams {}
 
@@ -13,7 +17,6 @@ export type InputSchema = string | Uint8Array | Blob
 
 export interface OutputSchema {
   blob: BlobRef
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/activateAccount.ts b/packages/api/src/client/types/com/atproto/server/activateAccount.ts
index dcab71e2558..36cbd139b32 100644
--- a/packages/api/src/client/types/com/atproto/server/activateAccount.ts
+++ b/packages/api/src/client/types/com/atproto/server/activateAccount.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.activateAccount'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/server/checkAccountStatus.ts b/packages/api/src/client/types/com/atproto/server/checkAccountStatus.ts
index b527cca2b67..84eb83bbf0b 100644
--- a/packages/api/src/client/types/com/atproto/server/checkAccountStatus.ts
+++ b/packages/api/src/client/types/com/atproto/server/checkAccountStatus.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.checkAccountStatus'
 
 export interface QueryParams {}
 
@@ -21,7 +25,6 @@ export interface OutputSchema {
   privateStateValues: number
   expectedBlobs: number
   importedBlobs: number
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/confirmEmail.ts b/packages/api/src/client/types/com/atproto/server/confirmEmail.ts
index 488de314fd6..6b8f264d90d 100644
--- a/packages/api/src/client/types/com/atproto/server/confirmEmail.ts
+++ b/packages/api/src/client/types/com/atproto/server/confirmEmail.ts
@@ -3,16 +3,19 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.confirmEmail'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   email: string
   token: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/createAccount.ts b/packages/api/src/client/types/com/atproto/server/createAccount.ts
index 5f0a8d6ad0f..fa3dc06f342 100644
--- a/packages/api/src/client/types/com/atproto/server/createAccount.ts
+++ b/packages/api/src/client/types/com/atproto/server/createAccount.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.createAccount'
 
 export interface QueryParams {}
 
@@ -23,8 +27,7 @@ export interface InputSchema {
   /** DID PLC rotation key (aka, recovery key) to be included in PLC creation operation. */
   recoveryKey?: string
   /** A signed DID PLC operation to be submitted as part of importing an existing account to this instance. NOTE: this optional field may be updated when full account migration is implemented. */
-  plcOp?: {}
-  [k: string]: unknown
+  plcOp?: { [_ in string]: unknown }
 }
 
 /** Account login session returned on successful account creation. */
@@ -35,8 +38,7 @@ export interface OutputSchema {
   /** The DID of the new account. */
   did: string
   /** Complete DID document. */
-  didDoc?: {}
-  [k: string]: unknown
+  didDoc?: { [_ in string]: unknown }
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/createAppPassword.ts b/packages/api/src/client/types/com/atproto/server/createAppPassword.ts
index 05ee6b1314e..52b9a6f1e91 100644
--- a/packages/api/src/client/types/com/atproto/server/createAppPassword.ts
+++ b/packages/api/src/client/types/com/atproto/server/createAppPassword.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.createAppPassword'
 
 export interface QueryParams {}
 
@@ -14,7 +18,6 @@ export interface InputSchema {
   name: string
   /** If an app password has 'privileged' access to possibly sensitive account state. Meant for use with trusted clients. */
   privileged?: boolean
-  [k: string]: unknown
 }
 
 export type OutputSchema = AppPassword
@@ -47,24 +50,19 @@ export function toKnownErr(e: any) {
 }
 
 export interface AppPassword {
+  $type?: 'com.atproto.server.createAppPassword#appPassword'
   name: string
   password: string
   createdAt: string
   privileged?: boolean
-  [k: string]: unknown
 }
 
-export function isAppPassword(v: unknown): v is AppPassword {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.createAppPassword#appPassword'
-  )
+const hashAppPassword = 'appPassword'
+
+export function isAppPassword<V>(v: V) {
+  return is$typed(v, id, hashAppPassword)
 }
 
-export function validateAppPassword(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'com.atproto.server.createAppPassword#appPassword',
-    v,
-  )
+export function validateAppPassword<V>(v: V) {
+  return validate<AppPassword & V>(v, id, hashAppPassword)
 }
diff --git a/packages/api/src/client/types/com/atproto/server/createInviteCode.ts b/packages/api/src/client/types/com/atproto/server/createInviteCode.ts
index 426fb538fb3..3263ae785d0 100644
--- a/packages/api/src/client/types/com/atproto/server/createInviteCode.ts
+++ b/packages/api/src/client/types/com/atproto/server/createInviteCode.ts
@@ -3,21 +3,23 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.createInviteCode'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   useCount: number
   forAccount?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   code: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/createInviteCodes.ts b/packages/api/src/client/types/com/atproto/server/createInviteCodes.ts
index f7908697a21..79b94cf72f3 100644
--- a/packages/api/src/client/types/com/atproto/server/createInviteCodes.ts
+++ b/packages/api/src/client/types/com/atproto/server/createInviteCodes.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.createInviteCodes'
 
 export interface QueryParams {}
 
@@ -13,12 +17,10 @@ export interface InputSchema {
   codeCount: number
   useCount: number
   forAccounts?: string[]
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   codes: AccountCodes[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -39,22 +41,17 @@ export function toKnownErr(e: any) {
 }
 
 export interface AccountCodes {
+  $type?: 'com.atproto.server.createInviteCodes#accountCodes'
   account: string
   codes: string[]
-  [k: string]: unknown
 }
 
-export function isAccountCodes(v: unknown): v is AccountCodes {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.createInviteCodes#accountCodes'
-  )
+const hashAccountCodes = 'accountCodes'
+
+export function isAccountCodes<V>(v: V) {
+  return is$typed(v, id, hashAccountCodes)
 }
 
-export function validateAccountCodes(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'com.atproto.server.createInviteCodes#accountCodes',
-    v,
-  )
+export function validateAccountCodes<V>(v: V) {
+  return validate<AccountCodes & V>(v, id, hashAccountCodes)
 }
diff --git a/packages/api/src/client/types/com/atproto/server/createSession.ts b/packages/api/src/client/types/com/atproto/server/createSession.ts
index 5dd724668df..a64c9832f05 100644
--- a/packages/api/src/client/types/com/atproto/server/createSession.ts
+++ b/packages/api/src/client/types/com/atproto/server/createSession.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.createSession'
 
 export interface QueryParams {}
 
@@ -16,7 +20,6 @@ export interface InputSchema {
   authFactorToken?: string
   /** When true, instead of throwing error for takendown accounts, a valid response with a narrow scoped token will be returned */
   allowTakendown?: boolean
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
@@ -24,14 +27,13 @@ export interface OutputSchema {
   refreshJwt: string
   handle: string
   did: string
-  didDoc?: {}
+  didDoc?: { [_ in string]: unknown }
   email?: string
   emailConfirmed?: boolean
   emailAuthFactor?: boolean
   active?: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/deactivateAccount.ts b/packages/api/src/client/types/com/atproto/server/deactivateAccount.ts
index 592380aa9cc..838714e08b9 100644
--- a/packages/api/src/client/types/com/atproto/server/deactivateAccount.ts
+++ b/packages/api/src/client/types/com/atproto/server/deactivateAccount.ts
@@ -3,16 +3,19 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.deactivateAccount'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   /** A recommendation to server as to how long they should hold onto the deactivated account before deleting. */
   deleteAfter?: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/defs.ts b/packages/api/src/client/types/com/atproto/server/defs.ts
index e6be3798909..a3b0bb6d989 100644
--- a/packages/api/src/client/types/com/atproto/server/defs.ts
+++ b/packages/api/src/client/types/com/atproto/server/defs.ts
@@ -2,11 +2,16 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.defs'
 
 export interface InviteCode {
+  $type?: 'com.atproto.server.defs#inviteCode'
   code: string
   available: number
   disabled: boolean
@@ -14,35 +19,30 @@ export interface InviteCode {
   createdBy: string
   createdAt: string
   uses: InviteCodeUse[]
-  [k: string]: unknown
 }
 
-export function isInviteCode(v: unknown): v is InviteCode {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.defs#inviteCode'
-  )
+const hashInviteCode = 'inviteCode'
+
+export function isInviteCode<V>(v: V) {
+  return is$typed(v, id, hashInviteCode)
 }
 
-export function validateInviteCode(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.defs#inviteCode', v)
+export function validateInviteCode<V>(v: V) {
+  return validate<InviteCode & V>(v, id, hashInviteCode)
 }
 
 export interface InviteCodeUse {
+  $type?: 'com.atproto.server.defs#inviteCodeUse'
   usedBy: string
   usedAt: string
-  [k: string]: unknown
 }
 
-export function isInviteCodeUse(v: unknown): v is InviteCodeUse {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.defs#inviteCodeUse'
-  )
+const hashInviteCodeUse = 'inviteCodeUse'
+
+export function isInviteCodeUse<V>(v: V) {
+  return is$typed(v, id, hashInviteCodeUse)
 }
 
-export function validateInviteCodeUse(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.defs#inviteCodeUse', v)
+export function validateInviteCodeUse<V>(v: V) {
+  return validate<InviteCodeUse & V>(v, id, hashInviteCodeUse)
 }
diff --git a/packages/api/src/client/types/com/atproto/server/deleteAccount.ts b/packages/api/src/client/types/com/atproto/server/deleteAccount.ts
index 1e76ce2972f..84a2d9e2183 100644
--- a/packages/api/src/client/types/com/atproto/server/deleteAccount.ts
+++ b/packages/api/src/client/types/com/atproto/server/deleteAccount.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.deleteAccount'
 
 export interface QueryParams {}
 
@@ -13,7 +17,6 @@ export interface InputSchema {
   did: string
   password: string
   token: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/deleteSession.ts b/packages/api/src/client/types/com/atproto/server/deleteSession.ts
index dcab71e2558..158727cf267 100644
--- a/packages/api/src/client/types/com/atproto/server/deleteSession.ts
+++ b/packages/api/src/client/types/com/atproto/server/deleteSession.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.deleteSession'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/server/describeServer.ts b/packages/api/src/client/types/com/atproto/server/describeServer.ts
index b2936e18125..840aa610fd6 100644
--- a/packages/api/src/client/types/com/atproto/server/describeServer.ts
+++ b/packages/api/src/client/types/com/atproto/server/describeServer.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.describeServer'
 
 export interface QueryParams {}
 
@@ -21,7 +25,6 @@ export interface OutputSchema {
   links?: Links
   contact?: Contact
   did: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -40,36 +43,32 @@ export function toKnownErr(e: any) {
 }
 
 export interface Links {
+  $type?: 'com.atproto.server.describeServer#links'
   privacyPolicy?: string
   termsOfService?: string
-  [k: string]: unknown
 }
 
-export function isLinks(v: unknown): v is Links {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.describeServer#links'
-  )
+const hashLinks = 'links'
+
+export function isLinks<V>(v: V) {
+  return is$typed(v, id, hashLinks)
 }
 
-export function validateLinks(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.describeServer#links', v)
+export function validateLinks<V>(v: V) {
+  return validate<Links & V>(v, id, hashLinks)
 }
 
 export interface Contact {
+  $type?: 'com.atproto.server.describeServer#contact'
   email?: string
-  [k: string]: unknown
 }
 
-export function isContact(v: unknown): v is Contact {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.describeServer#contact'
-  )
+const hashContact = 'contact'
+
+export function isContact<V>(v: V) {
+  return is$typed(v, id, hashContact)
 }
 
-export function validateContact(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.describeServer#contact', v)
+export function validateContact<V>(v: V) {
+  return validate<Contact & V>(v, id, hashContact)
 }
diff --git a/packages/api/src/client/types/com/atproto/server/getAccountInviteCodes.ts b/packages/api/src/client/types/com/atproto/server/getAccountInviteCodes.ts
index e6b688cea66..ae820ea500f 100644
--- a/packages/api/src/client/types/com/atproto/server/getAccountInviteCodes.ts
+++ b/packages/api/src/client/types/com/atproto/server/getAccountInviteCodes.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoServerDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoServerDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.getAccountInviteCodes'
 
 export interface QueryParams {
   includeUsed?: boolean
@@ -18,7 +22,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   codes: ComAtprotoServerDefs.InviteCode[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/getServiceAuth.ts b/packages/api/src/client/types/com/atproto/server/getServiceAuth.ts
index 41ea36e453e..458f641356e 100644
--- a/packages/api/src/client/types/com/atproto/server/getServiceAuth.ts
+++ b/packages/api/src/client/types/com/atproto/server/getServiceAuth.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.getServiceAuth'
 
 export interface QueryParams {
   /** The DID of the service that the token will be used to authenticate with */
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   token: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/getSession.ts b/packages/api/src/client/types/com/atproto/server/getSession.ts
index 1e0837924cc..38346dc1a51 100644
--- a/packages/api/src/client/types/com/atproto/server/getSession.ts
+++ b/packages/api/src/client/types/com/atproto/server/getSession.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.getSession'
 
 export interface QueryParams {}
 
@@ -17,11 +21,10 @@ export interface OutputSchema {
   email?: string
   emailConfirmed?: boolean
   emailAuthFactor?: boolean
-  didDoc?: {}
+  didDoc?: { [_ in string]: unknown }
   active?: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/listAppPasswords.ts b/packages/api/src/client/types/com/atproto/server/listAppPasswords.ts
index a6cf8dca707..c5165a93a51 100644
--- a/packages/api/src/client/types/com/atproto/server/listAppPasswords.ts
+++ b/packages/api/src/client/types/com/atproto/server/listAppPasswords.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.listAppPasswords'
 
 export interface QueryParams {}
 
@@ -13,7 +17,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   passwords: AppPassword[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -42,20 +45,18 @@ export function toKnownErr(e: any) {
 }
 
 export interface AppPassword {
+  $type?: 'com.atproto.server.listAppPasswords#appPassword'
   name: string
   createdAt: string
   privileged?: boolean
-  [k: string]: unknown
 }
 
-export function isAppPassword(v: unknown): v is AppPassword {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.listAppPasswords#appPassword'
-  )
+const hashAppPassword = 'appPassword'
+
+export function isAppPassword<V>(v: V) {
+  return is$typed(v, id, hashAppPassword)
 }
 
-export function validateAppPassword(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.listAppPasswords#appPassword', v)
+export function validateAppPassword<V>(v: V) {
+  return validate<AppPassword & V>(v, id, hashAppPassword)
 }
diff --git a/packages/api/src/client/types/com/atproto/server/refreshSession.ts b/packages/api/src/client/types/com/atproto/server/refreshSession.ts
index 24d0e9e0ccc..ed8babb262d 100644
--- a/packages/api/src/client/types/com/atproto/server/refreshSession.ts
+++ b/packages/api/src/client/types/com/atproto/server/refreshSession.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.refreshSession'
 
 export interface QueryParams {}
 
@@ -16,11 +20,10 @@ export interface OutputSchema {
   refreshJwt: string
   handle: string
   did: string
-  didDoc?: {}
+  didDoc?: { [_ in string]: unknown }
   active?: boolean
   /** Hosting status of the account. If not specified, then assume 'active'. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/requestAccountDelete.ts b/packages/api/src/client/types/com/atproto/server/requestAccountDelete.ts
index dcab71e2558..73489867d63 100644
--- a/packages/api/src/client/types/com/atproto/server/requestAccountDelete.ts
+++ b/packages/api/src/client/types/com/atproto/server/requestAccountDelete.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.requestAccountDelete'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/server/requestEmailConfirmation.ts b/packages/api/src/client/types/com/atproto/server/requestEmailConfirmation.ts
index dcab71e2558..33cbfd7ce71 100644
--- a/packages/api/src/client/types/com/atproto/server/requestEmailConfirmation.ts
+++ b/packages/api/src/client/types/com/atproto/server/requestEmailConfirmation.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.requestEmailConfirmation'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/server/requestEmailUpdate.ts b/packages/api/src/client/types/com/atproto/server/requestEmailUpdate.ts
index 1d51a212117..fb89050f315 100644
--- a/packages/api/src/client/types/com/atproto/server/requestEmailUpdate.ts
+++ b/packages/api/src/client/types/com/atproto/server/requestEmailUpdate.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.requestEmailUpdate'
 
 export interface QueryParams {}
 
@@ -13,7 +17,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   tokenRequired: boolean
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/requestPasswordReset.ts b/packages/api/src/client/types/com/atproto/server/requestPasswordReset.ts
index c33e4f4b604..b118d684571 100644
--- a/packages/api/src/client/types/com/atproto/server/requestPasswordReset.ts
+++ b/packages/api/src/client/types/com/atproto/server/requestPasswordReset.ts
@@ -3,15 +3,18 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.requestPasswordReset'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   email: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/reserveSigningKey.ts b/packages/api/src/client/types/com/atproto/server/reserveSigningKey.ts
index 05867a62537..fde59cf1386 100644
--- a/packages/api/src/client/types/com/atproto/server/reserveSigningKey.ts
+++ b/packages/api/src/client/types/com/atproto/server/reserveSigningKey.ts
@@ -3,22 +3,24 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.reserveSigningKey'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   /** The DID to reserve a key for. */
   did?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   /** The public key for the reserved signing key, in did:key serialization. */
   signingKey: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/resetPassword.ts b/packages/api/src/client/types/com/atproto/server/resetPassword.ts
index fb9f38e8e91..21f1e4f9357 100644
--- a/packages/api/src/client/types/com/atproto/server/resetPassword.ts
+++ b/packages/api/src/client/types/com/atproto/server/resetPassword.ts
@@ -3,16 +3,19 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.resetPassword'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   token: string
   password: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/revokeAppPassword.ts b/packages/api/src/client/types/com/atproto/server/revokeAppPassword.ts
index 2d77e055cb6..be15224e8a7 100644
--- a/packages/api/src/client/types/com/atproto/server/revokeAppPassword.ts
+++ b/packages/api/src/client/types/com/atproto/server/revokeAppPassword.ts
@@ -3,15 +3,18 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.revokeAppPassword'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   name: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/server/updateEmail.ts b/packages/api/src/client/types/com/atproto/server/updateEmail.ts
index 1213f63c724..369c712d6ea 100644
--- a/packages/api/src/client/types/com/atproto/server/updateEmail.ts
+++ b/packages/api/src/client/types/com/atproto/server/updateEmail.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.updateEmail'
 
 export interface QueryParams {}
 
@@ -14,7 +18,6 @@ export interface InputSchema {
   emailAuthFactor?: boolean
   /** Requires a token from com.atproto.sever.requestEmailUpdate if the account's email has been confirmed. */
   token?: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/sync/getBlob.ts b/packages/api/src/client/types/com/atproto/sync/getBlob.ts
index 03318cf2fb0..b88f93f96e1 100644
--- a/packages/api/src/client/types/com/atproto/sync/getBlob.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getBlob.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getBlob'
 
 export interface QueryParams {
   /** The DID of the account. */
diff --git a/packages/api/src/client/types/com/atproto/sync/getBlocks.ts b/packages/api/src/client/types/com/atproto/sync/getBlocks.ts
index 20829a8075c..f052d2933fb 100644
--- a/packages/api/src/client/types/com/atproto/sync/getBlocks.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getBlocks.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getBlocks'
 
 export interface QueryParams {
   /** The DID of the repo. */
diff --git a/packages/api/src/client/types/com/atproto/sync/getCheckout.ts b/packages/api/src/client/types/com/atproto/sync/getCheckout.ts
index 86538474ed2..d385b4247ec 100644
--- a/packages/api/src/client/types/com/atproto/sync/getCheckout.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getCheckout.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getCheckout'
 
 export interface QueryParams {
   /** The DID of the repo. */
diff --git a/packages/api/src/client/types/com/atproto/sync/getHead.ts b/packages/api/src/client/types/com/atproto/sync/getHead.ts
index 0f273053833..f40053f3346 100644
--- a/packages/api/src/client/types/com/atproto/sync/getHead.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getHead.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getHead'
 
 export interface QueryParams {
   /** The DID of the repo. */
@@ -16,7 +20,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   root: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/sync/getLatestCommit.ts b/packages/api/src/client/types/com/atproto/sync/getLatestCommit.ts
index b27f350430a..8b3fd5968e6 100644
--- a/packages/api/src/client/types/com/atproto/sync/getLatestCommit.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getLatestCommit.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getLatestCommit'
 
 export interface QueryParams {
   /** The DID of the repo. */
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cid: string
   rev: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/sync/getRecord.ts b/packages/api/src/client/types/com/atproto/sync/getRecord.ts
index f88eb6ee70a..09d772cf2cc 100644
--- a/packages/api/src/client/types/com/atproto/sync/getRecord.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getRecord.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getRecord'
 
 export interface QueryParams {
   /** The DID of the repo. */
diff --git a/packages/api/src/client/types/com/atproto/sync/getRepo.ts b/packages/api/src/client/types/com/atproto/sync/getRepo.ts
index 52c43f7de93..f3df0814849 100644
--- a/packages/api/src/client/types/com/atproto/sync/getRepo.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getRepo.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getRepo'
 
 export interface QueryParams {
   /** The DID of the repo. */
diff --git a/packages/api/src/client/types/com/atproto/sync/getRepoStatus.ts b/packages/api/src/client/types/com/atproto/sync/getRepoStatus.ts
index 619d65eb558..31c7e61197b 100644
--- a/packages/api/src/client/types/com/atproto/sync/getRepoStatus.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getRepoStatus.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getRepoStatus'
 
 export interface QueryParams {
   /** The DID of the repo. */
@@ -21,7 +25,6 @@ export interface OutputSchema {
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
   /** Optional field, the current rev of the repo, if active=true */
   rev?: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/sync/listBlobs.ts b/packages/api/src/client/types/com/atproto/sync/listBlobs.ts
index bf5a8f1f950..f0dc65b9c4f 100644
--- a/packages/api/src/client/types/com/atproto/sync/listBlobs.ts
+++ b/packages/api/src/client/types/com/atproto/sync/listBlobs.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.listBlobs'
 
 export interface QueryParams {
   /** The DID of the repo. */
@@ -21,7 +25,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   cids: string[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/sync/listRepos.ts b/packages/api/src/client/types/com/atproto/sync/listRepos.ts
index 84a44654f0b..c38056ab69a 100644
--- a/packages/api/src/client/types/com/atproto/sync/listRepos.ts
+++ b/packages/api/src/client/types/com/atproto/sync/listRepos.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.listRepos'
 
 export interface QueryParams {
   limit?: number
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   repos: Repo[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -36,6 +39,7 @@ export function toKnownErr(e: any) {
 }
 
 export interface Repo {
+  $type?: 'com.atproto.sync.listRepos#repo'
   did: string
   /** Current repo commit CID */
   head: string
@@ -43,17 +47,14 @@ export interface Repo {
   active?: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
-export function isRepo(v: unknown): v is Repo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.listRepos#repo'
-  )
+const hashRepo = 'repo'
+
+export function isRepo<V>(v: V) {
+  return is$typed(v, id, hashRepo)
 }
 
-export function validateRepo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.listRepos#repo', v)
+export function validateRepo<V>(v: V) {
+  return validate<Repo & V>(v, id, hashRepo)
 }
diff --git a/packages/api/src/client/types/com/atproto/sync/notifyOfUpdate.ts b/packages/api/src/client/types/com/atproto/sync/notifyOfUpdate.ts
index 30e24f8b5b9..03107efb65a 100644
--- a/packages/api/src/client/types/com/atproto/sync/notifyOfUpdate.ts
+++ b/packages/api/src/client/types/com/atproto/sync/notifyOfUpdate.ts
@@ -3,16 +3,19 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.notifyOfUpdate'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   /** Hostname of the current service (usually a PDS) that is notifying of update. */
   hostname: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/sync/requestCrawl.ts b/packages/api/src/client/types/com/atproto/sync/requestCrawl.ts
index 0f5d78560cf..5755fc19845 100644
--- a/packages/api/src/client/types/com/atproto/sync/requestCrawl.ts
+++ b/packages/api/src/client/types/com/atproto/sync/requestCrawl.ts
@@ -3,16 +3,19 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.requestCrawl'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   /** Hostname of the current service (eg, PDS) that is requesting to be crawled. */
   hostname: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/sync/subscribeRepos.ts b/packages/api/src/client/types/com/atproto/sync/subscribeRepos.ts
index eac07c9acc1..48e573423ad 100644
--- a/packages/api/src/client/types/com/atproto/sync/subscribeRepos.ts
+++ b/packages/api/src/client/types/com/atproto/sync/subscribeRepos.ts
@@ -3,12 +3,17 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.subscribeRepos'
 
 /** Represents an update of repository state. Note that empty commits are allowed, which include no repo data changes, but an update to rev and signature. */
 export interface Commit {
+  $type?: 'com.atproto.sync.subscribeRepos#commit'
   /** The stream sequence number of this message. */
   seq: number
   /** DEPRECATED -- unused */
@@ -31,45 +36,41 @@ export interface Commit {
   blobs: CID[]
   /** Timestamp of when this message was originally broadcast. */
   time: string
-  [k: string]: unknown
 }
 
-export function isCommit(v: unknown): v is Commit {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#commit'
-  )
+const hashCommit = 'commit'
+
+export function isCommit<V>(v: V) {
+  return is$typed(v, id, hashCommit)
 }
 
-export function validateCommit(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#commit', v)
+export function validateCommit<V>(v: V) {
+  return validate<Commit & V>(v, id, hashCommit)
 }
 
 /** Represents a change to an account's identity. Could be an updated handle, signing key, or pds hosting endpoint. Serves as a prod to all downstream services to refresh their identity cache. */
 export interface Identity {
+  $type?: 'com.atproto.sync.subscribeRepos#identity'
   seq: number
   did: string
   time: string
   /** The current handle for the account, or 'handle.invalid' if validation fails. This field is optional, might have been validated or passed-through from an upstream source. Semantics and behaviors for PDS vs Relay may evolve in the future; see atproto specs for more details. */
   handle?: string
-  [k: string]: unknown
 }
 
-export function isIdentity(v: unknown): v is Identity {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#identity'
-  )
+const hashIdentity = 'identity'
+
+export function isIdentity<V>(v: V) {
+  return is$typed(v, id, hashIdentity)
 }
 
-export function validateIdentity(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#identity', v)
+export function validateIdentity<V>(v: V) {
+  return validate<Identity & V>(v, id, hashIdentity)
 }
 
 /** Represents a change to an account's status on a host (eg, PDS or Relay). The semantics of this event are that the status is at the host which emitted the event, not necessarily that at the currently active PDS. Eg, a Relay takedown would emit a takedown with active=false, even if the PDS is still active. */
 export interface Account {
+  $type?: 'com.atproto.sync.subscribeRepos#account'
   seq: number
   did: string
   time: string
@@ -77,118 +78,105 @@ export interface Account {
   active: boolean
   /** If active=false, this optional field indicates a reason for why the account is not active. */
   status?: 'takendown' | 'suspended' | 'deleted' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
-export function isAccount(v: unknown): v is Account {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#account'
-  )
+const hashAccount = 'account'
+
+export function isAccount<V>(v: V) {
+  return is$typed(v, id, hashAccount)
 }
 
-export function validateAccount(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#account', v)
+export function validateAccount<V>(v: V) {
+  return validate<Account & V>(v, id, hashAccount)
 }
 
 /** DEPRECATED -- Use #identity event instead */
 export interface Handle {
+  $type?: 'com.atproto.sync.subscribeRepos#handle'
   seq: number
   did: string
   handle: string
   time: string
-  [k: string]: unknown
 }
 
-export function isHandle(v: unknown): v is Handle {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#handle'
-  )
+const hashHandle = 'handle'
+
+export function isHandle<V>(v: V) {
+  return is$typed(v, id, hashHandle)
 }
 
-export function validateHandle(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#handle', v)
+export function validateHandle<V>(v: V) {
+  return validate<Handle & V>(v, id, hashHandle)
 }
 
 /** DEPRECATED -- Use #account event instead */
 export interface Migrate {
+  $type?: 'com.atproto.sync.subscribeRepos#migrate'
   seq: number
   did: string
   migrateTo: string | null
   time: string
-  [k: string]: unknown
 }
 
-export function isMigrate(v: unknown): v is Migrate {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#migrate'
-  )
+const hashMigrate = 'migrate'
+
+export function isMigrate<V>(v: V) {
+  return is$typed(v, id, hashMigrate)
 }
 
-export function validateMigrate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#migrate', v)
+export function validateMigrate<V>(v: V) {
+  return validate<Migrate & V>(v, id, hashMigrate)
 }
 
 /** DEPRECATED -- Use #account event instead */
 export interface Tombstone {
+  $type?: 'com.atproto.sync.subscribeRepos#tombstone'
   seq: number
   did: string
   time: string
-  [k: string]: unknown
 }
 
-export function isTombstone(v: unknown): v is Tombstone {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#tombstone'
-  )
+const hashTombstone = 'tombstone'
+
+export function isTombstone<V>(v: V) {
+  return is$typed(v, id, hashTombstone)
 }
 
-export function validateTombstone(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#tombstone', v)
+export function validateTombstone<V>(v: V) {
+  return validate<Tombstone & V>(v, id, hashTombstone)
 }
 
 export interface Info {
+  $type?: 'com.atproto.sync.subscribeRepos#info'
   name: 'OutdatedCursor' | (string & {})
   message?: string
-  [k: string]: unknown
 }
 
-export function isInfo(v: unknown): v is Info {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#info'
-  )
+const hashInfo = 'info'
+
+export function isInfo<V>(v: V) {
+  return is$typed(v, id, hashInfo)
 }
 
-export function validateInfo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#info', v)
+export function validateInfo<V>(v: V) {
+  return validate<Info & V>(v, id, hashInfo)
 }
 
 /** A repo operation, ie a mutation of a single record. */
 export interface RepoOp {
+  $type?: 'com.atproto.sync.subscribeRepos#repoOp'
   action: 'create' | 'update' | 'delete' | (string & {})
   path: string
   /** For creates and updates, the new record CID. For deletions, null. */
   cid: CID | null
-  [k: string]: unknown
 }
 
-export function isRepoOp(v: unknown): v is RepoOp {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#repoOp'
-  )
+const hashRepoOp = 'repoOp'
+
+export function isRepoOp<V>(v: V) {
+  return is$typed(v, id, hashRepoOp)
 }
 
-export function validateRepoOp(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#repoOp', v)
+export function validateRepoOp<V>(v: V) {
+  return validate<RepoOp & V>(v, id, hashRepoOp)
 }
diff --git a/packages/api/src/client/types/com/atproto/temp/addReservedHandle.ts b/packages/api/src/client/types/com/atproto/temp/addReservedHandle.ts
index e86337519ee..ad1a3079fa0 100644
--- a/packages/api/src/client/types/com/atproto/temp/addReservedHandle.ts
+++ b/packages/api/src/client/types/com/atproto/temp/addReservedHandle.ts
@@ -3,20 +3,21 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.temp.addReservedHandle'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   handle: string
-  [k: string]: unknown
 }
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export interface CallOptions {
   signal?: AbortSignal
diff --git a/packages/api/src/client/types/com/atproto/temp/checkSignupQueue.ts b/packages/api/src/client/types/com/atproto/temp/checkSignupQueue.ts
index 414e6ca565c..7699502170d 100644
--- a/packages/api/src/client/types/com/atproto/temp/checkSignupQueue.ts
+++ b/packages/api/src/client/types/com/atproto/temp/checkSignupQueue.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.temp.checkSignupQueue'
 
 export interface QueryParams {}
 
@@ -15,7 +19,6 @@ export interface OutputSchema {
   activated: boolean
   placeInQueue?: number
   estimatedTimeMs?: number
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/temp/fetchLabels.ts b/packages/api/src/client/types/com/atproto/temp/fetchLabels.ts
index 0b1d2399f4b..4e6cb92a736 100644
--- a/packages/api/src/client/types/com/atproto/temp/fetchLabels.ts
+++ b/packages/api/src/client/types/com/atproto/temp/fetchLabels.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoLabelDefs from '../label/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoLabelDefs from '../label/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.temp.fetchLabels'
 
 export interface QueryParams {
   since?: number
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   labels: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/com/atproto/temp/requestPhoneVerification.ts b/packages/api/src/client/types/com/atproto/temp/requestPhoneVerification.ts
index 5e0699cd374..47e1906dbd8 100644
--- a/packages/api/src/client/types/com/atproto/temp/requestPhoneVerification.ts
+++ b/packages/api/src/client/types/com/atproto/temp/requestPhoneVerification.ts
@@ -3,15 +3,18 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.temp.requestPhoneVerification'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   phoneNumber: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/communication/createTemplate.ts b/packages/api/src/client/types/tools/ozone/communication/createTemplate.ts
index e7d22b33604..3acf03b90ae 100644
--- a/packages/api/src/client/types/tools/ozone/communication/createTemplate.ts
+++ b/packages/api/src/client/types/tools/ozone/communication/createTemplate.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ToolsOzoneCommunicationDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneCommunicationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.communication.createTemplate'
 
 export interface QueryParams {}
 
@@ -21,7 +25,6 @@ export interface InputSchema {
   lang?: string
   /** DID of the user who is creating the template. */
   createdBy?: string
-  [k: string]: unknown
 }
 
 export type OutputSchema = ToolsOzoneCommunicationDefs.TemplateView
diff --git a/packages/api/src/client/types/tools/ozone/communication/defs.ts b/packages/api/src/client/types/tools/ozone/communication/defs.ts
index 4cf61252d7a..c2346fe3bce 100644
--- a/packages/api/src/client/types/tools/ozone/communication/defs.ts
+++ b/packages/api/src/client/types/tools/ozone/communication/defs.ts
@@ -2,11 +2,16 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.communication.defs'
 
 export interface TemplateView {
+  $type?: 'tools.ozone.communication.defs#templateView'
   id: string
   /** Name of the template. */
   name: string
@@ -21,17 +26,14 @@ export interface TemplateView {
   lastUpdatedBy: string
   createdAt: string
   updatedAt: string
-  [k: string]: unknown
 }
 
-export function isTemplateView(v: unknown): v is TemplateView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.communication.defs#templateView'
-  )
+const hashTemplateView = 'templateView'
+
+export function isTemplateView<V>(v: V) {
+  return is$typed(v, id, hashTemplateView)
 }
 
-export function validateTemplateView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.communication.defs#templateView', v)
+export function validateTemplateView<V>(v: V) {
+  return validate<TemplateView & V>(v, id, hashTemplateView)
 }
diff --git a/packages/api/src/client/types/tools/ozone/communication/deleteTemplate.ts b/packages/api/src/client/types/tools/ozone/communication/deleteTemplate.ts
index 0fc74571563..940f3b939da 100644
--- a/packages/api/src/client/types/tools/ozone/communication/deleteTemplate.ts
+++ b/packages/api/src/client/types/tools/ozone/communication/deleteTemplate.ts
@@ -3,15 +3,18 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.communication.deleteTemplate'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   id: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/communication/listTemplates.ts b/packages/api/src/client/types/tools/ozone/communication/listTemplates.ts
index c10f1ee56ba..7984a3ac537 100644
--- a/packages/api/src/client/types/tools/ozone/communication/listTemplates.ts
+++ b/packages/api/src/client/types/tools/ozone/communication/listTemplates.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ToolsOzoneCommunicationDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneCommunicationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.communication.listTemplates'
 
 export interface QueryParams {}
 
@@ -14,7 +18,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   communicationTemplates: ToolsOzoneCommunicationDefs.TemplateView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/communication/updateTemplate.ts b/packages/api/src/client/types/tools/ozone/communication/updateTemplate.ts
index 5d6184ff5f4..17a7efd0ff9 100644
--- a/packages/api/src/client/types/tools/ozone/communication/updateTemplate.ts
+++ b/packages/api/src/client/types/tools/ozone/communication/updateTemplate.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ToolsOzoneCommunicationDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneCommunicationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.communication.updateTemplate'
 
 export interface QueryParams {}
 
@@ -24,7 +28,6 @@ export interface InputSchema {
   /** DID of the user who is updating the template. */
   updatedBy?: string
   disabled?: boolean
-  [k: string]: unknown
 }
 
 export type OutputSchema = ToolsOzoneCommunicationDefs.TemplateView
diff --git a/packages/api/src/client/types/tools/ozone/moderation/defs.ts b/packages/api/src/client/types/tools/ozone/moderation/defs.ts
index 4135a248961..611010a42a4 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/defs.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/defs.ts
@@ -2,121 +2,119 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
-import * as ChatBskyConvoDefs from '../../../chat/bsky/convo/defs'
-import * as ComAtprotoModerationDefs from '../../../com/atproto/moderation/defs'
-import * as ComAtprotoServerDefs from '../../../com/atproto/server/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs.js'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
+import type * as ChatBskyConvoDefs from '../../../chat/bsky/convo/defs.js'
+import type * as ComAtprotoModerationDefs from '../../../com/atproto/moderation/defs.js'
+import type * as ComAtprotoServerDefs from '../../../com/atproto/server/defs.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.defs'
 
 export interface ModEventView {
+  $type?: 'tools.ozone.moderation.defs#modEventView'
   id: number
   event:
-    | ModEventTakedown
-    | ModEventReverseTakedown
-    | ModEventComment
-    | ModEventReport
-    | ModEventLabel
-    | ModEventAcknowledge
-    | ModEventEscalate
-    | ModEventMute
-    | ModEventUnmute
-    | ModEventMuteReporter
-    | ModEventUnmuteReporter
-    | ModEventEmail
-    | ModEventResolveAppeal
-    | ModEventDivert
-    | ModEventTag
-    | AccountEvent
-    | IdentityEvent
-    | RecordEvent
-    | ModEventPriorityScore
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ModEventTakedown>
+    | $Typed<ModEventReverseTakedown>
+    | $Typed<ModEventComment>
+    | $Typed<ModEventReport>
+    | $Typed<ModEventLabel>
+    | $Typed<ModEventAcknowledge>
+    | $Typed<ModEventEscalate>
+    | $Typed<ModEventMute>
+    | $Typed<ModEventUnmute>
+    | $Typed<ModEventMuteReporter>
+    | $Typed<ModEventUnmuteReporter>
+    | $Typed<ModEventEmail>
+    | $Typed<ModEventResolveAppeal>
+    | $Typed<ModEventDivert>
+    | $Typed<ModEventTag>
+    | $Typed<AccountEvent>
+    | $Typed<IdentityEvent>
+    | $Typed<RecordEvent>
+    | $Typed<ModEventPriorityScore>
+    | { $type: string }
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ChatBskyConvoDefs.MessageRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ChatBskyConvoDefs.MessageRef>
+    | { $type: string }
   subjectBlobCids: string[]
   createdBy: string
   createdAt: string
   creatorHandle?: string
   subjectHandle?: string
-  [k: string]: unknown
 }
 
-export function isModEventView(v: unknown): v is ModEventView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventView'
-  )
+const hashModEventView = 'modEventView'
+
+export function isModEventView<V>(v: V) {
+  return is$typed(v, id, hashModEventView)
 }
 
-export function validateModEventView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventView', v)
+export function validateModEventView<V>(v: V) {
+  return validate<ModEventView & V>(v, id, hashModEventView)
 }
 
 export interface ModEventViewDetail {
+  $type?: 'tools.ozone.moderation.defs#modEventViewDetail'
   id: number
   event:
-    | ModEventTakedown
-    | ModEventReverseTakedown
-    | ModEventComment
-    | ModEventReport
-    | ModEventLabel
-    | ModEventAcknowledge
-    | ModEventEscalate
-    | ModEventMute
-    | ModEventUnmute
-    | ModEventMuteReporter
-    | ModEventUnmuteReporter
-    | ModEventEmail
-    | ModEventResolveAppeal
-    | ModEventDivert
-    | ModEventTag
-    | AccountEvent
-    | IdentityEvent
-    | RecordEvent
-    | ModEventPriorityScore
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ModEventTakedown>
+    | $Typed<ModEventReverseTakedown>
+    | $Typed<ModEventComment>
+    | $Typed<ModEventReport>
+    | $Typed<ModEventLabel>
+    | $Typed<ModEventAcknowledge>
+    | $Typed<ModEventEscalate>
+    | $Typed<ModEventMute>
+    | $Typed<ModEventUnmute>
+    | $Typed<ModEventMuteReporter>
+    | $Typed<ModEventUnmuteReporter>
+    | $Typed<ModEventEmail>
+    | $Typed<ModEventResolveAppeal>
+    | $Typed<ModEventDivert>
+    | $Typed<ModEventTag>
+    | $Typed<AccountEvent>
+    | $Typed<IdentityEvent>
+    | $Typed<RecordEvent>
+    | $Typed<ModEventPriorityScore>
+    | { $type: string }
   subject:
-    | RepoView
-    | RepoViewNotFound
-    | RecordView
-    | RecordViewNotFound
-    | { $type: string; [k: string]: unknown }
+    | $Typed<RepoView>
+    | $Typed<RepoViewNotFound>
+    | $Typed<RecordView>
+    | $Typed<RecordViewNotFound>
+    | { $type: string }
   subjectBlobs: BlobView[]
   createdBy: string
   createdAt: string
-  [k: string]: unknown
 }
 
-export function isModEventViewDetail(v: unknown): v is ModEventViewDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventViewDetail'
-  )
+const hashModEventViewDetail = 'modEventViewDetail'
+
+export function isModEventViewDetail<V>(v: V) {
+  return is$typed(v, id, hashModEventViewDetail)
 }
 
-export function validateModEventViewDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventViewDetail', v)
+export function validateModEventViewDetail<V>(v: V) {
+  return validate<ModEventViewDetail & V>(v, id, hashModEventViewDetail)
 }
 
 export interface SubjectStatusView {
+  $type?: 'tools.ozone.moderation.defs#subjectStatusView'
   id: number
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | { $type: string; [k: string]: unknown }
-  hosting?:
-    | AccountHosting
-    | RecordHosting
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | { $type: string }
+  hosting?: $Typed<AccountHosting> | $Typed<RecordHosting> | { $type: string }
   subjectBlobCids?: string[]
   subjectRepoHandle?: string
   /** Timestamp referencing when the last update was made to the moderation status of the subject */
@@ -142,23 +140,21 @@ export interface SubjectStatusView {
   tags?: string[]
   accountStats?: AccountStats
   recordsStats?: RecordsStats
-  [k: string]: unknown
 }
 
-export function isSubjectStatusView(v: unknown): v is SubjectStatusView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#subjectStatusView'
-  )
+const hashSubjectStatusView = 'subjectStatusView'
+
+export function isSubjectStatusView<V>(v: V) {
+  return is$typed(v, id, hashSubjectStatusView)
 }
 
-export function validateSubjectStatusView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#subjectStatusView', v)
+export function validateSubjectStatusView<V>(v: V) {
+  return validate<SubjectStatusView & V>(v, id, hashSubjectStatusView)
 }
 
 /** Statistics about a particular account subject */
 export interface AccountStats {
+  $type?: 'tools.ozone.moderation.defs#accountStats'
   /** Total number of reports on the account */
   reportCount?: number
   /** Total number of appeals against a moderation action on the account */
@@ -169,23 +165,21 @@ export interface AccountStats {
   escalateCount?: number
   /** Number of times the account was taken down */
   takedownCount?: number
-  [k: string]: unknown
 }
 
-export function isAccountStats(v: unknown): v is AccountStats {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#accountStats'
-  )
+const hashAccountStats = 'accountStats'
+
+export function isAccountStats<V>(v: V) {
+  return is$typed(v, id, hashAccountStats)
 }
 
-export function validateAccountStats(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#accountStats', v)
+export function validateAccountStats<V>(v: V) {
+  return validate<AccountStats & V>(v, id, hashAccountStats)
 }
 
 /** Statistics about a set of record subject items */
 export interface RecordsStats {
+  $type?: 'tools.ozone.moderation.defs#recordsStats'
   /** Cumulative sum of the number of reports on the items in the set */
   totalReports?: number
   /** Number of items that were reported at least once */
@@ -202,19 +196,16 @@ export interface RecordsStats {
   processedCount?: number
   /** Number of item currently taken down */
   takendownCount?: number
-  [k: string]: unknown
 }
 
-export function isRecordsStats(v: unknown): v is RecordsStats {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordsStats'
-  )
+const hashRecordsStats = 'recordsStats'
+
+export function isRecordsStats<V>(v: V) {
+  return is$typed(v, id, hashRecordsStats)
 }
 
-export function validateRecordsStats(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordsStats', v)
+export function validateRecordsStats<V>(v: V) {
+  return validate<RecordsStats & V>(v, id, hashRecordsStats)
 }
 
 export type SubjectReviewState =
@@ -225,16 +216,17 @@ export type SubjectReviewState =
   | (string & {})
 
 /** Moderator review status of a subject: Open. Indicates that the subject needs to be reviewed by a moderator */
-export const REVIEWOPEN = 'tools.ozone.moderation.defs#reviewOpen'
+export const REVIEWOPEN = `${id}#reviewOpen`
 /** Moderator review status of a subject: Escalated. Indicates that the subject was escalated for review by a moderator */
-export const REVIEWESCALATED = 'tools.ozone.moderation.defs#reviewEscalated'
+export const REVIEWESCALATED = `${id}#reviewEscalated`
 /** Moderator review status of a subject: Closed. Indicates that the subject was already reviewed and resolved by a moderator */
-export const REVIEWCLOSED = 'tools.ozone.moderation.defs#reviewClosed'
+export const REVIEWCLOSED = `${id}#reviewClosed`
 /** Moderator review status of a subject: Unnecessary. Indicates that the subject does not need a review at the moment but there is probably some moderation related metadata available for it */
-export const REVIEWNONE = 'tools.ozone.moderation.defs#reviewNone'
+export const REVIEWNONE = `${id}#reviewNone`
 
 /** Take down a subject permanently or temporarily */
 export interface ModEventTakedown {
+  $type?: 'tools.ozone.moderation.defs#modEventTakedown'
   comment?: string
   /** Indicates how long the takedown should be in effect before automatically expiring. */
   durationInHours?: number
@@ -242,344 +234,293 @@ export interface ModEventTakedown {
   acknowledgeAccountSubjects?: boolean
   /** Names/Keywords of the policies that drove the decision. */
   policies?: string[]
-  [k: string]: unknown
 }
 
-export function isModEventTakedown(v: unknown): v is ModEventTakedown {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventTakedown'
-  )
+const hashModEventTakedown = 'modEventTakedown'
+
+export function isModEventTakedown<V>(v: V) {
+  return is$typed(v, id, hashModEventTakedown)
 }
 
-export function validateModEventTakedown(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventTakedown', v)
+export function validateModEventTakedown<V>(v: V) {
+  return validate<ModEventTakedown & V>(v, id, hashModEventTakedown)
 }
 
 /** Revert take down action on a subject */
 export interface ModEventReverseTakedown {
+  $type?: 'tools.ozone.moderation.defs#modEventReverseTakedown'
   /** Describe reasoning behind the reversal. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventReverseTakedown(
-  v: unknown,
-): v is ModEventReverseTakedown {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventReverseTakedown'
-  )
+const hashModEventReverseTakedown = 'modEventReverseTakedown'
+
+export function isModEventReverseTakedown<V>(v: V) {
+  return is$typed(v, id, hashModEventReverseTakedown)
 }
 
-export function validateModEventReverseTakedown(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventReverseTakedown',
+export function validateModEventReverseTakedown<V>(v: V) {
+  return validate<ModEventReverseTakedown & V>(
     v,
+    id,
+    hashModEventReverseTakedown,
   )
 }
 
 /** Resolve appeal on a subject */
 export interface ModEventResolveAppeal {
+  $type?: 'tools.ozone.moderation.defs#modEventResolveAppeal'
   /** Describe resolution. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventResolveAppeal(
-  v: unknown,
-): v is ModEventResolveAppeal {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventResolveAppeal'
-  )
+const hashModEventResolveAppeal = 'modEventResolveAppeal'
+
+export function isModEventResolveAppeal<V>(v: V) {
+  return is$typed(v, id, hashModEventResolveAppeal)
 }
 
-export function validateModEventResolveAppeal(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventResolveAppeal',
-    v,
-  )
+export function validateModEventResolveAppeal<V>(v: V) {
+  return validate<ModEventResolveAppeal & V>(v, id, hashModEventResolveAppeal)
 }
 
 /** Add a comment to a subject */
 export interface ModEventComment {
+  $type?: 'tools.ozone.moderation.defs#modEventComment'
   comment: string
   /** Make the comment persistent on the subject */
   sticky?: boolean
-  [k: string]: unknown
 }
 
-export function isModEventComment(v: unknown): v is ModEventComment {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventComment'
-  )
+const hashModEventComment = 'modEventComment'
+
+export function isModEventComment<V>(v: V) {
+  return is$typed(v, id, hashModEventComment)
 }
 
-export function validateModEventComment(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventComment', v)
+export function validateModEventComment<V>(v: V) {
+  return validate<ModEventComment & V>(v, id, hashModEventComment)
 }
 
 /** Report a subject */
 export interface ModEventReport {
+  $type?: 'tools.ozone.moderation.defs#modEventReport'
   comment?: string
   /** Set to true if the reporter was muted from reporting at the time of the event. These reports won't impact the reviewState of the subject. */
   isReporterMuted?: boolean
   reportType: ComAtprotoModerationDefs.ReasonType
-  [k: string]: unknown
 }
 
-export function isModEventReport(v: unknown): v is ModEventReport {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventReport'
-  )
+const hashModEventReport = 'modEventReport'
+
+export function isModEventReport<V>(v: V) {
+  return is$typed(v, id, hashModEventReport)
 }
 
-export function validateModEventReport(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventReport', v)
+export function validateModEventReport<V>(v: V) {
+  return validate<ModEventReport & V>(v, id, hashModEventReport)
 }
 
 /** Apply/Negate labels on a subject */
 export interface ModEventLabel {
+  $type?: 'tools.ozone.moderation.defs#modEventLabel'
   comment?: string
   createLabelVals: string[]
   negateLabelVals: string[]
   /** Indicates how long the label will remain on the subject. Only applies on labels that are being added. */
   durationInHours?: number
-  [k: string]: unknown
 }
 
-export function isModEventLabel(v: unknown): v is ModEventLabel {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventLabel'
-  )
+const hashModEventLabel = 'modEventLabel'
+
+export function isModEventLabel<V>(v: V) {
+  return is$typed(v, id, hashModEventLabel)
 }
 
-export function validateModEventLabel(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventLabel', v)
+export function validateModEventLabel<V>(v: V) {
+  return validate<ModEventLabel & V>(v, id, hashModEventLabel)
 }
 
 /** Set priority score of the subject. Higher score means higher priority. */
 export interface ModEventPriorityScore {
+  $type?: 'tools.ozone.moderation.defs#modEventPriorityScore'
   comment?: string
   score: number
-  [k: string]: unknown
 }
 
-export function isModEventPriorityScore(
-  v: unknown,
-): v is ModEventPriorityScore {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventPriorityScore'
-  )
+const hashModEventPriorityScore = 'modEventPriorityScore'
+
+export function isModEventPriorityScore<V>(v: V) {
+  return is$typed(v, id, hashModEventPriorityScore)
 }
 
-export function validateModEventPriorityScore(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventPriorityScore',
-    v,
-  )
+export function validateModEventPriorityScore<V>(v: V) {
+  return validate<ModEventPriorityScore & V>(v, id, hashModEventPriorityScore)
 }
 
 export interface ModEventAcknowledge {
+  $type?: 'tools.ozone.moderation.defs#modEventAcknowledge'
   comment?: string
   /** If true, all other reports on content authored by this account will be resolved (acknowledged). */
   acknowledgeAccountSubjects?: boolean
-  [k: string]: unknown
 }
 
-export function isModEventAcknowledge(v: unknown): v is ModEventAcknowledge {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventAcknowledge'
-  )
+const hashModEventAcknowledge = 'modEventAcknowledge'
+
+export function isModEventAcknowledge<V>(v: V) {
+  return is$typed(v, id, hashModEventAcknowledge)
 }
 
-export function validateModEventAcknowledge(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventAcknowledge', v)
+export function validateModEventAcknowledge<V>(v: V) {
+  return validate<ModEventAcknowledge & V>(v, id, hashModEventAcknowledge)
 }
 
 export interface ModEventEscalate {
+  $type?: 'tools.ozone.moderation.defs#modEventEscalate'
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventEscalate(v: unknown): v is ModEventEscalate {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventEscalate'
-  )
+const hashModEventEscalate = 'modEventEscalate'
+
+export function isModEventEscalate<V>(v: V) {
+  return is$typed(v, id, hashModEventEscalate)
 }
 
-export function validateModEventEscalate(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventEscalate', v)
+export function validateModEventEscalate<V>(v: V) {
+  return validate<ModEventEscalate & V>(v, id, hashModEventEscalate)
 }
 
 /** Mute incoming reports on a subject */
 export interface ModEventMute {
+  $type?: 'tools.ozone.moderation.defs#modEventMute'
   comment?: string
   /** Indicates how long the subject should remain muted. */
   durationInHours: number
-  [k: string]: unknown
 }
 
-export function isModEventMute(v: unknown): v is ModEventMute {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventMute'
-  )
+const hashModEventMute = 'modEventMute'
+
+export function isModEventMute<V>(v: V) {
+  return is$typed(v, id, hashModEventMute)
 }
 
-export function validateModEventMute(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventMute', v)
+export function validateModEventMute<V>(v: V) {
+  return validate<ModEventMute & V>(v, id, hashModEventMute)
 }
 
 /** Unmute action on a subject */
 export interface ModEventUnmute {
+  $type?: 'tools.ozone.moderation.defs#modEventUnmute'
   /** Describe reasoning behind the reversal. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventUnmute(v: unknown): v is ModEventUnmute {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventUnmute'
-  )
+const hashModEventUnmute = 'modEventUnmute'
+
+export function isModEventUnmute<V>(v: V) {
+  return is$typed(v, id, hashModEventUnmute)
 }
 
-export function validateModEventUnmute(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventUnmute', v)
+export function validateModEventUnmute<V>(v: V) {
+  return validate<ModEventUnmute & V>(v, id, hashModEventUnmute)
 }
 
 /** Mute incoming reports from an account */
 export interface ModEventMuteReporter {
+  $type?: 'tools.ozone.moderation.defs#modEventMuteReporter'
   comment?: string
   /** Indicates how long the account should remain muted. Falsy value here means a permanent mute. */
   durationInHours?: number
-  [k: string]: unknown
 }
 
-export function isModEventMuteReporter(v: unknown): v is ModEventMuteReporter {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventMuteReporter'
-  )
+const hashModEventMuteReporter = 'modEventMuteReporter'
+
+export function isModEventMuteReporter<V>(v: V) {
+  return is$typed(v, id, hashModEventMuteReporter)
 }
 
-export function validateModEventMuteReporter(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventMuteReporter',
-    v,
-  )
+export function validateModEventMuteReporter<V>(v: V) {
+  return validate<ModEventMuteReporter & V>(v, id, hashModEventMuteReporter)
 }
 
 /** Unmute incoming reports from an account */
 export interface ModEventUnmuteReporter {
+  $type?: 'tools.ozone.moderation.defs#modEventUnmuteReporter'
   /** Describe reasoning behind the reversal. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventUnmuteReporter(
-  v: unknown,
-): v is ModEventUnmuteReporter {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventUnmuteReporter'
-  )
+const hashModEventUnmuteReporter = 'modEventUnmuteReporter'
+
+export function isModEventUnmuteReporter<V>(v: V) {
+  return is$typed(v, id, hashModEventUnmuteReporter)
 }
 
-export function validateModEventUnmuteReporter(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventUnmuteReporter',
-    v,
-  )
+export function validateModEventUnmuteReporter<V>(v: V) {
+  return validate<ModEventUnmuteReporter & V>(v, id, hashModEventUnmuteReporter)
 }
 
 /** Keep a log of outgoing email to a user */
 export interface ModEventEmail {
+  $type?: 'tools.ozone.moderation.defs#modEventEmail'
   /** The subject line of the email sent to the user. */
   subjectLine: string
   /** The content of the email sent to the user. */
   content?: string
   /** Additional comment about the outgoing comm. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventEmail(v: unknown): v is ModEventEmail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventEmail'
-  )
+const hashModEventEmail = 'modEventEmail'
+
+export function isModEventEmail<V>(v: V) {
+  return is$typed(v, id, hashModEventEmail)
 }
 
-export function validateModEventEmail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventEmail', v)
+export function validateModEventEmail<V>(v: V) {
+  return validate<ModEventEmail & V>(v, id, hashModEventEmail)
 }
 
 /** Divert a record's blobs to a 3rd party service for further scanning/tagging */
 export interface ModEventDivert {
+  $type?: 'tools.ozone.moderation.defs#modEventDivert'
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventDivert(v: unknown): v is ModEventDivert {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventDivert'
-  )
+const hashModEventDivert = 'modEventDivert'
+
+export function isModEventDivert<V>(v: V) {
+  return is$typed(v, id, hashModEventDivert)
 }
 
-export function validateModEventDivert(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventDivert', v)
+export function validateModEventDivert<V>(v: V) {
+  return validate<ModEventDivert & V>(v, id, hashModEventDivert)
 }
 
 /** Add/Remove a tag on a subject */
 export interface ModEventTag {
+  $type?: 'tools.ozone.moderation.defs#modEventTag'
   /** Tags to be added to the subject. If already exists, won't be duplicated. */
   add: string[]
   /** Tags to be removed to the subject. Ignores a tag If it doesn't exist, won't be duplicated. */
   remove: string[]
   /** Additional comment about added/removed tags. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventTag(v: unknown): v is ModEventTag {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventTag'
-  )
+const hashModEventTag = 'modEventTag'
+
+export function isModEventTag<V>(v: V) {
+  return is$typed(v, id, hashModEventTag)
 }
 
-export function validateModEventTag(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventTag', v)
+export function validateModEventTag<V>(v: V) {
+  return validate<ModEventTag & V>(v, id, hashModEventTag)
 }
 
 /** Logs account status related events on a repo subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
 export interface AccountEvent {
+  $type?: 'tools.ozone.moderation.defs#accountEvent'
   comment?: string
   /** Indicates that the account has a repository which can be fetched from the host that emitted this event. */
   active: boolean
@@ -592,69 +533,63 @@ export interface AccountEvent {
     | 'tombstoned'
     | (string & {})
   timestamp: string
-  [k: string]: unknown
 }
 
-export function isAccountEvent(v: unknown): v is AccountEvent {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#accountEvent'
-  )
+const hashAccountEvent = 'accountEvent'
+
+export function isAccountEvent<V>(v: V) {
+  return is$typed(v, id, hashAccountEvent)
 }
 
-export function validateAccountEvent(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#accountEvent', v)
+export function validateAccountEvent<V>(v: V) {
+  return validate<AccountEvent & V>(v, id, hashAccountEvent)
 }
 
 /** Logs identity related events on a repo subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
 export interface IdentityEvent {
+  $type?: 'tools.ozone.moderation.defs#identityEvent'
   comment?: string
   handle?: string
   pdsHost?: string
   tombstone?: boolean
   timestamp: string
-  [k: string]: unknown
 }
 
-export function isIdentityEvent(v: unknown): v is IdentityEvent {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#identityEvent'
-  )
+const hashIdentityEvent = 'identityEvent'
+
+export function isIdentityEvent<V>(v: V) {
+  return is$typed(v, id, hashIdentityEvent)
 }
 
-export function validateIdentityEvent(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#identityEvent', v)
+export function validateIdentityEvent<V>(v: V) {
+  return validate<IdentityEvent & V>(v, id, hashIdentityEvent)
 }
 
 /** Logs lifecycle event on a record subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
 export interface RecordEvent {
+  $type?: 'tools.ozone.moderation.defs#recordEvent'
   comment?: string
   op: 'create' | 'update' | 'delete' | (string & {})
   cid?: string
   timestamp: string
-  [k: string]: unknown
 }
 
-export function isRecordEvent(v: unknown): v is RecordEvent {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordEvent'
-  )
+const hashRecordEvent = 'recordEvent'
+
+export function isRecordEvent<V>(v: V) {
+  return is$typed(v, id, hashRecordEvent)
 }
 
-export function validateRecordEvent(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordEvent', v)
+export function validateRecordEvent<V>(v: V) {
+  return validate<RecordEvent & V>(v, id, hashRecordEvent)
 }
 
 export interface RepoView {
+  $type?: 'tools.ozone.moderation.defs#repoView'
   did: string
   handle: string
   email?: string
-  relatedRecords: {}[]
+  relatedRecords: { [_ in string]: unknown }[]
   indexedAt: string
   moderation: Moderation
   invitedBy?: ComAtprotoServerDefs.InviteCode
@@ -662,26 +597,24 @@ export interface RepoView {
   inviteNote?: string
   deactivatedAt?: string
   threatSignatures?: ComAtprotoAdminDefs.ThreatSignature[]
-  [k: string]: unknown
 }
 
-export function isRepoView(v: unknown): v is RepoView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#repoView'
-  )
+const hashRepoView = 'repoView'
+
+export function isRepoView<V>(v: V) {
+  return is$typed(v, id, hashRepoView)
 }
 
-export function validateRepoView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#repoView', v)
+export function validateRepoView<V>(v: V) {
+  return validate<RepoView & V>(v, id, hashRepoView)
 }
 
 export interface RepoViewDetail {
+  $type?: 'tools.ozone.moderation.defs#repoViewDetail'
   did: string
   handle: string
   email?: string
-  relatedRecords: {}[]
+  relatedRecords: { [_ in string]: unknown }[]
   indexedAt: string
   moderation: ModerationDetail
   labels?: ComAtprotoLabelDefs.Label[]
@@ -692,199 +625,176 @@ export interface RepoViewDetail {
   emailConfirmedAt?: string
   deactivatedAt?: string
   threatSignatures?: ComAtprotoAdminDefs.ThreatSignature[]
-  [k: string]: unknown
 }
 
-export function isRepoViewDetail(v: unknown): v is RepoViewDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#repoViewDetail'
-  )
+const hashRepoViewDetail = 'repoViewDetail'
+
+export function isRepoViewDetail<V>(v: V) {
+  return is$typed(v, id, hashRepoViewDetail)
 }
 
-export function validateRepoViewDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#repoViewDetail', v)
+export function validateRepoViewDetail<V>(v: V) {
+  return validate<RepoViewDetail & V>(v, id, hashRepoViewDetail)
 }
 
 export interface RepoViewNotFound {
+  $type?: 'tools.ozone.moderation.defs#repoViewNotFound'
   did: string
-  [k: string]: unknown
 }
 
-export function isRepoViewNotFound(v: unknown): v is RepoViewNotFound {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#repoViewNotFound'
-  )
+const hashRepoViewNotFound = 'repoViewNotFound'
+
+export function isRepoViewNotFound<V>(v: V) {
+  return is$typed(v, id, hashRepoViewNotFound)
 }
 
-export function validateRepoViewNotFound(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#repoViewNotFound', v)
+export function validateRepoViewNotFound<V>(v: V) {
+  return validate<RepoViewNotFound & V>(v, id, hashRepoViewNotFound)
 }
 
 export interface RecordView {
+  $type?: 'tools.ozone.moderation.defs#recordView'
   uri: string
   cid: string
-  value: {}
+  value: { [_ in string]: unknown }
   blobCids: string[]
   indexedAt: string
   moderation: Moderation
   repo: RepoView
-  [k: string]: unknown
 }
 
-export function isRecordView(v: unknown): v is RecordView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordView'
-  )
+const hashRecordView = 'recordView'
+
+export function isRecordView<V>(v: V) {
+  return is$typed(v, id, hashRecordView)
 }
 
-export function validateRecordView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordView', v)
+export function validateRecordView<V>(v: V) {
+  return validate<RecordView & V>(v, id, hashRecordView)
 }
 
 export interface RecordViewDetail {
+  $type?: 'tools.ozone.moderation.defs#recordViewDetail'
   uri: string
   cid: string
-  value: {}
+  value: { [_ in string]: unknown }
   blobs: BlobView[]
   labels?: ComAtprotoLabelDefs.Label[]
   indexedAt: string
   moderation: ModerationDetail
   repo: RepoView
-  [k: string]: unknown
 }
 
-export function isRecordViewDetail(v: unknown): v is RecordViewDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordViewDetail'
-  )
+const hashRecordViewDetail = 'recordViewDetail'
+
+export function isRecordViewDetail<V>(v: V) {
+  return is$typed(v, id, hashRecordViewDetail)
 }
 
-export function validateRecordViewDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordViewDetail', v)
+export function validateRecordViewDetail<V>(v: V) {
+  return validate<RecordViewDetail & V>(v, id, hashRecordViewDetail)
 }
 
 export interface RecordViewNotFound {
+  $type?: 'tools.ozone.moderation.defs#recordViewNotFound'
   uri: string
-  [k: string]: unknown
 }
 
-export function isRecordViewNotFound(v: unknown): v is RecordViewNotFound {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordViewNotFound'
-  )
+const hashRecordViewNotFound = 'recordViewNotFound'
+
+export function isRecordViewNotFound<V>(v: V) {
+  return is$typed(v, id, hashRecordViewNotFound)
 }
 
-export function validateRecordViewNotFound(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordViewNotFound', v)
+export function validateRecordViewNotFound<V>(v: V) {
+  return validate<RecordViewNotFound & V>(v, id, hashRecordViewNotFound)
 }
 
 export interface Moderation {
+  $type?: 'tools.ozone.moderation.defs#moderation'
   subjectStatus?: SubjectStatusView
-  [k: string]: unknown
 }
 
-export function isModeration(v: unknown): v is Moderation {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#moderation'
-  )
+const hashModeration = 'moderation'
+
+export function isModeration<V>(v: V) {
+  return is$typed(v, id, hashModeration)
 }
 
-export function validateModeration(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#moderation', v)
+export function validateModeration<V>(v: V) {
+  return validate<Moderation & V>(v, id, hashModeration)
 }
 
 export interface ModerationDetail {
+  $type?: 'tools.ozone.moderation.defs#moderationDetail'
   subjectStatus?: SubjectStatusView
-  [k: string]: unknown
 }
 
-export function isModerationDetail(v: unknown): v is ModerationDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#moderationDetail'
-  )
+const hashModerationDetail = 'moderationDetail'
+
+export function isModerationDetail<V>(v: V) {
+  return is$typed(v, id, hashModerationDetail)
 }
 
-export function validateModerationDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#moderationDetail', v)
+export function validateModerationDetail<V>(v: V) {
+  return validate<ModerationDetail & V>(v, id, hashModerationDetail)
 }
 
 export interface BlobView {
+  $type?: 'tools.ozone.moderation.defs#blobView'
   cid: string
   mimeType: string
   size: number
   createdAt: string
-  details?:
-    | ImageDetails
-    | VideoDetails
-    | { $type: string; [k: string]: unknown }
+  details?: $Typed<ImageDetails> | $Typed<VideoDetails> | { $type: string }
   moderation?: Moderation
-  [k: string]: unknown
 }
 
-export function isBlobView(v: unknown): v is BlobView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#blobView'
-  )
+const hashBlobView = 'blobView'
+
+export function isBlobView<V>(v: V) {
+  return is$typed(v, id, hashBlobView)
 }
 
-export function validateBlobView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#blobView', v)
+export function validateBlobView<V>(v: V) {
+  return validate<BlobView & V>(v, id, hashBlobView)
 }
 
 export interface ImageDetails {
+  $type?: 'tools.ozone.moderation.defs#imageDetails'
   width: number
   height: number
-  [k: string]: unknown
 }
 
-export function isImageDetails(v: unknown): v is ImageDetails {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#imageDetails'
-  )
+const hashImageDetails = 'imageDetails'
+
+export function isImageDetails<V>(v: V) {
+  return is$typed(v, id, hashImageDetails)
 }
 
-export function validateImageDetails(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#imageDetails', v)
+export function validateImageDetails<V>(v: V) {
+  return validate<ImageDetails & V>(v, id, hashImageDetails)
 }
 
 export interface VideoDetails {
+  $type?: 'tools.ozone.moderation.defs#videoDetails'
   width: number
   height: number
   length: number
-  [k: string]: unknown
 }
 
-export function isVideoDetails(v: unknown): v is VideoDetails {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#videoDetails'
-  )
+const hashVideoDetails = 'videoDetails'
+
+export function isVideoDetails<V>(v: V) {
+  return is$typed(v, id, hashVideoDetails)
 }
 
-export function validateVideoDetails(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#videoDetails', v)
+export function validateVideoDetails<V>(v: V) {
+  return validate<VideoDetails & V>(v, id, hashVideoDetails)
 }
 
 export interface AccountHosting {
+  $type?: 'tools.ozone.moderation.defs#accountHosting'
   status:
     | 'takendown'
     | 'suspended'
@@ -897,37 +807,32 @@ export interface AccountHosting {
   deletedAt?: string
   deactivatedAt?: string
   reactivatedAt?: string
-  [k: string]: unknown
 }
 
-export function isAccountHosting(v: unknown): v is AccountHosting {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#accountHosting'
-  )
+const hashAccountHosting = 'accountHosting'
+
+export function isAccountHosting<V>(v: V) {
+  return is$typed(v, id, hashAccountHosting)
 }
 
-export function validateAccountHosting(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#accountHosting', v)
+export function validateAccountHosting<V>(v: V) {
+  return validate<AccountHosting & V>(v, id, hashAccountHosting)
 }
 
 export interface RecordHosting {
+  $type?: 'tools.ozone.moderation.defs#recordHosting'
   status: 'deleted' | 'unknown' | (string & {})
   updatedAt?: string
   createdAt?: string
   deletedAt?: string
-  [k: string]: unknown
 }
 
-export function isRecordHosting(v: unknown): v is RecordHosting {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordHosting'
-  )
+const hashRecordHosting = 'recordHosting'
+
+export function isRecordHosting<V>(v: V) {
+  return is$typed(v, id, hashRecordHosting)
 }
 
-export function validateRecordHosting(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordHosting', v)
+export function validateRecordHosting<V>(v: V) {
+  return validate<RecordHosting & V>(v, id, hashRecordHosting)
 }
diff --git a/packages/api/src/client/types/tools/ozone/moderation/emitEvent.ts b/packages/api/src/client/types/tools/ozone/moderation/emitEvent.ts
index bea857d0f0c..e503cab4773 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/emitEvent.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/emitEvent.ts
@@ -3,43 +3,46 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ToolsOzoneModerationDefs from './defs'
-import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneModerationDefs from './defs.js'
+import type * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs.js'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.emitEvent'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   event:
-    | ToolsOzoneModerationDefs.ModEventTakedown
-    | ToolsOzoneModerationDefs.ModEventAcknowledge
-    | ToolsOzoneModerationDefs.ModEventEscalate
-    | ToolsOzoneModerationDefs.ModEventComment
-    | ToolsOzoneModerationDefs.ModEventLabel
-    | ToolsOzoneModerationDefs.ModEventReport
-    | ToolsOzoneModerationDefs.ModEventMute
-    | ToolsOzoneModerationDefs.ModEventUnmute
-    | ToolsOzoneModerationDefs.ModEventMuteReporter
-    | ToolsOzoneModerationDefs.ModEventUnmuteReporter
-    | ToolsOzoneModerationDefs.ModEventReverseTakedown
-    | ToolsOzoneModerationDefs.ModEventResolveAppeal
-    | ToolsOzoneModerationDefs.ModEventEmail
-    | ToolsOzoneModerationDefs.ModEventTag
-    | ToolsOzoneModerationDefs.AccountEvent
-    | ToolsOzoneModerationDefs.IdentityEvent
-    | ToolsOzoneModerationDefs.RecordEvent
-    | ToolsOzoneModerationDefs.ModEventPriorityScore
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ToolsOzoneModerationDefs.ModEventTakedown>
+    | $Typed<ToolsOzoneModerationDefs.ModEventAcknowledge>
+    | $Typed<ToolsOzoneModerationDefs.ModEventEscalate>
+    | $Typed<ToolsOzoneModerationDefs.ModEventComment>
+    | $Typed<ToolsOzoneModerationDefs.ModEventLabel>
+    | $Typed<ToolsOzoneModerationDefs.ModEventReport>
+    | $Typed<ToolsOzoneModerationDefs.ModEventMute>
+    | $Typed<ToolsOzoneModerationDefs.ModEventUnmute>
+    | $Typed<ToolsOzoneModerationDefs.ModEventMuteReporter>
+    | $Typed<ToolsOzoneModerationDefs.ModEventUnmuteReporter>
+    | $Typed<ToolsOzoneModerationDefs.ModEventReverseTakedown>
+    | $Typed<ToolsOzoneModerationDefs.ModEventResolveAppeal>
+    | $Typed<ToolsOzoneModerationDefs.ModEventEmail>
+    | $Typed<ToolsOzoneModerationDefs.ModEventTag>
+    | $Typed<ToolsOzoneModerationDefs.AccountEvent>
+    | $Typed<ToolsOzoneModerationDefs.IdentityEvent>
+    | $Typed<ToolsOzoneModerationDefs.RecordEvent>
+    | $Typed<ToolsOzoneModerationDefs.ModEventPriorityScore>
+    | { $type: string }
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | { $type: string }
   subjectBlobCids?: string[]
   createdBy: string
-  [k: string]: unknown
 }
 
 export type OutputSchema = ToolsOzoneModerationDefs.ModEventView
diff --git a/packages/api/src/client/types/tools/ozone/moderation/getEvent.ts b/packages/api/src/client/types/tools/ozone/moderation/getEvent.ts
index 7b1206d339f..f85bd75535c 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/getEvent.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/getEvent.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ToolsOzoneModerationDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneModerationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.getEvent'
 
 export interface QueryParams {
   id: number
diff --git a/packages/api/src/client/types/tools/ozone/moderation/getRecord.ts b/packages/api/src/client/types/tools/ozone/moderation/getRecord.ts
index fe1fc0b32c0..23e0ff4bf5e 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/getRecord.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/getRecord.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ToolsOzoneModerationDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneModerationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.getRecord'
 
 export interface QueryParams {
   uri: string
diff --git a/packages/api/src/client/types/tools/ozone/moderation/getRecords.ts b/packages/api/src/client/types/tools/ozone/moderation/getRecords.ts
index 1d7b8d669b6..3b23baa590c 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/getRecords.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/getRecords.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ToolsOzoneModerationDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneModerationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.getRecords'
 
 export interface QueryParams {
   uris: string[]
@@ -16,11 +20,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   records: (
-    | ToolsOzoneModerationDefs.RecordViewDetail
-    | ToolsOzoneModerationDefs.RecordViewNotFound
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ToolsOzoneModerationDefs.RecordViewDetail>
+    | $Typed<ToolsOzoneModerationDefs.RecordViewNotFound>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/moderation/getRepo.ts b/packages/api/src/client/types/tools/ozone/moderation/getRepo.ts
index ce26b50acf1..17d505b74a7 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/getRepo.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/getRepo.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ToolsOzoneModerationDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneModerationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.getRepo'
 
 export interface QueryParams {
   did: string
diff --git a/packages/api/src/client/types/tools/ozone/moderation/getRepos.ts b/packages/api/src/client/types/tools/ozone/moderation/getRepos.ts
index 17de1d06b35..554905127f5 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/getRepos.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/getRepos.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ToolsOzoneModerationDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneModerationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.getRepos'
 
 export interface QueryParams {
   dids: string[]
@@ -16,11 +20,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   repos: (
-    | ToolsOzoneModerationDefs.RepoViewDetail
-    | ToolsOzoneModerationDefs.RepoViewNotFound
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ToolsOzoneModerationDefs.RepoViewDetail>
+    | $Typed<ToolsOzoneModerationDefs.RepoViewNotFound>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/moderation/queryEvents.ts b/packages/api/src/client/types/tools/ozone/moderation/queryEvents.ts
index c65581b4ebc..e5d53ce4f56 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/queryEvents.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/queryEvents.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ToolsOzoneModerationDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneModerationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.queryEvents'
 
 export interface QueryParams {
   /** The types of events (fully qualified string in the format of tools.ozone.moderation.defs#modEvent<name>) to filter by. If not specified, all events are returned. */
@@ -48,7 +52,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   events: ToolsOzoneModerationDefs.ModEventView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/moderation/queryStatuses.ts b/packages/api/src/client/types/tools/ozone/moderation/queryStatuses.ts
index 14626255fbf..ff7eddb37bc 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/queryStatuses.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/queryStatuses.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ToolsOzoneModerationDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneModerationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.queryStatuses'
 
 export interface QueryParams {
   /** Number of queues being used by moderators. Subjects will be split among all queues. */
@@ -82,7 +86,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   subjectStatuses: ToolsOzoneModerationDefs.SubjectStatusView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/moderation/searchRepos.ts b/packages/api/src/client/types/tools/ozone/moderation/searchRepos.ts
index 060b2b96331..a16cfa53e62 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/searchRepos.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/searchRepos.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ToolsOzoneModerationDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneModerationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.searchRepos'
 
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead */
@@ -21,7 +25,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   repos: ToolsOzoneModerationDefs.RepoView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/server/getConfig.ts b/packages/api/src/client/types/tools/ozone/server/getConfig.ts
index d0127531450..6612f994151 100644
--- a/packages/api/src/client/types/tools/ozone/server/getConfig.ts
+++ b/packages/api/src/client/types/tools/ozone/server/getConfig.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.server.getConfig'
 
 export interface QueryParams {}
 
@@ -17,7 +21,6 @@ export interface OutputSchema {
   blobDivert?: ServiceConfig
   chat?: ServiceConfig
   viewer?: ViewerConfig
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -36,39 +39,35 @@ export function toKnownErr(e: any) {
 }
 
 export interface ServiceConfig {
+  $type?: 'tools.ozone.server.getConfig#serviceConfig'
   url?: string
-  [k: string]: unknown
 }
 
-export function isServiceConfig(v: unknown): v is ServiceConfig {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.server.getConfig#serviceConfig'
-  )
+const hashServiceConfig = 'serviceConfig'
+
+export function isServiceConfig<V>(v: V) {
+  return is$typed(v, id, hashServiceConfig)
 }
 
-export function validateServiceConfig(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.server.getConfig#serviceConfig', v)
+export function validateServiceConfig<V>(v: V) {
+  return validate<ServiceConfig & V>(v, id, hashServiceConfig)
 }
 
 export interface ViewerConfig {
+  $type?: 'tools.ozone.server.getConfig#viewerConfig'
   role?:
     | 'tools.ozone.team.defs#roleAdmin'
     | 'tools.ozone.team.defs#roleModerator'
     | 'tools.ozone.team.defs#roleTriage'
     | (string & {})
-  [k: string]: unknown
 }
 
-export function isViewerConfig(v: unknown): v is ViewerConfig {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.server.getConfig#viewerConfig'
-  )
+const hashViewerConfig = 'viewerConfig'
+
+export function isViewerConfig<V>(v: V) {
+  return is$typed(v, id, hashViewerConfig)
 }
 
-export function validateViewerConfig(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.server.getConfig#viewerConfig', v)
+export function validateViewerConfig<V>(v: V) {
+  return validate<ViewerConfig & V>(v, id, hashViewerConfig)
 }
diff --git a/packages/api/src/client/types/tools/ozone/set/addValues.ts b/packages/api/src/client/types/tools/ozone/set/addValues.ts
index 04379b2e5c3..a96bf3738ac 100644
--- a/packages/api/src/client/types/tools/ozone/set/addValues.ts
+++ b/packages/api/src/client/types/tools/ozone/set/addValues.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.set.addValues'
 
 export interface QueryParams {}
 
@@ -14,7 +18,6 @@ export interface InputSchema {
   name: string
   /** Array of string values to add to the set */
   values: string[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/set/defs.ts b/packages/api/src/client/types/tools/ozone/set/defs.ts
index d6823eb9b84..ac1db2d6ada 100644
--- a/packages/api/src/client/types/tools/ozone/set/defs.ts
+++ b/packages/api/src/client/types/tools/ozone/set/defs.ts
@@ -2,43 +2,45 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.set.defs'
 
 export interface Set {
+  $type?: 'tools.ozone.set.defs#set'
   name: string
   description?: string
-  [k: string]: unknown
 }
 
-export function isSet(v: unknown): v is Set {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'tools.ozone.set.defs#set'
-  )
+const hashSet = 'set'
+
+export function isSet<V>(v: V) {
+  return is$typed(v, id, hashSet)
 }
 
-export function validateSet(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.set.defs#set', v)
+export function validateSet<V>(v: V) {
+  return validate<Set & V>(v, id, hashSet)
 }
 
 export interface SetView {
+  $type?: 'tools.ozone.set.defs#setView'
   name: string
   description?: string
   setSize: number
   createdAt: string
   updatedAt: string
-  [k: string]: unknown
 }
 
-export function isSetView(v: unknown): v is SetView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.set.defs#setView'
-  )
+const hashSetView = 'setView'
+
+export function isSetView<V>(v: V) {
+  return is$typed(v, id, hashSetView)
 }
 
-export function validateSetView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.set.defs#setView', v)
+export function validateSetView<V>(v: V) {
+  return validate<SetView & V>(v, id, hashSetView)
 }
diff --git a/packages/api/src/client/types/tools/ozone/set/deleteSet.ts b/packages/api/src/client/types/tools/ozone/set/deleteSet.ts
index 52988ca54c9..6bb71242169 100644
--- a/packages/api/src/client/types/tools/ozone/set/deleteSet.ts
+++ b/packages/api/src/client/types/tools/ozone/set/deleteSet.ts
@@ -3,21 +3,22 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.set.deleteSet'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   /** Name of the set to delete */
   name: string
-  [k: string]: unknown
 }
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export interface CallOptions {
   signal?: AbortSignal
diff --git a/packages/api/src/client/types/tools/ozone/set/deleteValues.ts b/packages/api/src/client/types/tools/ozone/set/deleteValues.ts
index 71845188b04..8b20c11f320 100644
--- a/packages/api/src/client/types/tools/ozone/set/deleteValues.ts
+++ b/packages/api/src/client/types/tools/ozone/set/deleteValues.ts
@@ -3,9 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.set.deleteValues'
 
 export interface QueryParams {}
 
@@ -14,7 +18,6 @@ export interface InputSchema {
   name: string
   /** Array of string values to delete from the set */
   values: string[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/set/getValues.ts b/packages/api/src/client/types/tools/ozone/set/getValues.ts
index e8b848a5ef7..0cd50b80aad 100644
--- a/packages/api/src/client/types/tools/ozone/set/getValues.ts
+++ b/packages/api/src/client/types/tools/ozone/set/getValues.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ToolsOzoneSetDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneSetDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.set.getValues'
 
 export interface QueryParams {
   name: string
@@ -20,7 +24,6 @@ export interface OutputSchema {
   set: ToolsOzoneSetDefs.SetView
   values: string[]
   cursor?: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/set/querySets.ts b/packages/api/src/client/types/tools/ozone/set/querySets.ts
index dcb19d52890..a979049c492 100644
--- a/packages/api/src/client/types/tools/ozone/set/querySets.ts
+++ b/packages/api/src/client/types/tools/ozone/set/querySets.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ToolsOzoneSetDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneSetDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.set.querySets'
 
 export interface QueryParams {
   limit?: number
@@ -22,7 +26,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   sets: ToolsOzoneSetDefs.SetView[]
   cursor?: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/set/upsertSet.ts b/packages/api/src/client/types/tools/ozone/set/upsertSet.ts
index 3489fe4cff1..6e1456c5874 100644
--- a/packages/api/src/client/types/tools/ozone/set/upsertSet.ts
+++ b/packages/api/src/client/types/tools/ozone/set/upsertSet.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ToolsOzoneSetDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneSetDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.set.upsertSet'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/tools/ozone/setting/defs.ts b/packages/api/src/client/types/tools/ozone/setting/defs.ts
index 0193b78b811..a17c778d26c 100644
--- a/packages/api/src/client/types/tools/ozone/setting/defs.ts
+++ b/packages/api/src/client/types/tools/ozone/setting/defs.ts
@@ -2,14 +2,19 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.setting.defs'
 
 export interface Option {
+  $type?: 'tools.ozone.setting.defs#option'
   key: string
   did: string
-  value: {}
+  value: { [_ in string]: unknown }
   description?: string
   createdAt?: string
   updatedAt?: string
@@ -21,17 +26,14 @@ export interface Option {
   scope: 'instance' | 'personal' | (string & {})
   createdBy: string
   lastUpdatedBy: string
-  [k: string]: unknown
 }
 
-export function isOption(v: unknown): v is Option {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.setting.defs#option'
-  )
+const hashOption = 'option'
+
+export function isOption<V>(v: V) {
+  return is$typed(v, id, hashOption)
 }
 
-export function validateOption(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.setting.defs#option', v)
+export function validateOption<V>(v: V) {
+  return validate<Option & V>(v, id, hashOption)
 }
diff --git a/packages/api/src/client/types/tools/ozone/setting/listOptions.ts b/packages/api/src/client/types/tools/ozone/setting/listOptions.ts
index d4a91230440..b1661518913 100644
--- a/packages/api/src/client/types/tools/ozone/setting/listOptions.ts
+++ b/packages/api/src/client/types/tools/ozone/setting/listOptions.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ToolsOzoneSettingDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneSettingDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.setting.listOptions'
 
 export interface QueryParams {
   limit?: number
@@ -23,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   options: ToolsOzoneSettingDefs.Option[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/setting/removeOptions.ts b/packages/api/src/client/types/tools/ozone/setting/removeOptions.ts
index 2073a3e298a..e796210c828 100644
--- a/packages/api/src/client/types/tools/ozone/setting/removeOptions.ts
+++ b/packages/api/src/client/types/tools/ozone/setting/removeOptions.ts
@@ -3,21 +3,22 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.setting.removeOptions'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   keys: string[]
   scope: 'instance' | 'personal' | (string & {})
-  [k: string]: unknown
 }
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export interface CallOptions {
   signal?: AbortSignal
diff --git a/packages/api/src/client/types/tools/ozone/setting/upsertOption.ts b/packages/api/src/client/types/tools/ozone/setting/upsertOption.ts
index b37e2d790b5..de058c47434 100644
--- a/packages/api/src/client/types/tools/ozone/setting/upsertOption.ts
+++ b/packages/api/src/client/types/tools/ozone/setting/upsertOption.ts
@@ -3,29 +3,31 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ToolsOzoneSettingDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneSettingDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.setting.upsertOption'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   key: string
   scope: 'instance' | 'personal' | (string & {})
-  value: {}
+  value: { [_ in string]: unknown }
   description?: string
   managerRole?:
     | 'tools.ozone.team.defs#roleModerator'
     | 'tools.ozone.team.defs#roleTriage'
     | 'tools.ozone.team.defs#roleAdmin'
     | (string & {})
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   option: ToolsOzoneSettingDefs.Option
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/signature/defs.ts b/packages/api/src/client/types/tools/ozone/signature/defs.ts
index 1ab8f12a45b..bc862a6f312 100644
--- a/packages/api/src/client/types/tools/ozone/signature/defs.ts
+++ b/packages/api/src/client/types/tools/ozone/signature/defs.ts
@@ -2,24 +2,26 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.signature.defs'
 
 export interface SigDetail {
+  $type?: 'tools.ozone.signature.defs#sigDetail'
   property: string
   value: string
-  [k: string]: unknown
 }
 
-export function isSigDetail(v: unknown): v is SigDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.signature.defs#sigDetail'
-  )
+const hashSigDetail = 'sigDetail'
+
+export function isSigDetail<V>(v: V) {
+  return is$typed(v, id, hashSigDetail)
 }
 
-export function validateSigDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.signature.defs#sigDetail', v)
+export function validateSigDetail<V>(v: V) {
+  return validate<SigDetail & V>(v, id, hashSigDetail)
 }
diff --git a/packages/api/src/client/types/tools/ozone/signature/findCorrelation.ts b/packages/api/src/client/types/tools/ozone/signature/findCorrelation.ts
index f04a5c735d2..4736c75378f 100644
--- a/packages/api/src/client/types/tools/ozone/signature/findCorrelation.ts
+++ b/packages/api/src/client/types/tools/ozone/signature/findCorrelation.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ToolsOzoneSignatureDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneSignatureDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.signature.findCorrelation'
 
 export interface QueryParams {
   dids: string[]
@@ -16,7 +20,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   details: ToolsOzoneSignatureDefs.SigDetail[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/signature/findRelatedAccounts.ts b/packages/api/src/client/types/tools/ozone/signature/findRelatedAccounts.ts
index b817bbef60e..f923bd6f0c3 100644
--- a/packages/api/src/client/types/tools/ozone/signature/findRelatedAccounts.ts
+++ b/packages/api/src/client/types/tools/ozone/signature/findRelatedAccounts.ts
@@ -3,11 +3,15 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
-import * as ToolsOzoneSignatureDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs.js'
+import type * as ToolsOzoneSignatureDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.signature.findRelatedAccounts'
 
 export interface QueryParams {
   did: string
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   accounts: RelatedAccount[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
@@ -39,22 +42,17 @@ export function toKnownErr(e: any) {
 }
 
 export interface RelatedAccount {
+  $type?: 'tools.ozone.signature.findRelatedAccounts#relatedAccount'
   account: ComAtprotoAdminDefs.AccountView
   similarities?: ToolsOzoneSignatureDefs.SigDetail[]
-  [k: string]: unknown
 }
 
-export function isRelatedAccount(v: unknown): v is RelatedAccount {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.signature.findRelatedAccounts#relatedAccount'
-  )
+const hashRelatedAccount = 'relatedAccount'
+
+export function isRelatedAccount<V>(v: V) {
+  return is$typed(v, id, hashRelatedAccount)
 }
 
-export function validateRelatedAccount(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'tools.ozone.signature.findRelatedAccounts#relatedAccount',
-    v,
-  )
+export function validateRelatedAccount<V>(v: V) {
+  return validate<RelatedAccount & V>(v, id, hashRelatedAccount)
 }
diff --git a/packages/api/src/client/types/tools/ozone/signature/searchAccounts.ts b/packages/api/src/client/types/tools/ozone/signature/searchAccounts.ts
index 70e37b77458..3fceffaeb59 100644
--- a/packages/api/src/client/types/tools/ozone/signature/searchAccounts.ts
+++ b/packages/api/src/client/types/tools/ozone/signature/searchAccounts.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.signature.searchAccounts'
 
 export interface QueryParams {
   values: string[]
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   accounts: ComAtprotoAdminDefs.AccountView[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/team/addMember.ts b/packages/api/src/client/types/tools/ozone/team/addMember.ts
index c323687ff0a..bcbb4bc0ae0 100644
--- a/packages/api/src/client/types/tools/ozone/team/addMember.ts
+++ b/packages/api/src/client/types/tools/ozone/team/addMember.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ToolsOzoneTeamDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneTeamDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.team.addMember'
 
 export interface QueryParams {}
 
@@ -17,7 +21,6 @@ export interface InputSchema {
     | 'tools.ozone.team.defs#roleModerator'
     | 'tools.ozone.team.defs#roleTriage'
     | (string & {})
-  [k: string]: unknown
 }
 
 export type OutputSchema = ToolsOzoneTeamDefs.Member
diff --git a/packages/api/src/client/types/tools/ozone/team/defs.ts b/packages/api/src/client/types/tools/ozone/team/defs.ts
index 78fb7989264..19c81550218 100644
--- a/packages/api/src/client/types/tools/ozone/team/defs.ts
+++ b/packages/api/src/client/types/tools/ozone/team/defs.ts
@@ -2,12 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../../../app/bsky/actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.team.defs'
 
 export interface Member {
+  $type?: 'tools.ozone.team.defs#member'
   did: string
   disabled?: boolean
   profile?: AppBskyActorDefs.ProfileViewDetailed
@@ -19,24 +24,21 @@ export interface Member {
     | 'lex:tools.ozone.team.defs#roleModerator'
     | 'lex:tools.ozone.team.defs#roleTriage'
     | (string & {})
-  [k: string]: unknown
 }
 
-export function isMember(v: unknown): v is Member {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.team.defs#member'
-  )
+const hashMember = 'member'
+
+export function isMember<V>(v: V) {
+  return is$typed(v, id, hashMember)
 }
 
-export function validateMember(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.team.defs#member', v)
+export function validateMember<V>(v: V) {
+  return validate<Member & V>(v, id, hashMember)
 }
 
 /** Admin role. Highest level of access, can perform all actions. */
-export const ROLEADMIN = 'tools.ozone.team.defs#roleAdmin'
+export const ROLEADMIN = `${id}#roleAdmin`
 /** Moderator role. Can perform most actions. */
-export const ROLEMODERATOR = 'tools.ozone.team.defs#roleModerator'
+export const ROLEMODERATOR = `${id}#roleModerator`
 /** Triage role. Mostly intended for monitoring and escalating issues. */
-export const ROLETRIAGE = 'tools.ozone.team.defs#roleTriage'
+export const ROLETRIAGE = `${id}#roleTriage`
diff --git a/packages/api/src/client/types/tools/ozone/team/deleteMember.ts b/packages/api/src/client/types/tools/ozone/team/deleteMember.ts
index b456035e5d8..5b0a8740212 100644
--- a/packages/api/src/client/types/tools/ozone/team/deleteMember.ts
+++ b/packages/api/src/client/types/tools/ozone/team/deleteMember.ts
@@ -3,15 +3,18 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.team.deleteMember'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   did: string
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/team/listMembers.ts b/packages/api/src/client/types/tools/ozone/team/listMembers.ts
index a0275d0e838..0bbdffcc38d 100644
--- a/packages/api/src/client/types/tools/ozone/team/listMembers.ts
+++ b/packages/api/src/client/types/tools/ozone/team/listMembers.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ToolsOzoneTeamDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneTeamDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.team.listMembers'
 
 export interface QueryParams {
   limit?: number
@@ -18,7 +22,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   members: ToolsOzoneTeamDefs.Member[]
-  [k: string]: unknown
 }
 
 export interface CallOptions {
diff --git a/packages/api/src/client/types/tools/ozone/team/updateMember.ts b/packages/api/src/client/types/tools/ozone/team/updateMember.ts
index 71a96d12fa2..b3c87b80dad 100644
--- a/packages/api/src/client/types/tools/ozone/team/updateMember.ts
+++ b/packages/api/src/client/types/tools/ozone/team/updateMember.ts
@@ -3,10 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as ToolsOzoneTeamDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneTeamDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.team.updateMember'
 
 export interface QueryParams {}
 
@@ -18,7 +22,6 @@ export interface InputSchema {
     | 'tools.ozone.team.defs#roleModerator'
     | 'tools.ozone.team.defs#roleTriage'
     | (string & {})
-  [k: string]: unknown
 }
 
 export type OutputSchema = ToolsOzoneTeamDefs.Member
diff --git a/packages/api/src/client/util.ts b/packages/api/src/client/util.ts
index d7e70440d6e..7f88b6a6ef3 100644
--- a/packages/api/src/client/util.ts
+++ b/packages/api/src/client/util.ts
@@ -1,13 +1,82 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
-export function isObj(v: unknown): v is Record<string, unknown> {
-  return typeof v === 'object' && v !== null
+
+import { 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 function hasProp<K extends PropertyKey>(
-  data: object,
-  prop: K,
-): data is Record<K, unknown> {
-  return prop in data
+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/packages/api/src/index.ts b/packages/api/src/index.ts
index 8ced8afe4ea..b5990540aab 100644
--- a/packages/api/src/index.ts
+++ b/packages/api/src/index.ts
@@ -15,6 +15,8 @@ export * from './const'
 export * from './util'
 export * from './client'
 export { schemas } from './client/lexicons'
+export type { $Typed, Un$Typed } from './client/util'
+export { asPredicate } from './client/util'
 export * from './rich-text/rich-text'
 export * from './rich-text/sanitization'
 export * from './rich-text/unicode'
diff --git a/packages/api/src/mocker.ts b/packages/api/src/mocker.ts
index 905268de8d4..1d42142b06b 100644
--- a/packages/api/src/mocker.ts
+++ b/packages/api/src/mocker.ts
@@ -7,6 +7,7 @@ import {
   AppBskyNotificationListNotifications,
   ComAtprotoLabelDefs,
 } from './client'
+import { $Typed, Un$Typed } from './client/util'
 
 const FAKE_CID = 'bafyreiclp443lavogvhj3d2ob2cxbfuscni2k5jk7bebjzg7khl3esabwq'
 
@@ -21,7 +22,7 @@ export const mock = {
     facets?: AppBskyFeedPost.Record['facets']
     reply?: AppBskyFeedPost.ReplyRef
     embed?: AppBskyFeedPost.Record['embed']
-  }): AppBskyFeedPost.Record {
+  }): $Typed<AppBskyFeedPost.Record> {
     return {
       $type: 'app.bsky.feed.post',
       text,
@@ -51,7 +52,7 @@ export const mock = {
     likeCount?: number
     viewer?: AppBskyFeedDefs.ViewerState
     labels?: ComAtprotoLabelDefs.Label[]
-  }): AppBskyFeedDefs.PostView {
+  }): $Typed<AppBskyFeedDefs.PostView> {
     return {
       $type: 'app.bsky.feed.defs#postView',
       uri: `at://${author.did}/app.bsky.feed.post/fake`,
@@ -76,7 +77,7 @@ export const mock = {
     record: AppBskyFeedPost.Record
     author: AppBskyActorDefs.ProfileViewBasic
     labels?: ComAtprotoLabelDefs.Label[]
-  }): AppBskyEmbedRecord.View {
+  }): $Typed<AppBskyEmbedRecord.View> {
     return {
       $type: 'app.bsky.embed.record#view',
       record: {
@@ -108,7 +109,8 @@ export const mock = {
       did: `did:web:${handle}`,
       handle,
       displayName,
-      description, // technically not in ProfileViewBasic but useful in some cases
+      // @ts-expect-error technically not in ProfileViewBasic but useful in some cases
+      description,
       viewer,
       labels,
     }
@@ -158,7 +160,7 @@ export const mock = {
     labels,
   }: {
     record: AppBskyFeedPost.Record
-    author: AppBskyActorDefs.ProfileViewBasic
+    author: Un$Typed<AppBskyActorDefs.ProfileViewBasic>
     labels?: ComAtprotoLabelDefs.Label[]
   }): AppBskyNotificationListNotifications.Notification {
     return {
@@ -179,7 +181,7 @@ export const mock = {
     subjectDid,
     labels,
   }: {
-    author: AppBskyActorDefs.ProfileViewBasic
+    author: Un$Typed<AppBskyActorDefs.ProfileViewBasic>
     subjectDid: string
     labels?: ComAtprotoLabelDefs.Label[]
   }): AppBskyNotificationListNotifications.Notification {
diff --git a/packages/api/src/moderation/decision.ts b/packages/api/src/moderation/decision.ts
index bc33e100ca6..6f35f331479 100644
--- a/packages/api/src/moderation/decision.ts
+++ b/packages/api/src/moderation/decision.ts
@@ -32,9 +32,7 @@ export class ModerationDecision {
   static merge(
     ...decisions: (ModerationDecision | undefined)[]
   ): ModerationDecision {
-    const decisionsFiltered: ModerationDecision[] = decisions.filter(
-      (v) => !!v,
-    ) as ModerationDecision[]
+    const decisionsFiltered = decisions.filter((v) => v != null)
     const decision = new ModerationDecision()
     if (decisionsFiltered[0]) {
       decision.did = decisionsFiltered[0].did
diff --git a/packages/api/src/moderation/mutewords.ts b/packages/api/src/moderation/mutewords.ts
index 143e9c0bb52..f88a1af1cca 100644
--- a/packages/api/src/moderation/mutewords.ts
+++ b/packages/api/src/moderation/mutewords.ts
@@ -34,7 +34,7 @@ export function hasMutedWord({
   facets?: AppBskyRichtextFacet.Main[]
   outlineTags?: string[]
   languages?: string[]
-  actor?: AppBskyActorDefs.ProfileView
+  actor?: AppBskyActorDefs.ProfileView | AppBskyActorDefs.ProfileViewBasic
 }) {
   const exception = LANGUAGE_EXCEPTIONS.includes(languages?.[0] || '')
   const tags = ([] as string[])
diff --git a/packages/api/src/moderation/subjects/post.ts b/packages/api/src/moderation/subjects/post.ts
index 8d0b7c6db5b..e51e97f7364 100644
--- a/packages/api/src/moderation/subjects/post.ts
+++ b/packages/api/src/moderation/subjects/post.ts
@@ -6,6 +6,7 @@ import {
   AppBskyEmbedRecordWithMedia,
   AppBskyFeedPost,
 } from '../../client'
+import { $Typed } from '../../client/util'
 import { ModerationDecision } from '../decision'
 import { hasMutedWord } from '../mutewords'
 import { ModerationOpts, ModerationSubjectPost } from '../types'
@@ -15,6 +16,18 @@ import { decideProfile } from './profile'
 export function decidePost(
   subject: ModerationSubjectPost,
   opts: ModerationOpts,
+): ModerationDecision {
+  return ModerationDecision.merge(
+    decideSubject(subject, opts),
+    decideEmbed(subject.embed, opts)?.downgrade(),
+    decideAccount(subject.author, opts),
+    decideProfile(subject.author, opts),
+  )
+}
+
+function decideSubject(
+  subject: ModerationSubjectPost,
+  opts: ModerationOpts,
 ): ModerationDecision {
   const acc = new ModerationDecision()
 
@@ -30,35 +43,48 @@ export function decidePost(
     acc.addMutedWord(checkMutedWords(subject, opts.prefs.mutedWords))
   }
 
-  let embedAcc
-  if (subject.embed) {
-    if (AppBskyEmbedRecord.isViewRecord(subject.embed.record)) {
+  return acc
+}
+
+function decideEmbed(
+  embed:
+    | undefined
+    | $Typed<AppBskyEmbedRecord.View>
+    | $Typed<AppBskyEmbedRecordWithMedia.View>
+    | { $type: string },
+  opts: ModerationOpts,
+) {
+  if (embed) {
+    if (
+      (AppBskyEmbedRecord.isView(embed) ||
+        AppBskyEmbedRecordWithMedia.isView(embed)) &&
+      AppBskyEmbedRecord.isViewRecord(embed.record)
+    ) {
       // quote post
-      embedAcc = decideQuotedPost(subject.embed.record, opts)
+      return decideQuotedPost(embed.record, opts)
     } else if (
-      AppBskyEmbedRecordWithMedia.isView(subject.embed) &&
-      AppBskyEmbedRecord.isViewRecord(subject.embed.record.record)
+      AppBskyEmbedRecordWithMedia.isView(embed) &&
+      AppBskyEmbedRecord.isViewRecord(embed.record.record)
     ) {
       // quoted post with media
-      embedAcc = decideQuotedPost(subject.embed.record.record, opts)
-    } else if (AppBskyEmbedRecord.isViewBlocked(subject.embed.record)) {
+      return decideQuotedPost(embed.record.record, opts)
+    } else if (
+      (AppBskyEmbedRecord.isView(embed) ||
+        AppBskyEmbedRecordWithMedia.isView(embed)) &&
+      AppBskyEmbedRecord.isViewBlocked(embed.record)
+    ) {
       // blocked quote post
-      embedAcc = decideBlockedQuotedPost(subject.embed.record, opts)
+      return decideBlockedQuotedPost(embed.record, opts)
     } else if (
-      AppBskyEmbedRecordWithMedia.isView(subject.embed) &&
-      AppBskyEmbedRecord.isViewBlocked(subject.embed.record.record)
+      AppBskyEmbedRecordWithMedia.isView(embed) &&
+      AppBskyEmbedRecord.isViewBlocked(embed.record.record)
     ) {
       // blocked quoted post with media
-      embedAcc = decideBlockedQuotedPost(subject.embed.record.record, opts)
+      return decideBlockedQuotedPost(embed.record.record, opts)
     }
   }
 
-  return ModerationDecision.merge(
-    acc,
-    embedAcc?.downgrade(),
-    decideAccount(subject.author, opts),
-    decideProfile(subject.author, opts),
-  )
+  return undefined
 }
 
 function decideQuotedPost(
@@ -117,6 +143,7 @@ function checkHiddenPost(
   }
   if (subject.embed) {
     if (
+      AppBskyEmbedRecord.isView(subject.embed) &&
       AppBskyEmbedRecord.isViewRecord(subject.embed.record) &&
       hiddenPosts.includes(subject.embed.record.uri)
     ) {
@@ -144,31 +171,29 @@ function checkMutedWords(
   const postAuthor = subject.author
 
   if (AppBskyFeedPost.isRecord(subject.record)) {
+    const post = subject.record as AppBskyFeedPost.Record
     // post text
     if (
       hasMutedWord({
         mutedWords,
-        text: subject.record.text,
-        facets: subject.record.facets,
-        outlineTags: subject.record.tags,
-        languages: subject.record.langs,
+        text: post.text,
+        facets: post.facets,
+        outlineTags: post.tags,
+        languages: post.langs,
         actor: postAuthor,
       })
     ) {
       return true
     }
 
-    if (
-      subject.record.embed &&
-      AppBskyEmbedImages.isMain(subject.record.embed)
-    ) {
+    if (post.embed && AppBskyEmbedImages.isMain(post.embed)) {
       // post images
-      for (const image of subject.record.embed.images) {
+      for (const image of post.embed.images) {
         if (
           hasMutedWord({
             mutedWords,
             text: image.alt,
-            languages: subject.record.langs,
+            languages: post.langs,
             actor: postAuthor,
           })
         ) {
@@ -178,12 +203,17 @@ function checkMutedWords(
     }
   }
 
-  if (subject.embed) {
+  const { embed } = subject
+  if (embed) {
     // quote post
-    if (AppBskyEmbedRecord.isViewRecord(subject.embed.record)) {
-      if (AppBskyFeedPost.isRecord(subject.embed.record.value)) {
-        const embeddedPost = subject.embed.record.value
-        const embedAuthor = subject.embed.record.author
+    if (
+      (AppBskyEmbedRecord.isView(embed) ||
+        AppBskyEmbedRecordWithMedia.isView(embed)) &&
+      AppBskyEmbedRecord.isViewRecord(embed.record)
+    ) {
+      if (AppBskyFeedPost.isRecord(embed.record.value)) {
+        const embeddedPost = embed.record.value as AppBskyFeedPost.Record
+        const embedAuthor = embed.record.author
 
         // quoted post text
         if (
@@ -267,8 +297,8 @@ function checkMutedWords(
       }
     }
     // link card
-    else if (AppBskyEmbedExternal.isView(subject.embed)) {
-      const { external } = subject.embed
+    else if (AppBskyEmbedExternal.isView(embed)) {
+      const { external } = embed
       if (
         hasMutedWord({
           mutedWords,
@@ -282,14 +312,14 @@ function checkMutedWords(
     }
     // quote post with media
     else if (
-      AppBskyEmbedRecordWithMedia.isView(subject.embed) &&
-      AppBskyEmbedRecord.isViewRecord(subject.embed.record.record)
+      AppBskyEmbedRecordWithMedia.isView(embed) &&
+      AppBskyEmbedRecord.isViewRecord(embed.record.record)
     ) {
-      const embedAuthor = subject.embed.record.record.author
+      const embedAuthor = embed.record.record.author
 
       // quoted post text
-      if (AppBskyFeedPost.isRecord(subject.embed.record.record.value)) {
-        const post = subject.embed.record.record.value
+      if (AppBskyFeedPost.isRecord(embed.record.record.value)) {
+        const post = embed.record.record.value as AppBskyFeedPost.Record
         if (
           hasMutedWord({
             mutedWords,
@@ -305,14 +335,14 @@ function checkMutedWords(
       }
 
       // quoted post images
-      if (AppBskyEmbedImages.isView(subject.embed.media)) {
-        for (const image of subject.embed.media.images) {
+      if (AppBskyEmbedImages.isView(embed.media)) {
+        for (const image of embed.media.images) {
           if (
             hasMutedWord({
               mutedWords,
               text: image.alt,
               languages: AppBskyFeedPost.isRecord(subject.record)
-                ? subject.record.langs
+                ? (subject.record as AppBskyFeedPost.Record).langs
                 : [],
               actor: embedAuthor,
             })
@@ -322,8 +352,8 @@ function checkMutedWords(
         }
       }
 
-      if (AppBskyEmbedExternal.isView(subject.embed.media)) {
-        const { external } = subject.embed.media
+      if (AppBskyEmbedExternal.isView(embed.media)) {
+        const { external } = embed.media
         if (
           hasMutedWord({
             mutedWords,
diff --git a/packages/api/src/moderation/subjects/user-list.ts b/packages/api/src/moderation/subjects/user-list.ts
index f2d5f408702..461b469b9fe 100644
--- a/packages/api/src/moderation/subjects/user-list.ts
+++ b/packages/api/src/moderation/subjects/user-list.ts
@@ -11,7 +11,11 @@ export function decideUserList(
 ): ModerationDecision {
   const acc = new ModerationDecision()
 
-  const creator = isProfile(subject.creator) ? subject.creator : undefined
+  const creator =
+    // Note: ListViewBasic should not contain a creator field, but let's support it anyway
+    'creator' in subject && isProfile(subject.creator)
+      ? subject.creator
+      : undefined
 
   if (creator) {
     acc.setDid(creator.did)
diff --git a/packages/api/src/moderation/types.ts b/packages/api/src/moderation/types.ts
index 6d2371b113c..8efc0d66f32 100644
--- a/packages/api/src/moderation/types.ts
+++ b/packages/api/src/moderation/types.ts
@@ -3,6 +3,7 @@ import {
   AppBskyFeedDefs,
   AppBskyGraphDefs,
   AppBskyNotificationListNotifications,
+  ChatBskyActorDefs,
   ComAtprotoLabelDefs,
 } from '../client/index'
 import { KnownLabelValue } from './const/labels'
@@ -87,6 +88,7 @@ export type ModerationSubjectProfile =
   | AppBskyActorDefs.ProfileViewBasic
   | AppBskyActorDefs.ProfileView
   | AppBskyActorDefs.ProfileViewDetailed
+  | ChatBskyActorDefs.ProfileViewBasic
 
 export type ModerationSubjectPost = AppBskyFeedDefs.PostView
 
diff --git a/packages/api/src/moderation/util.ts b/packages/api/src/moderation/util.ts
index 4c4c4eb210e..a76b37f8b9f 100644
--- a/packages/api/src/moderation/util.ts
+++ b/packages/api/src/moderation/util.ts
@@ -4,6 +4,7 @@ import {
   AppBskyLabelerDefs,
   ComAtprotoLabelDefs,
 } from '../client'
+import { asPredicate } from '../client/util'
 import {
   InterpretedLabelValueDefinition,
   LabelPreference,
@@ -103,10 +104,7 @@ export function interpretLabelValueDefinitions(
   labelerView: AppBskyLabelerDefs.LabelerViewDetailed,
 ): InterpretedLabelValueDefinition[] {
   return (labelerView.policies?.labelValueDefinitions || [])
-    .filter(
-      (labelValDef) =>
-        ComAtprotoLabelDefs.validateLabelValueDefinition(labelValDef).success,
-    )
+    .filter(asPredicate(ComAtprotoLabelDefs.validateLabelValueDefinition))
     .map((labelValDef) =>
       interpretLabelValueDefinition(labelValDef, labelerView.creator.did),
     )
diff --git a/packages/api/src/predicate.ts b/packages/api/src/predicate.ts
new file mode 100644
index 00000000000..3b24542a8b9
--- /dev/null
+++ b/packages/api/src/predicate.ts
@@ -0,0 +1,43 @@
+import { AppBskyActorDefs, AppBskyActorProfile } from './client/index'
+import { asPredicate } from './client/util'
+
+export const isValidProfile = asPredicate(AppBskyActorProfile.validateRecord)
+export const isValidAdultContentPref = asPredicate(
+  AppBskyActorDefs.validateAdultContentPref,
+)
+export const isValidBskyAppStatePref = asPredicate(
+  AppBskyActorDefs.validateBskyAppStatePref,
+)
+export const isValidContentLabelPref = asPredicate(
+  AppBskyActorDefs.validateContentLabelPref,
+)
+export const isValidFeedViewPref = asPredicate(
+  AppBskyActorDefs.validateFeedViewPref,
+)
+export const isValidHiddenPostsPref = asPredicate(
+  AppBskyActorDefs.validateHiddenPostsPref,
+)
+export const isValidInterestsPref = asPredicate(
+  AppBskyActorDefs.validateInterestsPref,
+)
+export const isValidLabelersPref = asPredicate(
+  AppBskyActorDefs.validateLabelersPref,
+)
+export const isValidMutedWordsPref = asPredicate(
+  AppBskyActorDefs.validateMutedWordsPref,
+)
+export const isValidPersonalDetailsPref = asPredicate(
+  AppBskyActorDefs.validatePersonalDetailsPref,
+)
+export const isValidPostInteractionSettingsPref = asPredicate(
+  AppBskyActorDefs.validatePostInteractionSettingsPref,
+)
+export const isValidSavedFeedsPref = asPredicate(
+  AppBskyActorDefs.validateSavedFeedsPref,
+)
+export const isValidSavedFeedsPrefV2 = asPredicate(
+  AppBskyActorDefs.validateSavedFeedsPrefV2,
+)
+export const isValidThreadViewPref = asPredicate(
+  AppBskyActorDefs.validateThreadViewPref,
+)
diff --git a/packages/api/src/rich-text/rich-text.ts b/packages/api/src/rich-text/rich-text.ts
index 44f48b5f4b8..ba46e570356 100644
--- a/packages/api/src/rich-text/rich-text.ts
+++ b/packages/api/src/rich-text/rich-text.ts
@@ -122,11 +122,7 @@ export class RichTextSegment {
   ) {}
 
   get link(): FacetLink | undefined {
-    const link = this.facet?.features.find(AppBskyRichtextFacet.isLink)
-    if (AppBskyRichtextFacet.isLink(link)) {
-      return link
-    }
-    return undefined
+    return this.facet?.features.find(AppBskyRichtextFacet.isLink)
   }
 
   isLink() {
@@ -134,11 +130,7 @@ export class RichTextSegment {
   }
 
   get mention(): FacetMention | undefined {
-    const mention = this.facet?.features.find(AppBskyRichtextFacet.isMention)
-    if (AppBskyRichtextFacet.isMention(mention)) {
-      return mention
-    }
-    return undefined
+    return this.facet?.features.find(AppBskyRichtextFacet.isMention)
   }
 
   isMention() {
@@ -146,11 +138,7 @@ export class RichTextSegment {
   }
 
   get tag(): FacetTag | undefined {
-    const tag = this.facet?.features.find(AppBskyRichtextFacet.isTag)
-    if (AppBskyRichtextFacet.isTag(tag)) {
-      return tag
-    }
-    return undefined
+    return this.facet?.features.find(AppBskyRichtextFacet.isTag)
   }
 
   isTag() {
diff --git a/packages/api/tests/atp-agent.test.ts b/packages/api/tests/atp-agent.test.ts
index 86fbd8ac18e..37ab0e4790c 100644
--- a/packages/api/tests/atp-agent.test.ts
+++ b/packages/api/tests/atp-agent.test.ts
@@ -7,6 +7,7 @@ import {
   ComAtprotoRepoPutRecord,
   DEFAULT_LABEL_SETTINGS,
 } from '../src'
+import { asPredicate } from '../src/client/util'
 import {
   getSavedFeedType,
   savedFeedsToUriArrays,
@@ -2320,38 +2321,22 @@ describe('agent', () => {
 
       async function addLegacyMutedWord(mutedWord: AppBskyActorDefs.MutedWord) {
         await updatePreferences(agent, (prefs) => {
-          let mutedWordsPref = prefs.findLast(
-            (pref) =>
-              AppBskyActorDefs.isMutedWordsPref(pref) &&
-              AppBskyActorDefs.validateMutedWordsPref(pref).success,
-          )
+          const mutedWordsPref = prefs.findLast(
+            asPredicate(AppBskyActorDefs.validateMutedWordsPref),
+          ) || {
+            $type: 'app.bsky.actor.defs#mutedWordsPref',
+            items: [],
+          }
 
-          const newMutedWord: AppBskyActorDefs.MutedWord = {
+          mutedWordsPref.items.push({
             value: mutedWord.value,
             targets: mutedWord.targets,
             actorTarget: 'all',
-          }
-
-          if (
-            mutedWordsPref &&
-            AppBskyActorDefs.isMutedWordsPref(mutedWordsPref)
-          ) {
-            mutedWordsPref.items.push(newMutedWord)
-          } else {
-            // if the pref doesn't exist, create it
-            mutedWordsPref = {
-              items: [newMutedWord],
-            }
-          }
+          })
 
           return prefs
             .filter((p) => !AppBskyActorDefs.isMutedWordsPref(p))
-            .concat([
-              {
-                ...mutedWordsPref,
-                $type: 'app.bsky.actor.defs#mutedWordsPref',
-              },
-            ])
+            .concat([mutedWordsPref])
         })
       }
 
@@ -3350,6 +3335,7 @@ describe('agent', () => {
 
         await agent.bskyAppSetActiveProgressGuide({
           guide: 'test-guide',
+          // @ts-expect-error unspecced field
           numThings: 0,
         })
         await expect(agent.getPreferences()).resolves.toHaveProperty(
@@ -3358,6 +3344,7 @@ describe('agent', () => {
         )
         await agent.bskyAppSetActiveProgressGuide({
           guide: 'test-guide',
+          // @ts-expect-error unspecced field
           numThings: 1,
         })
         await expect(agent.getPreferences()).resolves.toHaveProperty(
@@ -3436,6 +3423,7 @@ describe('agent', () => {
         // @ts-expect-error
         expect(() => agent.bskyAppUpsertNux({ name: 'a' })).rejects.toThrow()
         expect(() =>
+          // @ts-expect-error
           agent.bskyAppUpsertNux({ id: 'a', completed: false, foo: 'bar' }),
         ).rejects.toThrow()
       })
@@ -3508,6 +3496,7 @@ describe('agent', () => {
       it('validates inputs', async () => {
         expect(() =>
           agent.setPostInteractionSettings({
+            // @ts-expect-error we are testing invalid inputs
             threadgateAllowRules: [{ key: 'string' }],
             postgateEmbeddingRules: [],
           }),
diff --git a/packages/api/tests/moderation-custom-labels.test.ts b/packages/api/tests/moderation-custom-labels.test.ts
index 0af184aeb06..366e7a486ce 100644
--- a/packages/api/tests/moderation-custom-labels.test.ts
+++ b/packages/api/tests/moderation-custom-labels.test.ts
@@ -223,6 +223,7 @@ describe('Moderation: custom labels', () => {
         res = moderatePost(
           mock.postView({
             record: {
+              $type: 'app.bsky.feed.post',
               text: 'Hello',
               createdAt: new Date().toISOString(),
             },
diff --git a/packages/api/tests/moderation-mutewords.test.ts b/packages/api/tests/moderation-mutewords.test.ts
index b8eb014ee56..3aa15d2da6d 100644
--- a/packages/api/tests/moderation-mutewords.test.ts
+++ b/packages/api/tests/moderation-mutewords.test.ts
@@ -831,6 +831,7 @@ describe(`hasMutedWord`, () => {
             features: [
               {
                 $type: 'com.example.richtext.facet#other',
+                // @ts-expect-error
                 foo: 'bar',
               },
               {
diff --git a/packages/api/tests/moderation-prefs.test.ts b/packages/api/tests/moderation-prefs.test.ts
index a9ce47314c5..a859035117b 100644
--- a/packages/api/tests/moderation-prefs.test.ts
+++ b/packages/api/tests/moderation-prefs.test.ts
@@ -1,5 +1,6 @@
 import { TestNetworkNoAppView } from '@atproto/dev-env'
 import { DEFAULT_LABEL_SETTINGS } from '../src'
+import { isContentLabelPref } from '../src/client/types/app/bsky/actor/defs'
 import './util/moderation-behavior'
 
 describe('agent', () => {
@@ -351,7 +352,7 @@ describe('agent', () => {
     const a = await agent.app.bsky.actor.getPreferences({})
 
     const nsfwSettings = a.data.preferences.filter(
-      (pref) => pref.label === 'nsfw',
+      (pref) => isContentLabelPref(pref) && pref.label === 'nsfw',
     )
     expect(nsfwSettings.length).toEqual(1)
   })
diff --git a/packages/api/tests/moderation-quoteposts.test.ts b/packages/api/tests/moderation-quoteposts.test.ts
index 2041f190396..4ff94abae39 100644
--- a/packages/api/tests/moderation-quoteposts.test.ts
+++ b/packages/api/tests/moderation-quoteposts.test.ts
@@ -193,6 +193,7 @@ describe('Moderation: custom labels', () => {
 
       const post = mock.postView({
         record: {
+          $type: 'app.bsky.feed.post',
           text: 'Hello',
           createdAt: new Date().toISOString(),
         },
diff --git a/packages/api/tests/moderation.test.ts b/packages/api/tests/moderation.test.ts
index f85e4a5325a..6c0a7f9139a 100644
--- a/packages/api/tests/moderation.test.ts
+++ b/packages/api/tests/moderation.test.ts
@@ -177,6 +177,7 @@ describe('Moderation', () => {
     const res1 = moderatePost(
       mock.postView({
         record: {
+          $type: 'app.bsky.feed.post',
           text: 'Hello',
           createdAt: new Date().toISOString(),
         },
@@ -214,6 +215,7 @@ describe('Moderation', () => {
     const res1 = moderatePost(
       mock.postView({
         record: {
+          $type: 'app.bsky.feed.post',
           text: 'Hello',
           createdAt: new Date().toISOString(),
         },
@@ -293,6 +295,7 @@ describe('Moderation', () => {
     const res = moderatePost(
       mock.postView({
         record: {
+          $type: 'app.bsky.feed.post',
           text: 'Hello',
           createdAt: new Date().toISOString(),
         },
@@ -354,6 +357,7 @@ describe('Moderation', () => {
     const res = moderatePost(
       mock.postView({
         record: {
+          $type: 'app.bsky.feed.post',
           text: 'Hello',
           createdAt: new Date().toISOString(),
         },
@@ -430,6 +434,7 @@ describe('Moderation', () => {
     const res = moderatePost(
       mock.postView({
         record: {
+          $type: 'app.bsky.feed.post',
           text: 'Hello',
           createdAt: new Date().toISOString(),
         },
@@ -518,6 +523,7 @@ describe('Moderation', () => {
     const res1 = moderatePost(
       mock.postView({
         record: {
+          $type: 'app.bsky.feed.post',
           text: 'Hello',
           createdAt: new Date().toISOString(),
         },
@@ -549,6 +555,7 @@ describe('Moderation', () => {
     const res2 = moderatePost(
       mock.postView({
         record: {
+          $type: 'app.bsky.feed.post',
           text: 'Hello',
           createdAt: new Date().toISOString(),
         },
@@ -580,6 +587,7 @@ describe('Moderation', () => {
     const res3 = moderatePost(
       mock.postView({
         record: {
+          $type: 'app.bsky.feed.post',
           text: 'Hello',
           createdAt: new Date().toISOString(),
         },
@@ -645,6 +653,7 @@ describe('Moderation', () => {
     const res = moderatePost(
       mock.postView({
         record: {
+          $type: 'app.bsky.feed.post',
           text: 'Hello',
           createdAt: new Date().toISOString(),
         },
@@ -698,6 +707,7 @@ describe('Moderation', () => {
     const res = moderatePost(
       mock.postView({
         record: {
+          $type: 'app.bsky.feed.post',
           text: 'Hello',
           createdAt: new Date().toISOString(),
         },
diff --git a/packages/api/tests/rich-text-detection.test.ts b/packages/api/tests/rich-text-detection.test.ts
index c87b5eab0a6..bb55f8222b1 100644
--- a/packages/api/tests/rich-text-detection.test.ts
+++ b/packages/api/tests/rich-text-detection.test.ts
@@ -1,5 +1,9 @@
 import { AtpAgent, RichText, RichTextSegment } from '../src'
-import { isTag } from '../src/client/types/app/bsky/richtext/facet'
+import {
+  isLink,
+  isMention,
+  isTag,
+} from '../src/client/types/app/bsky/richtext/facet'
 
 describe('detectFacets', () => {
   const agent = new AtpAgent({ service: 'http://localhost' })
@@ -374,12 +378,8 @@ function segmentToOutput(segment: RichTextSegment): string[] {
     return [
       segment.text,
       segment.facet?.features.map((f) => {
-        if (f.did) {
-          return String(f.did)
-        }
-        if (f.uri) {
-          return String(f.uri)
-        }
+        if (isMention(f)) return f.did
+        if (isLink(f)) return f.uri
         return undefined
       })?.[0] || '',
     ]
diff --git a/packages/bsky/jest.config.js b/packages/bsky/jest.config.js
index 0de38d9de00..def188c3092 100644
--- a/packages/bsky/jest.config.js
+++ b/packages/bsky/jest.config.js
@@ -5,4 +5,5 @@ module.exports = {
   transformIgnorePatterns: ['/node_modules/.pnpm/(?!(get-port)@)'],
   testTimeout: 60000,
   setupFiles: ['<rootDir>/../../jest.setup.ts'],
+  moduleNameMapper: { '^(\\.\\.?\\/.+)\\.js$': ['$1.ts', '$1.js'] },
 }
diff --git a/packages/bsky/src/api/app/bsky/feed/getFeed.ts b/packages/bsky/src/api/app/bsky/feed/getFeed.ts
index e61ac0e9474..b3f3a528782 100644
--- a/packages/bsky/src/api/app/bsky/feed/getFeed.ts
+++ b/packages/bsky/src/api/app/bsky/feed/getFeed.ts
@@ -18,6 +18,7 @@ import { FeedItem } from '../../../../hydration/feed'
 import { HydrateCtx } from '../../../../hydration/hydrator'
 import { Server } from '../../../../lexicon'
 import { ids } from '../../../../lexicon/lexicons'
+import { isSkeletonReasonRepost } from '../../../../lexicon/types/app/bsky/feed/defs'
 import { QueryParams as GetFeedParams } from '../../../../lexicon/types/app/bsky/feed/getFeed'
 import { OutputSchema as SkeletonOutput } from '../../../../lexicon/types/app/bsky/feed/getFeedSkeleton'
 import {
@@ -41,10 +42,8 @@ export default function (server: Server, ctx: AppContext) {
     auth: ctx.authVerifier.standardOptionalParameterized({
       lxmCheck: (method) => {
         return (
-          method !== undefined &&
-          [ids.AppBskyFeedGetFeedSkeleton, ids.AppBskyFeedGetFeed].includes(
-            method,
-          )
+          method === ids.AppBskyFeedGetFeedSkeleton ||
+          method === ids.AppBskyFeedGetFeed
         )
       },
       skipAudCheck: true,
@@ -254,10 +253,9 @@ const skeletonFromFeedGen = async (
   const { feed: feedSkele, ...skele } = skeleton
   const feedItems = feedSkele.slice(0, params.limit).map((item) => ({
     post: { uri: item.post },
-    repost:
-      typeof item.reason?.repost === 'string'
-        ? { uri: item.reason.repost }
-        : undefined,
+    repost: isSkeletonReasonRepost(item.reason)
+      ? { uri: item.reason.repost }
+      : undefined,
     feedContext: item.feedContext,
   }))
 
diff --git a/packages/bsky/src/api/app/bsky/labeler/getServices.ts b/packages/bsky/src/api/app/bsky/labeler/getServices.ts
index c40b6a4b13f..df98a862234 100644
--- a/packages/bsky/src/api/app/bsky/labeler/getServices.ts
+++ b/packages/bsky/src/api/app/bsky/labeler/getServices.ts
@@ -21,15 +21,15 @@ export default function (server: Server, ctx: AppContext) {
           const view = ctx.views.labelerDetailed(did, hydration)
           if (!view) return
           return {
-            $type: 'app.bsky.labeler.defs#labelerViewDetailed',
             ...view,
+            $type: 'app.bsky.labeler.defs#labelerViewDetailed',
           }
         } else {
           const view = ctx.views.labeler(did, hydration)
           if (!view) return
           return {
-            $type: 'app.bsky.labeler.defs#labelerView',
             ...view,
+            $type: 'app.bsky.labeler.defs#labelerView',
           }
         }
       })
diff --git a/packages/bsky/src/data-plane/server/indexing/plugins/post.ts b/packages/bsky/src/data-plane/server/indexing/plugins/post.ts
index 80ce451354e..d9bb864713f 100644
--- a/packages/bsky/src/data-plane/server/indexing/plugins/post.ts
+++ b/packages/bsky/src/data-plane/server/indexing/plugins/post.ts
@@ -18,11 +18,13 @@ import {
   isLink,
   isMention,
 } from '../../../../lexicon/types/app/bsky/richtext/facet'
+import { $Typed } from '../../../../lexicon/util'
 import {
   postUriToPostgateUri,
   postUriToThreadgateUri,
   uriToDid,
 } from '../../../../util/uris'
+import { RecordWithMedia } from '../../../../views/types'
 import { parsePostgate } from '../../../../views/util'
 import { BackgroundQueue } from '../../background'
 import { Database } from '../../db'
@@ -521,7 +523,13 @@ export const makePlugin = (
 
 export default makePlugin
 
-function separateEmbeds(embed: PostRecord['embed']) {
+function separateEmbeds(
+  embed: PostRecord['embed'],
+): Array<
+  | RecordWithMedia['media']
+  | $Typed<RecordWithMedia['record']>
+  | NonNullable<PostRecord['embed']>
+> {
   if (!embed) {
     return []
   }
diff --git a/packages/bsky/src/hydration/graph.ts b/packages/bsky/src/hydration/graph.ts
index 148a7e0da3b..fdf586a5bec 100644
--- a/packages/bsky/src/hydration/graph.ts
+++ b/packages/bsky/src/hydration/graph.ts
@@ -176,7 +176,10 @@ export class GraphHydrator {
     }, new HydrationMap<Follow>())
   }
 
-  async getBlocks(uris: string[], includeTakedowns = false): Promise<Follows> {
+  async getBlocks(
+    uris: string[],
+    includeTakedowns = false,
+  ): Promise<HydrationMap<Block>> {
     if (!uris.length) return new HydrationMap<Block>()
     const res = await this.dataplane.getBlockRecords({ uris })
     return uris.reduce((acc, uri, i) => {
diff --git a/packages/bsky/src/hydration/hydrator.ts b/packages/bsky/src/hydration/hydrator.ts
index 788b9c52806..b91874fb796 100644
--- a/packages/bsky/src/hydration/hydrator.ts
+++ b/packages/bsky/src/hydration/hydrator.ts
@@ -3,6 +3,7 @@ import { mapDefined } from '@atproto/common'
 import { AtUri } from '@atproto/syntax'
 import { DataPlaneClient } from '../data-plane/client'
 import { ids } from '../lexicon/lexicons'
+import { Record as ProfileRecord } from '../lexicon/types/app/bsky/actor/profile'
 import { isMain as isEmbedRecord } from '../lexicon/types/app/bsky/embed/record'
 import { isMain as isEmbedRecordWithMedia } from '../lexicon/types/app/bsky/embed/recordWithMedia'
 import { isListRule as isThreadgateListRule } from '../lexicon/types/app/bsky/feed/threadgate'
@@ -998,10 +999,7 @@ export class Hydrator {
 
   // ad-hoc record hydration
   // in com.atproto.repo.getRecord
-  async getRecord(
-    uri: string,
-    includeTakedowns = false,
-  ): Promise<RecordInfo<Record<string, unknown>> | undefined> {
+  async getRecord(uri: string, includeTakedowns = false) {
     const parsed = new AtUri(uri)
     const collection = parsed.collection
     if (collection === ids.AppBskyFeedPost) {
@@ -1081,13 +1079,15 @@ export class Hydrator {
         did,
       )
       if (!actor?.profile || !actor?.profileCid) return undefined
-      return {
+      const recordInfo: RecordInfo<ProfileRecord> = {
         record: actor.profile,
         cid: actor.profileCid,
         sortedAt: actor.sortedAt ?? new Date(0), // @NOTE will be present since profile record is present
         indexedAt: actor.indexedAt ?? new Date(0), // @NOTE will be present since profile record is present
         takedownRef: actor.profileTakedownRef,
       }
+
+      return recordInfo
     }
   }
 
diff --git a/packages/bsky/src/hydration/util.ts b/packages/bsky/src/hydration/util.ts
index fae89596044..beb7b774c30 100644
--- a/packages/bsky/src/hydration/util.ts
+++ b/packages/bsky/src/hydration/util.ts
@@ -18,7 +18,9 @@ export interface Merges {
   merge<T extends this>(map: T): this
 }
 
-export type RecordInfo<T> = {
+type UnknownRecord = { $type: string; [x: string]: unknown }
+
+export type RecordInfo<T extends UnknownRecord> = {
   record: T
   cid: string
   sortedAt: Date
@@ -56,7 +58,7 @@ export const mergeManyMaps = <T>(...maps: HydrationMap<T>[]) => {
 
 export type ItemRef = { uri: string; cid?: string }
 
-export const parseRecord = <T>(
+export const parseRecord = <T extends UnknownRecord>(
   entry: Record,
   includeTakedowns: boolean,
 ): RecordInfo<T> | undefined => {
diff --git a/packages/bsky/src/lexicon/index.ts b/packages/bsky/src/lexicon/index.ts
index 27ddc898f4d..056cc278d9b 100644
--- a/packages/bsky/src/lexicon/index.ts
+++ b/packages/bsky/src/lexicon/index.ts
@@ -8,162 +8,162 @@ import {
   AuthVerifier,
   StreamAuthVerifier,
 } from '@atproto/xrpc-server'
-import { schemas } from './lexicons'
-import * as ComAtprotoAdminDeleteAccount from './types/com/atproto/admin/deleteAccount'
-import * as ComAtprotoAdminDisableAccountInvites from './types/com/atproto/admin/disableAccountInvites'
-import * as ComAtprotoAdminDisableInviteCodes from './types/com/atproto/admin/disableInviteCodes'
-import * as ComAtprotoAdminEnableAccountInvites from './types/com/atproto/admin/enableAccountInvites'
-import * as ComAtprotoAdminGetAccountInfo from './types/com/atproto/admin/getAccountInfo'
-import * as ComAtprotoAdminGetAccountInfos from './types/com/atproto/admin/getAccountInfos'
-import * as ComAtprotoAdminGetInviteCodes from './types/com/atproto/admin/getInviteCodes'
-import * as ComAtprotoAdminGetSubjectStatus from './types/com/atproto/admin/getSubjectStatus'
-import * as ComAtprotoAdminSearchAccounts from './types/com/atproto/admin/searchAccounts'
-import * as ComAtprotoAdminSendEmail from './types/com/atproto/admin/sendEmail'
-import * as ComAtprotoAdminUpdateAccountEmail from './types/com/atproto/admin/updateAccountEmail'
-import * as ComAtprotoAdminUpdateAccountHandle from './types/com/atproto/admin/updateAccountHandle'
-import * as ComAtprotoAdminUpdateAccountPassword from './types/com/atproto/admin/updateAccountPassword'
-import * as ComAtprotoAdminUpdateSubjectStatus from './types/com/atproto/admin/updateSubjectStatus'
-import * as ComAtprotoIdentityGetRecommendedDidCredentials from './types/com/atproto/identity/getRecommendedDidCredentials'
-import * as ComAtprotoIdentityRequestPlcOperationSignature from './types/com/atproto/identity/requestPlcOperationSignature'
-import * as ComAtprotoIdentityResolveHandle from './types/com/atproto/identity/resolveHandle'
-import * as ComAtprotoIdentitySignPlcOperation from './types/com/atproto/identity/signPlcOperation'
-import * as ComAtprotoIdentitySubmitPlcOperation from './types/com/atproto/identity/submitPlcOperation'
-import * as ComAtprotoIdentityUpdateHandle from './types/com/atproto/identity/updateHandle'
-import * as ComAtprotoLabelQueryLabels from './types/com/atproto/label/queryLabels'
-import * as ComAtprotoLabelSubscribeLabels from './types/com/atproto/label/subscribeLabels'
-import * as ComAtprotoModerationCreateReport from './types/com/atproto/moderation/createReport'
-import * as ComAtprotoRepoApplyWrites from './types/com/atproto/repo/applyWrites'
-import * as ComAtprotoRepoCreateRecord from './types/com/atproto/repo/createRecord'
-import * as ComAtprotoRepoDeleteRecord from './types/com/atproto/repo/deleteRecord'
-import * as ComAtprotoRepoDescribeRepo from './types/com/atproto/repo/describeRepo'
-import * as ComAtprotoRepoGetRecord from './types/com/atproto/repo/getRecord'
-import * as ComAtprotoRepoImportRepo from './types/com/atproto/repo/importRepo'
-import * as ComAtprotoRepoListMissingBlobs from './types/com/atproto/repo/listMissingBlobs'
-import * as ComAtprotoRepoListRecords from './types/com/atproto/repo/listRecords'
-import * as ComAtprotoRepoPutRecord from './types/com/atproto/repo/putRecord'
-import * as ComAtprotoRepoUploadBlob from './types/com/atproto/repo/uploadBlob'
-import * as ComAtprotoServerActivateAccount from './types/com/atproto/server/activateAccount'
-import * as ComAtprotoServerCheckAccountStatus from './types/com/atproto/server/checkAccountStatus'
-import * as ComAtprotoServerConfirmEmail from './types/com/atproto/server/confirmEmail'
-import * as ComAtprotoServerCreateAccount from './types/com/atproto/server/createAccount'
-import * as ComAtprotoServerCreateAppPassword from './types/com/atproto/server/createAppPassword'
-import * as ComAtprotoServerCreateInviteCode from './types/com/atproto/server/createInviteCode'
-import * as ComAtprotoServerCreateInviteCodes from './types/com/atproto/server/createInviteCodes'
-import * as ComAtprotoServerCreateSession from './types/com/atproto/server/createSession'
-import * as ComAtprotoServerDeactivateAccount from './types/com/atproto/server/deactivateAccount'
-import * as ComAtprotoServerDeleteAccount from './types/com/atproto/server/deleteAccount'
-import * as ComAtprotoServerDeleteSession from './types/com/atproto/server/deleteSession'
-import * as ComAtprotoServerDescribeServer from './types/com/atproto/server/describeServer'
-import * as ComAtprotoServerGetAccountInviteCodes from './types/com/atproto/server/getAccountInviteCodes'
-import * as ComAtprotoServerGetServiceAuth from './types/com/atproto/server/getServiceAuth'
-import * as ComAtprotoServerGetSession from './types/com/atproto/server/getSession'
-import * as ComAtprotoServerListAppPasswords from './types/com/atproto/server/listAppPasswords'
-import * as ComAtprotoServerRefreshSession from './types/com/atproto/server/refreshSession'
-import * as ComAtprotoServerRequestAccountDelete from './types/com/atproto/server/requestAccountDelete'
-import * as ComAtprotoServerRequestEmailConfirmation from './types/com/atproto/server/requestEmailConfirmation'
-import * as ComAtprotoServerRequestEmailUpdate from './types/com/atproto/server/requestEmailUpdate'
-import * as ComAtprotoServerRequestPasswordReset from './types/com/atproto/server/requestPasswordReset'
-import * as ComAtprotoServerReserveSigningKey from './types/com/atproto/server/reserveSigningKey'
-import * as ComAtprotoServerResetPassword from './types/com/atproto/server/resetPassword'
-import * as ComAtprotoServerRevokeAppPassword from './types/com/atproto/server/revokeAppPassword'
-import * as ComAtprotoServerUpdateEmail from './types/com/atproto/server/updateEmail'
-import * as ComAtprotoSyncGetBlob from './types/com/atproto/sync/getBlob'
-import * as ComAtprotoSyncGetBlocks from './types/com/atproto/sync/getBlocks'
-import * as ComAtprotoSyncGetCheckout from './types/com/atproto/sync/getCheckout'
-import * as ComAtprotoSyncGetHead from './types/com/atproto/sync/getHead'
-import * as ComAtprotoSyncGetLatestCommit from './types/com/atproto/sync/getLatestCommit'
-import * as ComAtprotoSyncGetRecord from './types/com/atproto/sync/getRecord'
-import * as ComAtprotoSyncGetRepo from './types/com/atproto/sync/getRepo'
-import * as ComAtprotoSyncGetRepoStatus from './types/com/atproto/sync/getRepoStatus'
-import * as ComAtprotoSyncListBlobs from './types/com/atproto/sync/listBlobs'
-import * as ComAtprotoSyncListRepos from './types/com/atproto/sync/listRepos'
-import * as ComAtprotoSyncNotifyOfUpdate from './types/com/atproto/sync/notifyOfUpdate'
-import * as ComAtprotoSyncRequestCrawl from './types/com/atproto/sync/requestCrawl'
-import * as ComAtprotoSyncSubscribeRepos from './types/com/atproto/sync/subscribeRepos'
-import * as ComAtprotoTempAddReservedHandle from './types/com/atproto/temp/addReservedHandle'
-import * as ComAtprotoTempCheckSignupQueue from './types/com/atproto/temp/checkSignupQueue'
-import * as ComAtprotoTempFetchLabels from './types/com/atproto/temp/fetchLabels'
-import * as ComAtprotoTempRequestPhoneVerification from './types/com/atproto/temp/requestPhoneVerification'
-import * as AppBskyActorGetPreferences from './types/app/bsky/actor/getPreferences'
-import * as AppBskyActorGetProfile from './types/app/bsky/actor/getProfile'
-import * as AppBskyActorGetProfiles from './types/app/bsky/actor/getProfiles'
-import * as AppBskyActorGetSuggestions from './types/app/bsky/actor/getSuggestions'
-import * as AppBskyActorPutPreferences from './types/app/bsky/actor/putPreferences'
-import * as AppBskyActorSearchActors from './types/app/bsky/actor/searchActors'
-import * as AppBskyActorSearchActorsTypeahead from './types/app/bsky/actor/searchActorsTypeahead'
-import * as AppBskyFeedDescribeFeedGenerator from './types/app/bsky/feed/describeFeedGenerator'
-import * as AppBskyFeedGetActorFeeds from './types/app/bsky/feed/getActorFeeds'
-import * as AppBskyFeedGetActorLikes from './types/app/bsky/feed/getActorLikes'
-import * as AppBskyFeedGetAuthorFeed from './types/app/bsky/feed/getAuthorFeed'
-import * as AppBskyFeedGetFeed from './types/app/bsky/feed/getFeed'
-import * as AppBskyFeedGetFeedGenerator from './types/app/bsky/feed/getFeedGenerator'
-import * as AppBskyFeedGetFeedGenerators from './types/app/bsky/feed/getFeedGenerators'
-import * as AppBskyFeedGetFeedSkeleton from './types/app/bsky/feed/getFeedSkeleton'
-import * as AppBskyFeedGetLikes from './types/app/bsky/feed/getLikes'
-import * as AppBskyFeedGetListFeed from './types/app/bsky/feed/getListFeed'
-import * as AppBskyFeedGetPostThread from './types/app/bsky/feed/getPostThread'
-import * as AppBskyFeedGetPosts from './types/app/bsky/feed/getPosts'
-import * as AppBskyFeedGetQuotes from './types/app/bsky/feed/getQuotes'
-import * as AppBskyFeedGetRepostedBy from './types/app/bsky/feed/getRepostedBy'
-import * as AppBskyFeedGetSuggestedFeeds from './types/app/bsky/feed/getSuggestedFeeds'
-import * as AppBskyFeedGetTimeline from './types/app/bsky/feed/getTimeline'
-import * as AppBskyFeedSearchPosts from './types/app/bsky/feed/searchPosts'
-import * as AppBskyFeedSendInteractions from './types/app/bsky/feed/sendInteractions'
-import * as AppBskyGraphGetActorStarterPacks from './types/app/bsky/graph/getActorStarterPacks'
-import * as AppBskyGraphGetBlocks from './types/app/bsky/graph/getBlocks'
-import * as AppBskyGraphGetFollowers from './types/app/bsky/graph/getFollowers'
-import * as AppBskyGraphGetFollows from './types/app/bsky/graph/getFollows'
-import * as AppBskyGraphGetKnownFollowers from './types/app/bsky/graph/getKnownFollowers'
-import * as AppBskyGraphGetList from './types/app/bsky/graph/getList'
-import * as AppBskyGraphGetListBlocks from './types/app/bsky/graph/getListBlocks'
-import * as AppBskyGraphGetListMutes from './types/app/bsky/graph/getListMutes'
-import * as AppBskyGraphGetLists from './types/app/bsky/graph/getLists'
-import * as AppBskyGraphGetMutes from './types/app/bsky/graph/getMutes'
-import * as AppBskyGraphGetRelationships from './types/app/bsky/graph/getRelationships'
-import * as AppBskyGraphGetStarterPack from './types/app/bsky/graph/getStarterPack'
-import * as AppBskyGraphGetStarterPacks from './types/app/bsky/graph/getStarterPacks'
-import * as AppBskyGraphGetSuggestedFollowsByActor from './types/app/bsky/graph/getSuggestedFollowsByActor'
-import * as AppBskyGraphMuteActor from './types/app/bsky/graph/muteActor'
-import * as AppBskyGraphMuteActorList from './types/app/bsky/graph/muteActorList'
-import * as AppBskyGraphMuteThread from './types/app/bsky/graph/muteThread'
-import * as AppBskyGraphSearchStarterPacks from './types/app/bsky/graph/searchStarterPacks'
-import * as AppBskyGraphUnmuteActor from './types/app/bsky/graph/unmuteActor'
-import * as AppBskyGraphUnmuteActorList from './types/app/bsky/graph/unmuteActorList'
-import * as AppBskyGraphUnmuteThread from './types/app/bsky/graph/unmuteThread'
-import * as AppBskyLabelerGetServices from './types/app/bsky/labeler/getServices'
-import * as AppBskyNotificationGetUnreadCount from './types/app/bsky/notification/getUnreadCount'
-import * as AppBskyNotificationListNotifications from './types/app/bsky/notification/listNotifications'
-import * as AppBskyNotificationPutPreferences from './types/app/bsky/notification/putPreferences'
-import * as AppBskyNotificationRegisterPush from './types/app/bsky/notification/registerPush'
-import * as AppBskyNotificationUpdateSeen from './types/app/bsky/notification/updateSeen'
-import * as AppBskyUnspeccedGetConfig from './types/app/bsky/unspecced/getConfig'
-import * as AppBskyUnspeccedGetPopularFeedGenerators from './types/app/bsky/unspecced/getPopularFeedGenerators'
-import * as AppBskyUnspeccedGetSuggestionsSkeleton from './types/app/bsky/unspecced/getSuggestionsSkeleton'
-import * as AppBskyUnspeccedGetTaggedSuggestions from './types/app/bsky/unspecced/getTaggedSuggestions'
-import * as AppBskyUnspeccedGetTrendingTopics from './types/app/bsky/unspecced/getTrendingTopics'
-import * as AppBskyUnspeccedSearchActorsSkeleton from './types/app/bsky/unspecced/searchActorsSkeleton'
-import * as AppBskyUnspeccedSearchPostsSkeleton from './types/app/bsky/unspecced/searchPostsSkeleton'
-import * as AppBskyUnspeccedSearchStarterPacksSkeleton from './types/app/bsky/unspecced/searchStarterPacksSkeleton'
-import * as AppBskyVideoGetJobStatus from './types/app/bsky/video/getJobStatus'
-import * as AppBskyVideoGetUploadLimits from './types/app/bsky/video/getUploadLimits'
-import * as AppBskyVideoUploadVideo from './types/app/bsky/video/uploadVideo'
-import * as ChatBskyActorDeleteAccount from './types/chat/bsky/actor/deleteAccount'
-import * as ChatBskyActorExportAccountData from './types/chat/bsky/actor/exportAccountData'
-import * as ChatBskyConvoDeleteMessageForSelf from './types/chat/bsky/convo/deleteMessageForSelf'
-import * as ChatBskyConvoGetConvo from './types/chat/bsky/convo/getConvo'
-import * as ChatBskyConvoGetConvoForMembers from './types/chat/bsky/convo/getConvoForMembers'
-import * as ChatBskyConvoGetLog from './types/chat/bsky/convo/getLog'
-import * as ChatBskyConvoGetMessages from './types/chat/bsky/convo/getMessages'
-import * as ChatBskyConvoLeaveConvo from './types/chat/bsky/convo/leaveConvo'
-import * as ChatBskyConvoListConvos from './types/chat/bsky/convo/listConvos'
-import * as ChatBskyConvoMuteConvo from './types/chat/bsky/convo/muteConvo'
-import * as ChatBskyConvoSendMessage from './types/chat/bsky/convo/sendMessage'
-import * as ChatBskyConvoSendMessageBatch from './types/chat/bsky/convo/sendMessageBatch'
-import * as ChatBskyConvoUnmuteConvo from './types/chat/bsky/convo/unmuteConvo'
-import * as ChatBskyConvoUpdateRead from './types/chat/bsky/convo/updateRead'
-import * as ChatBskyModerationGetActorMetadata from './types/chat/bsky/moderation/getActorMetadata'
-import * as ChatBskyModerationGetMessageContext from './types/chat/bsky/moderation/getMessageContext'
-import * as ChatBskyModerationUpdateActorAccess from './types/chat/bsky/moderation/updateActorAccess'
+import { schemas } from './lexicons.js'
+import * as ComAtprotoAdminDeleteAccount from './types/com/atproto/admin/deleteAccount.js'
+import * as ComAtprotoAdminDisableAccountInvites from './types/com/atproto/admin/disableAccountInvites.js'
+import * as ComAtprotoAdminDisableInviteCodes from './types/com/atproto/admin/disableInviteCodes.js'
+import * as ComAtprotoAdminEnableAccountInvites from './types/com/atproto/admin/enableAccountInvites.js'
+import * as ComAtprotoAdminGetAccountInfo from './types/com/atproto/admin/getAccountInfo.js'
+import * as ComAtprotoAdminGetAccountInfos from './types/com/atproto/admin/getAccountInfos.js'
+import * as ComAtprotoAdminGetInviteCodes from './types/com/atproto/admin/getInviteCodes.js'
+import * as ComAtprotoAdminGetSubjectStatus from './types/com/atproto/admin/getSubjectStatus.js'
+import * as ComAtprotoAdminSearchAccounts from './types/com/atproto/admin/searchAccounts.js'
+import * as ComAtprotoAdminSendEmail from './types/com/atproto/admin/sendEmail.js'
+import * as ComAtprotoAdminUpdateAccountEmail from './types/com/atproto/admin/updateAccountEmail.js'
+import * as ComAtprotoAdminUpdateAccountHandle from './types/com/atproto/admin/updateAccountHandle.js'
+import * as ComAtprotoAdminUpdateAccountPassword from './types/com/atproto/admin/updateAccountPassword.js'
+import * as ComAtprotoAdminUpdateSubjectStatus from './types/com/atproto/admin/updateSubjectStatus.js'
+import * as ComAtprotoIdentityGetRecommendedDidCredentials from './types/com/atproto/identity/getRecommendedDidCredentials.js'
+import * as ComAtprotoIdentityRequestPlcOperationSignature from './types/com/atproto/identity/requestPlcOperationSignature.js'
+import * as ComAtprotoIdentityResolveHandle from './types/com/atproto/identity/resolveHandle.js'
+import * as ComAtprotoIdentitySignPlcOperation from './types/com/atproto/identity/signPlcOperation.js'
+import * as ComAtprotoIdentitySubmitPlcOperation from './types/com/atproto/identity/submitPlcOperation.js'
+import * as ComAtprotoIdentityUpdateHandle from './types/com/atproto/identity/updateHandle.js'
+import * as ComAtprotoLabelQueryLabels from './types/com/atproto/label/queryLabels.js'
+import * as ComAtprotoLabelSubscribeLabels from './types/com/atproto/label/subscribeLabels.js'
+import * as ComAtprotoModerationCreateReport from './types/com/atproto/moderation/createReport.js'
+import * as ComAtprotoRepoApplyWrites from './types/com/atproto/repo/applyWrites.js'
+import * as ComAtprotoRepoCreateRecord from './types/com/atproto/repo/createRecord.js'
+import * as ComAtprotoRepoDeleteRecord from './types/com/atproto/repo/deleteRecord.js'
+import * as ComAtprotoRepoDescribeRepo from './types/com/atproto/repo/describeRepo.js'
+import * as ComAtprotoRepoGetRecord from './types/com/atproto/repo/getRecord.js'
+import * as ComAtprotoRepoImportRepo from './types/com/atproto/repo/importRepo.js'
+import * as ComAtprotoRepoListMissingBlobs from './types/com/atproto/repo/listMissingBlobs.js'
+import * as ComAtprotoRepoListRecords from './types/com/atproto/repo/listRecords.js'
+import * as ComAtprotoRepoPutRecord from './types/com/atproto/repo/putRecord.js'
+import * as ComAtprotoRepoUploadBlob from './types/com/atproto/repo/uploadBlob.js'
+import * as ComAtprotoServerActivateAccount from './types/com/atproto/server/activateAccount.js'
+import * as ComAtprotoServerCheckAccountStatus from './types/com/atproto/server/checkAccountStatus.js'
+import * as ComAtprotoServerConfirmEmail from './types/com/atproto/server/confirmEmail.js'
+import * as ComAtprotoServerCreateAccount from './types/com/atproto/server/createAccount.js'
+import * as ComAtprotoServerCreateAppPassword from './types/com/atproto/server/createAppPassword.js'
+import * as ComAtprotoServerCreateInviteCode from './types/com/atproto/server/createInviteCode.js'
+import * as ComAtprotoServerCreateInviteCodes from './types/com/atproto/server/createInviteCodes.js'
+import * as ComAtprotoServerCreateSession from './types/com/atproto/server/createSession.js'
+import * as ComAtprotoServerDeactivateAccount from './types/com/atproto/server/deactivateAccount.js'
+import * as ComAtprotoServerDeleteAccount from './types/com/atproto/server/deleteAccount.js'
+import * as ComAtprotoServerDeleteSession from './types/com/atproto/server/deleteSession.js'
+import * as ComAtprotoServerDescribeServer from './types/com/atproto/server/describeServer.js'
+import * as ComAtprotoServerGetAccountInviteCodes from './types/com/atproto/server/getAccountInviteCodes.js'
+import * as ComAtprotoServerGetServiceAuth from './types/com/atproto/server/getServiceAuth.js'
+import * as ComAtprotoServerGetSession from './types/com/atproto/server/getSession.js'
+import * as ComAtprotoServerListAppPasswords from './types/com/atproto/server/listAppPasswords.js'
+import * as ComAtprotoServerRefreshSession from './types/com/atproto/server/refreshSession.js'
+import * as ComAtprotoServerRequestAccountDelete from './types/com/atproto/server/requestAccountDelete.js'
+import * as ComAtprotoServerRequestEmailConfirmation from './types/com/atproto/server/requestEmailConfirmation.js'
+import * as ComAtprotoServerRequestEmailUpdate from './types/com/atproto/server/requestEmailUpdate.js'
+import * as ComAtprotoServerRequestPasswordReset from './types/com/atproto/server/requestPasswordReset.js'
+import * as ComAtprotoServerReserveSigningKey from './types/com/atproto/server/reserveSigningKey.js'
+import * as ComAtprotoServerResetPassword from './types/com/atproto/server/resetPassword.js'
+import * as ComAtprotoServerRevokeAppPassword from './types/com/atproto/server/revokeAppPassword.js'
+import * as ComAtprotoServerUpdateEmail from './types/com/atproto/server/updateEmail.js'
+import * as ComAtprotoSyncGetBlob from './types/com/atproto/sync/getBlob.js'
+import * as ComAtprotoSyncGetBlocks from './types/com/atproto/sync/getBlocks.js'
+import * as ComAtprotoSyncGetCheckout from './types/com/atproto/sync/getCheckout.js'
+import * as ComAtprotoSyncGetHead from './types/com/atproto/sync/getHead.js'
+import * as ComAtprotoSyncGetLatestCommit from './types/com/atproto/sync/getLatestCommit.js'
+import * as ComAtprotoSyncGetRecord from './types/com/atproto/sync/getRecord.js'
+import * as ComAtprotoSyncGetRepo from './types/com/atproto/sync/getRepo.js'
+import * as ComAtprotoSyncGetRepoStatus from './types/com/atproto/sync/getRepoStatus.js'
+import * as ComAtprotoSyncListBlobs from './types/com/atproto/sync/listBlobs.js'
+import * as ComAtprotoSyncListRepos from './types/com/atproto/sync/listRepos.js'
+import * as ComAtprotoSyncNotifyOfUpdate from './types/com/atproto/sync/notifyOfUpdate.js'
+import * as ComAtprotoSyncRequestCrawl from './types/com/atproto/sync/requestCrawl.js'
+import * as ComAtprotoSyncSubscribeRepos from './types/com/atproto/sync/subscribeRepos.js'
+import * as ComAtprotoTempAddReservedHandle from './types/com/atproto/temp/addReservedHandle.js'
+import * as ComAtprotoTempCheckSignupQueue from './types/com/atproto/temp/checkSignupQueue.js'
+import * as ComAtprotoTempFetchLabels from './types/com/atproto/temp/fetchLabels.js'
+import * as ComAtprotoTempRequestPhoneVerification from './types/com/atproto/temp/requestPhoneVerification.js'
+import * as AppBskyActorGetPreferences from './types/app/bsky/actor/getPreferences.js'
+import * as AppBskyActorGetProfile from './types/app/bsky/actor/getProfile.js'
+import * as AppBskyActorGetProfiles from './types/app/bsky/actor/getProfiles.js'
+import * as AppBskyActorGetSuggestions from './types/app/bsky/actor/getSuggestions.js'
+import * as AppBskyActorPutPreferences from './types/app/bsky/actor/putPreferences.js'
+import * as AppBskyActorSearchActors from './types/app/bsky/actor/searchActors.js'
+import * as AppBskyActorSearchActorsTypeahead from './types/app/bsky/actor/searchActorsTypeahead.js'
+import * as AppBskyFeedDescribeFeedGenerator from './types/app/bsky/feed/describeFeedGenerator.js'
+import * as AppBskyFeedGetActorFeeds from './types/app/bsky/feed/getActorFeeds.js'
+import * as AppBskyFeedGetActorLikes from './types/app/bsky/feed/getActorLikes.js'
+import * as AppBskyFeedGetAuthorFeed from './types/app/bsky/feed/getAuthorFeed.js'
+import * as AppBskyFeedGetFeed from './types/app/bsky/feed/getFeed.js'
+import * as AppBskyFeedGetFeedGenerator from './types/app/bsky/feed/getFeedGenerator.js'
+import * as AppBskyFeedGetFeedGenerators from './types/app/bsky/feed/getFeedGenerators.js'
+import * as AppBskyFeedGetFeedSkeleton from './types/app/bsky/feed/getFeedSkeleton.js'
+import * as AppBskyFeedGetLikes from './types/app/bsky/feed/getLikes.js'
+import * as AppBskyFeedGetListFeed from './types/app/bsky/feed/getListFeed.js'
+import * as AppBskyFeedGetPostThread from './types/app/bsky/feed/getPostThread.js'
+import * as AppBskyFeedGetPosts from './types/app/bsky/feed/getPosts.js'
+import * as AppBskyFeedGetQuotes from './types/app/bsky/feed/getQuotes.js'
+import * as AppBskyFeedGetRepostedBy from './types/app/bsky/feed/getRepostedBy.js'
+import * as AppBskyFeedGetSuggestedFeeds from './types/app/bsky/feed/getSuggestedFeeds.js'
+import * as AppBskyFeedGetTimeline from './types/app/bsky/feed/getTimeline.js'
+import * as AppBskyFeedSearchPosts from './types/app/bsky/feed/searchPosts.js'
+import * as AppBskyFeedSendInteractions from './types/app/bsky/feed/sendInteractions.js'
+import * as AppBskyGraphGetActorStarterPacks from './types/app/bsky/graph/getActorStarterPacks.js'
+import * as AppBskyGraphGetBlocks from './types/app/bsky/graph/getBlocks.js'
+import * as AppBskyGraphGetFollowers from './types/app/bsky/graph/getFollowers.js'
+import * as AppBskyGraphGetFollows from './types/app/bsky/graph/getFollows.js'
+import * as AppBskyGraphGetKnownFollowers from './types/app/bsky/graph/getKnownFollowers.js'
+import * as AppBskyGraphGetList from './types/app/bsky/graph/getList.js'
+import * as AppBskyGraphGetListBlocks from './types/app/bsky/graph/getListBlocks.js'
+import * as AppBskyGraphGetListMutes from './types/app/bsky/graph/getListMutes.js'
+import * as AppBskyGraphGetLists from './types/app/bsky/graph/getLists.js'
+import * as AppBskyGraphGetMutes from './types/app/bsky/graph/getMutes.js'
+import * as AppBskyGraphGetRelationships from './types/app/bsky/graph/getRelationships.js'
+import * as AppBskyGraphGetStarterPack from './types/app/bsky/graph/getStarterPack.js'
+import * as AppBskyGraphGetStarterPacks from './types/app/bsky/graph/getStarterPacks.js'
+import * as AppBskyGraphGetSuggestedFollowsByActor from './types/app/bsky/graph/getSuggestedFollowsByActor.js'
+import * as AppBskyGraphMuteActor from './types/app/bsky/graph/muteActor.js'
+import * as AppBskyGraphMuteActorList from './types/app/bsky/graph/muteActorList.js'
+import * as AppBskyGraphMuteThread from './types/app/bsky/graph/muteThread.js'
+import * as AppBskyGraphSearchStarterPacks from './types/app/bsky/graph/searchStarterPacks.js'
+import * as AppBskyGraphUnmuteActor from './types/app/bsky/graph/unmuteActor.js'
+import * as AppBskyGraphUnmuteActorList from './types/app/bsky/graph/unmuteActorList.js'
+import * as AppBskyGraphUnmuteThread from './types/app/bsky/graph/unmuteThread.js'
+import * as AppBskyLabelerGetServices from './types/app/bsky/labeler/getServices.js'
+import * as AppBskyNotificationGetUnreadCount from './types/app/bsky/notification/getUnreadCount.js'
+import * as AppBskyNotificationListNotifications from './types/app/bsky/notification/listNotifications.js'
+import * as AppBskyNotificationPutPreferences from './types/app/bsky/notification/putPreferences.js'
+import * as AppBskyNotificationRegisterPush from './types/app/bsky/notification/registerPush.js'
+import * as AppBskyNotificationUpdateSeen from './types/app/bsky/notification/updateSeen.js'
+import * as AppBskyUnspeccedGetConfig from './types/app/bsky/unspecced/getConfig.js'
+import * as AppBskyUnspeccedGetPopularFeedGenerators from './types/app/bsky/unspecced/getPopularFeedGenerators.js'
+import * as AppBskyUnspeccedGetSuggestionsSkeleton from './types/app/bsky/unspecced/getSuggestionsSkeleton.js'
+import * as AppBskyUnspeccedGetTaggedSuggestions from './types/app/bsky/unspecced/getTaggedSuggestions.js'
+import * as AppBskyUnspeccedGetTrendingTopics from './types/app/bsky/unspecced/getTrendingTopics.js'
+import * as AppBskyUnspeccedSearchActorsSkeleton from './types/app/bsky/unspecced/searchActorsSkeleton.js'
+import * as AppBskyUnspeccedSearchPostsSkeleton from './types/app/bsky/unspecced/searchPostsSkeleton.js'
+import * as AppBskyUnspeccedSearchStarterPacksSkeleton from './types/app/bsky/unspecced/searchStarterPacksSkeleton.js'
+import * as AppBskyVideoGetJobStatus from './types/app/bsky/video/getJobStatus.js'
+import * as AppBskyVideoGetUploadLimits from './types/app/bsky/video/getUploadLimits.js'
+import * as AppBskyVideoUploadVideo from './types/app/bsky/video/uploadVideo.js'
+import * as ChatBskyActorDeleteAccount from './types/chat/bsky/actor/deleteAccount.js'
+import * as ChatBskyActorExportAccountData from './types/chat/bsky/actor/exportAccountData.js'
+import * as ChatBskyConvoDeleteMessageForSelf from './types/chat/bsky/convo/deleteMessageForSelf.js'
+import * as ChatBskyConvoGetConvo from './types/chat/bsky/convo/getConvo.js'
+import * as ChatBskyConvoGetConvoForMembers from './types/chat/bsky/convo/getConvoForMembers.js'
+import * as ChatBskyConvoGetLog from './types/chat/bsky/convo/getLog.js'
+import * as ChatBskyConvoGetMessages from './types/chat/bsky/convo/getMessages.js'
+import * as ChatBskyConvoLeaveConvo from './types/chat/bsky/convo/leaveConvo.js'
+import * as ChatBskyConvoListConvos from './types/chat/bsky/convo/listConvos.js'
+import * as ChatBskyConvoMuteConvo from './types/chat/bsky/convo/muteConvo.js'
+import * as ChatBskyConvoSendMessage from './types/chat/bsky/convo/sendMessage.js'
+import * as ChatBskyConvoSendMessageBatch from './types/chat/bsky/convo/sendMessageBatch.js'
+import * as ChatBskyConvoUnmuteConvo from './types/chat/bsky/convo/unmuteConvo.js'
+import * as ChatBskyConvoUpdateRead from './types/chat/bsky/convo/updateRead.js'
+import * as ChatBskyModerationGetActorMetadata from './types/chat/bsky/moderation/getActorMetadata.js'
+import * as ChatBskyModerationGetMessageContext from './types/chat/bsky/moderation/getMessageContext.js'
+import * as ChatBskyModerationUpdateActorAccess from './types/chat/bsky/moderation/updateActorAccess.js'
 
 export const COM_ATPROTO_MODERATION = {
   DefsReasonSpam: 'com.atproto.moderation.defs#reasonSpam',
diff --git a/packages/bsky/src/lexicon/lexicons.ts b/packages/bsky/src/lexicon/lexicons.ts
index f0392dccfde..bc01706426e 100644
--- a/packages/bsky/src/lexicon/lexicons.ts
+++ b/packages/bsky/src/lexicon/lexicons.ts
@@ -1,7 +1,13 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
-import { LexiconDoc, Lexicons } from '@atproto/lexicon'
+import {
+  LexiconDoc,
+  Lexicons,
+  ValidationError,
+  ValidationResult,
+} from '@atproto/lexicon'
+import { $Typed, is$typed, maybe$typed } from './util.js'
 
 export const schemaDict = {
   ComAtprotoAdminDefs: {
@@ -10933,8 +10939,37 @@ export const schemaDict = {
   },
 } as const satisfies Record<string, LexiconDoc>
 
-export const schemas = Object.values(schemaDict)
+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 = {
   ComAtprotoAdminDefs: 'com.atproto.admin.defs',
   ComAtprotoAdminDeleteAccount: 'com.atproto.admin.deleteAccount',
@@ -11145,4 +11180,4 @@ export const ids = {
   ChatBskyModerationGetActorMetadata: 'chat.bsky.moderation.getActorMetadata',
   ChatBskyModerationGetMessageContext: 'chat.bsky.moderation.getMessageContext',
   ChatBskyModerationUpdateActorAccess: 'chat.bsky.moderation.updateActorAccess',
-}
+} as const
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/defs.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/defs.ts
index 730b979dcea..d905d955114 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/defs.ts
@@ -2,16 +2,21 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as AppBskyGraphDefs from '../graph/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
-import * as AppBskyFeedThreadgate from '../feed/threadgate'
-import * as AppBskyFeedPostgate from '../feed/postgate'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as AppBskyGraphDefs from '../graph/defs.js'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
+import type * as AppBskyFeedThreadgate from '../feed/threadgate.js'
+import type * as AppBskyFeedPostgate from '../feed/postgate.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.defs'
 
 export interface ProfileViewBasic {
+  $type?: 'app.bsky.actor.defs#profileViewBasic'
   did: string
   handle: string
   displayName?: string
@@ -20,22 +25,20 @@ export interface ProfileViewBasic {
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
   createdAt?: string
-  [k: string]: unknown
 }
 
-export function isProfileViewBasic(v: unknown): v is ProfileViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileViewBasic'
-  )
+const hashProfileViewBasic = 'profileViewBasic'
+
+export function isProfileViewBasic<V>(v: V) {
+  return is$typed(v, id, hashProfileViewBasic)
 }
 
-export function validateProfileViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileViewBasic', v)
+export function validateProfileViewBasic<V>(v: V) {
+  return validate<ProfileViewBasic & V>(v, id, hashProfileViewBasic)
 }
 
 export interface ProfileView {
+  $type?: 'app.bsky.actor.defs#profileView'
   did: string
   handle: string
   displayName?: string
@@ -46,22 +49,20 @@ export interface ProfileView {
   createdAt?: string
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isProfileView(v: unknown): v is ProfileView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileView'
-  )
+const hashProfileView = 'profileView'
+
+export function isProfileView<V>(v: V) {
+  return is$typed(v, id, hashProfileView)
 }
 
-export function validateProfileView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileView', v)
+export function validateProfileView<V>(v: V) {
+  return validate<ProfileView & V>(v, id, hashProfileView)
 }
 
 export interface ProfileViewDetailed {
+  $type?: 'app.bsky.actor.defs#profileViewDetailed'
   did: string
   handle: string
   displayName?: string
@@ -78,63 +79,55 @@ export interface ProfileViewDetailed {
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
   pinnedPost?: ComAtprotoRepoStrongRef.Main
-  [k: string]: unknown
 }
 
-export function isProfileViewDetailed(v: unknown): v is ProfileViewDetailed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileViewDetailed'
-  )
+const hashProfileViewDetailed = 'profileViewDetailed'
+
+export function isProfileViewDetailed<V>(v: V) {
+  return is$typed(v, id, hashProfileViewDetailed)
 }
 
-export function validateProfileViewDetailed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileViewDetailed', v)
+export function validateProfileViewDetailed<V>(v: V) {
+  return validate<ProfileViewDetailed & V>(v, id, hashProfileViewDetailed)
 }
 
 export interface ProfileAssociated {
+  $type?: 'app.bsky.actor.defs#profileAssociated'
   lists?: number
   feedgens?: number
   starterPacks?: number
   labeler?: boolean
   chat?: ProfileAssociatedChat
-  [k: string]: unknown
 }
 
-export function isProfileAssociated(v: unknown): v is ProfileAssociated {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileAssociated'
-  )
+const hashProfileAssociated = 'profileAssociated'
+
+export function isProfileAssociated<V>(v: V) {
+  return is$typed(v, id, hashProfileAssociated)
 }
 
-export function validateProfileAssociated(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileAssociated', v)
+export function validateProfileAssociated<V>(v: V) {
+  return validate<ProfileAssociated & V>(v, id, hashProfileAssociated)
 }
 
 export interface ProfileAssociatedChat {
+  $type?: 'app.bsky.actor.defs#profileAssociatedChat'
   allowIncoming: 'all' | 'none' | 'following' | (string & {})
-  [k: string]: unknown
 }
 
-export function isProfileAssociatedChat(
-  v: unknown,
-): v is ProfileAssociatedChat {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileAssociatedChat'
-  )
+const hashProfileAssociatedChat = 'profileAssociatedChat'
+
+export function isProfileAssociatedChat<V>(v: V) {
+  return is$typed(v, id, hashProfileAssociatedChat)
 }
 
-export function validateProfileAssociatedChat(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileAssociatedChat', v)
+export function validateProfileAssociatedChat<V>(v: V) {
+  return validate<ProfileAssociatedChat & V>(v, id, hashProfileAssociatedChat)
 }
 
 /** Metadata about the requesting account's relationship with the subject account. Only has meaningful content for authed requests. */
 export interface ViewerState {
+  $type?: 'app.bsky.actor.defs#viewerState'
   muted?: boolean
   mutedByList?: AppBskyGraphDefs.ListViewBasic
   blockedBy?: boolean
@@ -143,169 +136,153 @@ export interface ViewerState {
   following?: string
   followedBy?: string
   knownFollowers?: KnownFollowers
-  [k: string]: unknown
 }
 
-export function isViewerState(v: unknown): v is ViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#viewerState'
-  )
+const hashViewerState = 'viewerState'
+
+export function isViewerState<V>(v: V) {
+  return is$typed(v, id, hashViewerState)
 }
 
-export function validateViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#viewerState', v)
+export function validateViewerState<V>(v: V) {
+  return validate<ViewerState & V>(v, id, hashViewerState)
 }
 
 /** The subject's followers whom you also follow */
 export interface KnownFollowers {
+  $type?: 'app.bsky.actor.defs#knownFollowers'
   count: number
   followers: ProfileViewBasic[]
-  [k: string]: unknown
 }
 
-export function isKnownFollowers(v: unknown): v is KnownFollowers {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#knownFollowers'
-  )
+const hashKnownFollowers = 'knownFollowers'
+
+export function isKnownFollowers<V>(v: V) {
+  return is$typed(v, id, hashKnownFollowers)
 }
 
-export function validateKnownFollowers(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#knownFollowers', v)
+export function validateKnownFollowers<V>(v: V) {
+  return validate<KnownFollowers & V>(v, id, hashKnownFollowers)
 }
 
 export type Preferences = (
-  | AdultContentPref
-  | ContentLabelPref
-  | SavedFeedsPref
-  | SavedFeedsPrefV2
-  | PersonalDetailsPref
-  | FeedViewPref
-  | ThreadViewPref
-  | InterestsPref
-  | MutedWordsPref
-  | HiddenPostsPref
-  | BskyAppStatePref
-  | LabelersPref
-  | PostInteractionSettingsPref
-  | { $type: string; [k: string]: unknown }
+  | $Typed<AdultContentPref>
+  | $Typed<ContentLabelPref>
+  | $Typed<SavedFeedsPref>
+  | $Typed<SavedFeedsPrefV2>
+  | $Typed<PersonalDetailsPref>
+  | $Typed<FeedViewPref>
+  | $Typed<ThreadViewPref>
+  | $Typed<InterestsPref>
+  | $Typed<MutedWordsPref>
+  | $Typed<HiddenPostsPref>
+  | $Typed<BskyAppStatePref>
+  | $Typed<LabelersPref>
+  | $Typed<PostInteractionSettingsPref>
+  | { $type: string }
 )[]
 
 export interface AdultContentPref {
+  $type?: 'app.bsky.actor.defs#adultContentPref'
   enabled: boolean
-  [k: string]: unknown
 }
 
-export function isAdultContentPref(v: unknown): v is AdultContentPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#adultContentPref'
-  )
+const hashAdultContentPref = 'adultContentPref'
+
+export function isAdultContentPref<V>(v: V) {
+  return is$typed(v, id, hashAdultContentPref)
 }
 
-export function validateAdultContentPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#adultContentPref', v)
+export function validateAdultContentPref<V>(v: V) {
+  return validate<AdultContentPref & V>(v, id, hashAdultContentPref)
 }
 
 export interface ContentLabelPref {
+  $type?: 'app.bsky.actor.defs#contentLabelPref'
   /** Which labeler does this preference apply to? If undefined, applies globally. */
   labelerDid?: string
   label: string
   visibility: 'ignore' | 'show' | 'warn' | 'hide' | (string & {})
-  [k: string]: unknown
 }
 
-export function isContentLabelPref(v: unknown): v is ContentLabelPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#contentLabelPref'
-  )
+const hashContentLabelPref = 'contentLabelPref'
+
+export function isContentLabelPref<V>(v: V) {
+  return is$typed(v, id, hashContentLabelPref)
 }
 
-export function validateContentLabelPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#contentLabelPref', v)
+export function validateContentLabelPref<V>(v: V) {
+  return validate<ContentLabelPref & V>(v, id, hashContentLabelPref)
 }
 
 export interface SavedFeed {
+  $type?: 'app.bsky.actor.defs#savedFeed'
   id: string
   type: 'feed' | 'list' | 'timeline' | (string & {})
   value: string
   pinned: boolean
-  [k: string]: unknown
 }
 
-export function isSavedFeed(v: unknown): v is SavedFeed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeed'
-  )
+const hashSavedFeed = 'savedFeed'
+
+export function isSavedFeed<V>(v: V) {
+  return is$typed(v, id, hashSavedFeed)
 }
 
-export function validateSavedFeed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeed', v)
+export function validateSavedFeed<V>(v: V) {
+  return validate<SavedFeed & V>(v, id, hashSavedFeed)
 }
 
 export interface SavedFeedsPrefV2 {
+  $type?: 'app.bsky.actor.defs#savedFeedsPrefV2'
   items: SavedFeed[]
-  [k: string]: unknown
 }
 
-export function isSavedFeedsPrefV2(v: unknown): v is SavedFeedsPrefV2 {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeedsPrefV2'
-  )
+const hashSavedFeedsPrefV2 = 'savedFeedsPrefV2'
+
+export function isSavedFeedsPrefV2<V>(v: V) {
+  return is$typed(v, id, hashSavedFeedsPrefV2)
 }
 
-export function validateSavedFeedsPrefV2(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeedsPrefV2', v)
+export function validateSavedFeedsPrefV2<V>(v: V) {
+  return validate<SavedFeedsPrefV2 & V>(v, id, hashSavedFeedsPrefV2)
 }
 
 export interface SavedFeedsPref {
+  $type?: 'app.bsky.actor.defs#savedFeedsPref'
   pinned: string[]
   saved: string[]
   timelineIndex?: number
-  [k: string]: unknown
 }
 
-export function isSavedFeedsPref(v: unknown): v is SavedFeedsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeedsPref'
-  )
+const hashSavedFeedsPref = 'savedFeedsPref'
+
+export function isSavedFeedsPref<V>(v: V) {
+  return is$typed(v, id, hashSavedFeedsPref)
 }
 
-export function validateSavedFeedsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeedsPref', v)
+export function validateSavedFeedsPref<V>(v: V) {
+  return validate<SavedFeedsPref & V>(v, id, hashSavedFeedsPref)
 }
 
 export interface PersonalDetailsPref {
+  $type?: 'app.bsky.actor.defs#personalDetailsPref'
   /** The birth date of account owner. */
   birthDate?: string
-  [k: string]: unknown
 }
 
-export function isPersonalDetailsPref(v: unknown): v is PersonalDetailsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#personalDetailsPref'
-  )
+const hashPersonalDetailsPref = 'personalDetailsPref'
+
+export function isPersonalDetailsPref<V>(v: V) {
+  return is$typed(v, id, hashPersonalDetailsPref)
 }
 
-export function validatePersonalDetailsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#personalDetailsPref', v)
+export function validatePersonalDetailsPref<V>(v: V) {
+  return validate<PersonalDetailsPref & V>(v, id, hashPersonalDetailsPref)
 }
 
 export interface FeedViewPref {
+  $type?: 'app.bsky.actor.defs#feedViewPref'
   /** The URI of the feed, or an identifier which describes the feed. */
   feed: string
   /** Hide replies in the feed. */
@@ -318,22 +295,20 @@ export interface FeedViewPref {
   hideReposts?: boolean
   /** Hide quote posts in the feed. */
   hideQuotePosts?: boolean
-  [k: string]: unknown
 }
 
-export function isFeedViewPref(v: unknown): v is FeedViewPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#feedViewPref'
-  )
+const hashFeedViewPref = 'feedViewPref'
+
+export function isFeedViewPref<V>(v: V) {
+  return is$typed(v, id, hashFeedViewPref)
 }
 
-export function validateFeedViewPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#feedViewPref', v)
+export function validateFeedViewPref<V>(v: V) {
+  return validate<FeedViewPref & V>(v, id, hashFeedViewPref)
 }
 
 export interface ThreadViewPref {
+  $type?: 'app.bsky.actor.defs#threadViewPref'
   /** Sorting mode for threads. */
   sort?:
     | 'oldest'
@@ -344,43 +319,39 @@ export interface ThreadViewPref {
     | (string & {})
   /** Show followed users at the top of all replies. */
   prioritizeFollowedUsers?: boolean
-  [k: string]: unknown
 }
 
-export function isThreadViewPref(v: unknown): v is ThreadViewPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#threadViewPref'
-  )
+const hashThreadViewPref = 'threadViewPref'
+
+export function isThreadViewPref<V>(v: V) {
+  return is$typed(v, id, hashThreadViewPref)
 }
 
-export function validateThreadViewPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#threadViewPref', v)
+export function validateThreadViewPref<V>(v: V) {
+  return validate<ThreadViewPref & V>(v, id, hashThreadViewPref)
 }
 
 export interface InterestsPref {
+  $type?: 'app.bsky.actor.defs#interestsPref'
   /** A list of tags which describe the account owner's interests gathered during onboarding. */
   tags: string[]
-  [k: string]: unknown
 }
 
-export function isInterestsPref(v: unknown): v is InterestsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#interestsPref'
-  )
+const hashInterestsPref = 'interestsPref'
+
+export function isInterestsPref<V>(v: V) {
+  return is$typed(v, id, hashInterestsPref)
 }
 
-export function validateInterestsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#interestsPref', v)
+export function validateInterestsPref<V>(v: V) {
+  return validate<InterestsPref & V>(v, id, hashInterestsPref)
 }
 
 export type MutedWordTarget = 'content' | 'tag' | (string & {})
 
 /** A word that the account owner has muted. */
 export interface MutedWord {
+  $type?: 'app.bsky.actor.defs#mutedWord'
   id?: string
   /** The muted word itself. */
   value: string
@@ -390,182 +361,165 @@ export interface MutedWord {
   actorTarget: 'all' | 'exclude-following' | (string & {})
   /** The date and time at which the muted word will expire and no longer be applied. */
   expiresAt?: string
-  [k: string]: unknown
 }
 
-export function isMutedWord(v: unknown): v is MutedWord {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#mutedWord'
-  )
+const hashMutedWord = 'mutedWord'
+
+export function isMutedWord<V>(v: V) {
+  return is$typed(v, id, hashMutedWord)
 }
 
-export function validateMutedWord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#mutedWord', v)
+export function validateMutedWord<V>(v: V) {
+  return validate<MutedWord & V>(v, id, hashMutedWord)
 }
 
 export interface MutedWordsPref {
+  $type?: 'app.bsky.actor.defs#mutedWordsPref'
   /** A list of words the account owner has muted. */
   items: MutedWord[]
-  [k: string]: unknown
 }
 
-export function isMutedWordsPref(v: unknown): v is MutedWordsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#mutedWordsPref'
-  )
+const hashMutedWordsPref = 'mutedWordsPref'
+
+export function isMutedWordsPref<V>(v: V) {
+  return is$typed(v, id, hashMutedWordsPref)
 }
 
-export function validateMutedWordsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#mutedWordsPref', v)
+export function validateMutedWordsPref<V>(v: V) {
+  return validate<MutedWordsPref & V>(v, id, hashMutedWordsPref)
 }
 
 export interface HiddenPostsPref {
+  $type?: 'app.bsky.actor.defs#hiddenPostsPref'
   /** A list of URIs of posts the account owner has hidden. */
   items: string[]
-  [k: string]: unknown
 }
 
-export function isHiddenPostsPref(v: unknown): v is HiddenPostsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#hiddenPostsPref'
-  )
+const hashHiddenPostsPref = 'hiddenPostsPref'
+
+export function isHiddenPostsPref<V>(v: V) {
+  return is$typed(v, id, hashHiddenPostsPref)
 }
 
-export function validateHiddenPostsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#hiddenPostsPref', v)
+export function validateHiddenPostsPref<V>(v: V) {
+  return validate<HiddenPostsPref & V>(v, id, hashHiddenPostsPref)
 }
 
 export interface LabelersPref {
+  $type?: 'app.bsky.actor.defs#labelersPref'
   labelers: LabelerPrefItem[]
-  [k: string]: unknown
 }
 
-export function isLabelersPref(v: unknown): v is LabelersPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#labelersPref'
-  )
+const hashLabelersPref = 'labelersPref'
+
+export function isLabelersPref<V>(v: V) {
+  return is$typed(v, id, hashLabelersPref)
 }
 
-export function validateLabelersPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#labelersPref', v)
+export function validateLabelersPref<V>(v: V) {
+  return validate<LabelersPref & V>(v, id, hashLabelersPref)
 }
 
 export interface LabelerPrefItem {
+  $type?: 'app.bsky.actor.defs#labelerPrefItem'
   did: string
-  [k: string]: unknown
 }
 
-export function isLabelerPrefItem(v: unknown): v is LabelerPrefItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#labelerPrefItem'
-  )
+const hashLabelerPrefItem = 'labelerPrefItem'
+
+export function isLabelerPrefItem<V>(v: V) {
+  return is$typed(v, id, hashLabelerPrefItem)
 }
 
-export function validateLabelerPrefItem(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#labelerPrefItem', v)
+export function validateLabelerPrefItem<V>(v: V) {
+  return validate<LabelerPrefItem & V>(v, id, hashLabelerPrefItem)
 }
 
 /** A grab bag of state that's specific to the bsky.app program. Third-party apps shouldn't use this. */
 export interface BskyAppStatePref {
+  $type?: 'app.bsky.actor.defs#bskyAppStatePref'
   activeProgressGuide?: BskyAppProgressGuide
   /** An array of tokens which identify nudges (modals, popups, tours, highlight dots) that should be shown to the user. */
   queuedNudges?: string[]
   /** Storage for NUXs the user has encountered. */
   nuxs?: Nux[]
-  [k: string]: unknown
 }
 
-export function isBskyAppStatePref(v: unknown): v is BskyAppStatePref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#bskyAppStatePref'
-  )
+const hashBskyAppStatePref = 'bskyAppStatePref'
+
+export function isBskyAppStatePref<V>(v: V) {
+  return is$typed(v, id, hashBskyAppStatePref)
 }
 
-export function validateBskyAppStatePref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#bskyAppStatePref', v)
+export function validateBskyAppStatePref<V>(v: V) {
+  return validate<BskyAppStatePref & V>(v, id, hashBskyAppStatePref)
 }
 
 /** If set, an active progress guide. Once completed, can be set to undefined. Should have unspecced fields tracking progress. */
 export interface BskyAppProgressGuide {
+  $type?: 'app.bsky.actor.defs#bskyAppProgressGuide'
   guide: string
-  [k: string]: unknown
 }
 
-export function isBskyAppProgressGuide(v: unknown): v is BskyAppProgressGuide {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#bskyAppProgressGuide'
-  )
+const hashBskyAppProgressGuide = 'bskyAppProgressGuide'
+
+export function isBskyAppProgressGuide<V>(v: V) {
+  return is$typed(v, id, hashBskyAppProgressGuide)
 }
 
-export function validateBskyAppProgressGuide(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#bskyAppProgressGuide', v)
+export function validateBskyAppProgressGuide<V>(v: V) {
+  return validate<BskyAppProgressGuide & V>(v, id, hashBskyAppProgressGuide)
 }
 
 /** A new user experiences (NUX) storage object */
 export interface Nux {
+  $type?: 'app.bsky.actor.defs#nux'
   id: string
   completed: boolean
   /** Arbitrary data for the NUX. The structure is defined by the NUX itself. Limited to 300 characters. */
   data?: string
   /** The date and time at which the NUX will expire and should be considered completed. */
   expiresAt?: string
-  [k: string]: unknown
 }
 
-export function isNux(v: unknown): v is Nux {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.actor.defs#nux'
-  )
+const hashNux = 'nux'
+
+export function isNux<V>(v: V) {
+  return is$typed(v, id, hashNux)
 }
 
-export function validateNux(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#nux', v)
+export function validateNux<V>(v: V) {
+  return validate<Nux & V>(v, id, hashNux)
 }
 
 /** Default post interaction settings for the account. These values should be applied as default values when creating new posts. These refs should mirror the threadgate and postgate records exactly. */
 export interface PostInteractionSettingsPref {
+  $type?: 'app.bsky.actor.defs#postInteractionSettingsPref'
   /** Matches threadgate record. List of rules defining who can reply to this users posts. If value is an empty array, no one can reply. If value is undefined, anyone can reply. */
   threadgateAllowRules?: (
-    | AppBskyFeedThreadgate.MentionRule
-    | AppBskyFeedThreadgate.FollowerRule
-    | AppBskyFeedThreadgate.FollowingRule
-    | AppBskyFeedThreadgate.ListRule
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyFeedThreadgate.MentionRule>
+    | $Typed<AppBskyFeedThreadgate.FollowerRule>
+    | $Typed<AppBskyFeedThreadgate.FollowingRule>
+    | $Typed<AppBskyFeedThreadgate.ListRule>
+    | { $type: string }
   )[]
   /** Matches postgate record. List of rules defining who can embed this users posts. If value is an empty array or is undefined, no particular rules apply and anyone can embed. */
   postgateEmbeddingRules?: (
-    | AppBskyFeedPostgate.DisableRule
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyFeedPostgate.DisableRule>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
-export function isPostInteractionSettingsPref(
-  v: unknown,
-): v is PostInteractionSettingsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#postInteractionSettingsPref'
-  )
+const hashPostInteractionSettingsPref = 'postInteractionSettingsPref'
+
+export function isPostInteractionSettingsPref<V>(v: V) {
+  return is$typed(v, id, hashPostInteractionSettingsPref)
 }
 
-export function validatePostInteractionSettingsPref(
-  v: unknown,
-): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#postInteractionSettingsPref', v)
+export function validatePostInteractionSettingsPref<V>(v: V) {
+  return validate<PostInteractionSettingsPref & V>(
+    v,
+    id,
+    hashPostInteractionSettingsPref,
+  )
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/getPreferences.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/getPreferences.ts
index f839ece0a4d..f81e927ac0d 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/getPreferences.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/getPreferences.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.getPreferences'
 
 export interface QueryParams {}
 
@@ -15,7 +19,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   preferences: AppBskyActorDefs.Preferences
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/getProfile.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/getProfile.ts
index f9163fcf168..4c83033afa4 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/getProfile.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/getProfile.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.getProfile'
 
 export interface QueryParams {
   /** Handle or DID of account to fetch profile of. */
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/getProfiles.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/getProfiles.ts
index 5c2ffb1f2cc..a520bb53a93 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/getProfiles.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/getProfiles.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.getProfiles'
 
 export interface QueryParams {
   actors: string[]
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   profiles: AppBskyActorDefs.ProfileViewDetailed[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/getSuggestions.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/getSuggestions.ts
index c7e254261a1..9001835fa2d 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/getSuggestions.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/getSuggestions.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.getSuggestions'
 
 export interface QueryParams {
   limit: number
@@ -21,7 +25,6 @@ export interface OutputSchema {
   actors: AppBskyActorDefs.ProfileView[]
   /** Snowflake for this recommendation, use when submitting recommendation events. */
   recId?: number
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/profile.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/profile.ts
index 617bdf2cd73..e5bb9da321b 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/profile.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/profile.ts
@@ -2,13 +2,18 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.profile'
 
 export interface Record {
+  $type: 'app.bsky.actor.profile'
   displayName?: string
   /** Free-form profile description text. */
   description?: string
@@ -16,24 +21,19 @@ export interface Record {
   avatar?: BlobRef
   /** Larger horizontal image to display behind profile view. */
   banner?: BlobRef
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   joinedViaStarterPack?: ComAtprotoRepoStrongRef.Main
   pinnedPost?: ComAtprotoRepoStrongRef.Main
   createdAt?: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.actor.profile#main' ||
-      v.$type === 'app.bsky.actor.profile')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.profile#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/putPreferences.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/putPreferences.ts
index 59aea81c2da..922fc9b2fdf 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/putPreferences.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/putPreferences.ts
@@ -3,17 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.putPreferences'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   preferences: AppBskyActorDefs.Preferences
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/searchActors.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/searchActors.ts
index ebd81ececc5..74a1fbb6d97 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/searchActors.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/searchActors.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.searchActors'
 
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead. */
@@ -23,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   actors: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
index b7e9831b21d..09e307aa2df 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.searchActorsTypeahead'
 
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead. */
@@ -21,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   actors: AppBskyActorDefs.ProfileViewBasic[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/embed/defs.ts b/packages/bsky/src/lexicon/types/app/bsky/embed/defs.ts
index cc253f9e610..adf61115464 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/embed/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/embed/defs.ts
@@ -2,25 +2,27 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.embed.defs'
 
 /** width:height represents an aspect ratio. It may be approximate, and may not correspond to absolute dimensions in any given unit. */
 export interface AspectRatio {
+  $type?: 'app.bsky.embed.defs#aspectRatio'
   width: number
   height: number
-  [k: string]: unknown
 }
 
-export function isAspectRatio(v: unknown): v is AspectRatio {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.defs#aspectRatio'
-  )
+const hashAspectRatio = 'aspectRatio'
+
+export function isAspectRatio<V>(v: V) {
+  return is$typed(v, id, hashAspectRatio)
 }
 
-export function validateAspectRatio(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.defs#aspectRatio', v)
+export function validateAspectRatio<V>(v: V) {
+  return validate<AspectRatio & V>(v, id, hashAspectRatio)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/embed/external.ts b/packages/bsky/src/lexicon/types/app/bsky/embed/external.ts
index b137ee4b6f5..5a38d1e3846 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/embed/external.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/embed/external.ts
@@ -2,82 +2,77 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.embed.external'
 
 /** A representation of some externally linked content (eg, a URL and 'card'), embedded in a Bluesky record (eg, a post). */
 export interface Main {
+  $type?: 'app.bsky.embed.external'
   external: External
-  [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.external#main' ||
-      v.$type === 'app.bsky.embed.external')
-  )
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#main', v)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
 export interface External {
+  $type?: 'app.bsky.embed.external#external'
   uri: string
   title: string
   description: string
   thumb?: BlobRef
-  [k: string]: unknown
 }
 
-export function isExternal(v: unknown): v is External {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#external'
-  )
+const hashExternal = 'external'
+
+export function isExternal<V>(v: V) {
+  return is$typed(v, id, hashExternal)
 }
 
-export function validateExternal(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#external', v)
+export function validateExternal<V>(v: V) {
+  return validate<External & V>(v, id, hashExternal)
 }
 
 export interface View {
+  $type?: 'app.bsky.embed.external#view'
   external: ViewExternal
-  [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#view'
-  )
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#view', v)
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
 
 export interface ViewExternal {
+  $type?: 'app.bsky.embed.external#viewExternal'
   uri: string
   title: string
   description: string
   thumb?: string
-  [k: string]: unknown
 }
 
-export function isViewExternal(v: unknown): v is ViewExternal {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#viewExternal'
-  )
+const hashViewExternal = 'viewExternal'
+
+export function isViewExternal<V>(v: V) {
+  return is$typed(v, id, hashViewExternal)
 }
 
-export function validateViewExternal(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#viewExternal', v)
+export function validateViewExternal<V>(v: V) {
+  return validate<ViewExternal & V>(v, id, hashViewExternal)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/embed/images.ts b/packages/bsky/src/lexicon/types/app/bsky/embed/images.ts
index 1fddf42f8eb..26b6d965235 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/embed/images.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/embed/images.ts
@@ -2,63 +2,65 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyEmbedDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyEmbedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.embed.images'
 
 export interface Main {
+  $type?: 'app.bsky.embed.images'
   images: Image[]
-  [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.images#main' ||
-      v.$type === 'app.bsky.embed.images')
-  )
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#main', v)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
 export interface Image {
+  $type?: 'app.bsky.embed.images#image'
   image: BlobRef
   /** Alt text description of the image, for accessibility. */
   alt: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isImage(v: unknown): v is Image {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.images#image'
-  )
+const hashImage = 'image'
+
+export function isImage<V>(v: V) {
+  return is$typed(v, id, hashImage)
 }
 
-export function validateImage(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#image', v)
+export function validateImage<V>(v: V) {
+  return validate<Image & V>(v, id, hashImage)
 }
 
 export interface View {
+  $type?: 'app.bsky.embed.images#view'
   images: ViewImage[]
-  [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.images#view'
-  )
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#view', v)
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
 
 export interface ViewImage {
+  $type?: 'app.bsky.embed.images#viewImage'
   /** Fully-qualified URL where a thumbnail of the image can be fetched. For example, CDN location provided by the App View. */
   thumb: string
   /** Fully-qualified URL where a large version of the image can be fetched. May or may not be the exact original blob. For example, CDN location provided by the App View. */
@@ -66,17 +68,14 @@ export interface ViewImage {
   /** Alt text description of the image, for accessibility. */
   alt: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isViewImage(v: unknown): v is ViewImage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.images#viewImage'
-  )
+const hashViewImage = 'viewImage'
+
+export function isViewImage<V>(v: V) {
+  return is$typed(v, id, hashViewImage)
 }
 
-export function validateViewImage(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#viewImage', v)
+export function validateViewImage<V>(v: V) {
+  return validate<ViewImage & V>(v, id, hashViewImage)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/embed/record.ts b/packages/bsky/src/lexicon/types/app/bsky/embed/record.ts
index 452c8fb7f71..9fd1aee2be3 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/embed/record.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/embed/record.ts
@@ -2,148 +2,141 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
-import * as AppBskyFeedDefs from '../feed/defs'
-import * as AppBskyGraphDefs from '../graph/defs'
-import * as AppBskyLabelerDefs from '../labeler/defs'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as AppBskyEmbedImages from './images'
-import * as AppBskyEmbedVideo from './video'
-import * as AppBskyEmbedExternal from './external'
-import * as AppBskyEmbedRecordWithMedia from './recordWithMedia'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
+import type * as AppBskyFeedDefs from '../feed/defs.js'
+import type * as AppBskyGraphDefs from '../graph/defs.js'
+import type * as AppBskyLabelerDefs from '../labeler/defs.js'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as AppBskyEmbedImages from './images.js'
+import type * as AppBskyEmbedVideo from './video.js'
+import type * as AppBskyEmbedExternal from './external.js'
+import type * as AppBskyEmbedRecordWithMedia from './recordWithMedia.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.embed.record'
 
 export interface Main {
+  $type?: 'app.bsky.embed.record'
   record: ComAtprotoRepoStrongRef.Main
-  [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.record#main' ||
-      v.$type === 'app.bsky.embed.record')
-  )
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#main', v)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
 export interface View {
+  $type?: 'app.bsky.embed.record#view'
   record:
-    | ViewRecord
-    | ViewNotFound
-    | ViewBlocked
-    | ViewDetached
-    | AppBskyFeedDefs.GeneratorView
-    | AppBskyGraphDefs.ListView
-    | AppBskyLabelerDefs.LabelerView
-    | AppBskyGraphDefs.StarterPackViewBasic
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<ViewRecord>
+    | $Typed<ViewNotFound>
+    | $Typed<ViewBlocked>
+    | $Typed<ViewDetached>
+    | $Typed<AppBskyFeedDefs.GeneratorView>
+    | $Typed<AppBskyGraphDefs.ListView>
+    | $Typed<AppBskyLabelerDefs.LabelerView>
+    | $Typed<AppBskyGraphDefs.StarterPackViewBasic>
+    | { $type: string }
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.record#view'
-  )
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#view', v)
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
 
 export interface ViewRecord {
+  $type?: 'app.bsky.embed.record#viewRecord'
   uri: string
   cid: string
   author: AppBskyActorDefs.ProfileViewBasic
   /** The record data itself. */
-  value: {}
+  value: { [_ in string]: unknown }
   labels?: ComAtprotoLabelDefs.Label[]
   replyCount?: number
   repostCount?: number
   likeCount?: number
   quoteCount?: number
   embeds?: (
-    | AppBskyEmbedImages.View
-    | AppBskyEmbedVideo.View
-    | AppBskyEmbedExternal.View
-    | View
-    | AppBskyEmbedRecordWithMedia.View
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyEmbedImages.View>
+    | $Typed<AppBskyEmbedVideo.View>
+    | $Typed<AppBskyEmbedExternal.View>
+    | $Typed<View>
+    | $Typed<AppBskyEmbedRecordWithMedia.View>
+    | { $type: string }
   )[]
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isViewRecord(v: unknown): v is ViewRecord {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewRecord'
-  )
+const hashViewRecord = 'viewRecord'
+
+export function isViewRecord<V>(v: V) {
+  return is$typed(v, id, hashViewRecord)
 }
 
-export function validateViewRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewRecord', v)
+export function validateViewRecord<V>(v: V) {
+  return validate<ViewRecord & V>(v, id, hashViewRecord)
 }
 
 export interface ViewNotFound {
+  $type?: 'app.bsky.embed.record#viewNotFound'
   uri: string
   notFound: true
-  [k: string]: unknown
 }
 
-export function isViewNotFound(v: unknown): v is ViewNotFound {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewNotFound'
-  )
+const hashViewNotFound = 'viewNotFound'
+
+export function isViewNotFound<V>(v: V) {
+  return is$typed(v, id, hashViewNotFound)
 }
 
-export function validateViewNotFound(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewNotFound', v)
+export function validateViewNotFound<V>(v: V) {
+  return validate<ViewNotFound & V>(v, id, hashViewNotFound)
 }
 
 export interface ViewBlocked {
+  $type?: 'app.bsky.embed.record#viewBlocked'
   uri: string
   blocked: true
   author: AppBskyFeedDefs.BlockedAuthor
-  [k: string]: unknown
 }
 
-export function isViewBlocked(v: unknown): v is ViewBlocked {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewBlocked'
-  )
+const hashViewBlocked = 'viewBlocked'
+
+export function isViewBlocked<V>(v: V) {
+  return is$typed(v, id, hashViewBlocked)
 }
 
-export function validateViewBlocked(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewBlocked', v)
+export function validateViewBlocked<V>(v: V) {
+  return validate<ViewBlocked & V>(v, id, hashViewBlocked)
 }
 
 export interface ViewDetached {
+  $type?: 'app.bsky.embed.record#viewDetached'
   uri: string
   detached: true
-  [k: string]: unknown
 }
 
-export function isViewDetached(v: unknown): v is ViewDetached {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewDetached'
-  )
+const hashViewDetached = 'viewDetached'
+
+export function isViewDetached<V>(v: V) {
+  return is$typed(v, id, hashViewDetached)
 }
 
-export function validateViewDetached(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewDetached', v)
+export function validateViewDetached<V>(v: V) {
+  return validate<ViewDetached & V>(v, id, hashViewDetached)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/embed/recordWithMedia.ts b/packages/bsky/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
index 4df0ee5c2d7..2c36a988cc7 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
@@ -2,55 +2,54 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyEmbedRecord from './record'
-import * as AppBskyEmbedImages from './images'
-import * as AppBskyEmbedVideo from './video'
-import * as AppBskyEmbedExternal from './external'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyEmbedRecord from './record.js'
+import type * as AppBskyEmbedImages from './images.js'
+import type * as AppBskyEmbedVideo from './video.js'
+import type * as AppBskyEmbedExternal from './external.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.embed.recordWithMedia'
 
 export interface Main {
+  $type?: 'app.bsky.embed.recordWithMedia'
   record: AppBskyEmbedRecord.Main
   media:
-    | AppBskyEmbedImages.Main
-    | AppBskyEmbedVideo.Main
-    | AppBskyEmbedExternal.Main
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<AppBskyEmbedImages.Main>
+    | $Typed<AppBskyEmbedVideo.Main>
+    | $Typed<AppBskyEmbedExternal.Main>
+    | { $type: string }
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.recordWithMedia#main' ||
-      v.$type === 'app.bsky.embed.recordWithMedia')
-  )
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.recordWithMedia#main', v)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
 export interface View {
+  $type?: 'app.bsky.embed.recordWithMedia#view'
   record: AppBskyEmbedRecord.View
   media:
-    | AppBskyEmbedImages.View
-    | AppBskyEmbedVideo.View
-    | AppBskyEmbedExternal.View
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<AppBskyEmbedImages.View>
+    | $Typed<AppBskyEmbedVideo.View>
+    | $Typed<AppBskyEmbedExternal.View>
+    | { $type: string }
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.recordWithMedia#view'
-  )
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.recordWithMedia#view', v)
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/embed/video.ts b/packages/bsky/src/lexicon/types/app/bsky/embed/video.ts
index 50eb59aa038..10e59e37539 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/embed/video.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/embed/video.ts
@@ -2,66 +2,65 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyEmbedDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyEmbedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.embed.video'
 
 export interface Main {
+  $type?: 'app.bsky.embed.video'
   video: BlobRef
   captions?: Caption[]
   /** Alt text description of the video, for accessibility. */
   alt?: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.video#main' ||
-      v.$type === 'app.bsky.embed.video')
-  )
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#main', v)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
 export interface Caption {
+  $type?: 'app.bsky.embed.video#caption'
   lang: string
   file: BlobRef
-  [k: string]: unknown
 }
 
-export function isCaption(v: unknown): v is Caption {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.video#caption'
-  )
+const hashCaption = 'caption'
+
+export function isCaption<V>(v: V) {
+  return is$typed(v, id, hashCaption)
 }
 
-export function validateCaption(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#caption', v)
+export function validateCaption<V>(v: V) {
+  return validate<Caption & V>(v, id, hashCaption)
 }
 
 export interface View {
+  $type?: 'app.bsky.embed.video#view'
   cid: string
   playlist: string
   thumbnail?: string
   alt?: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.video#view'
-  )
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#view', v)
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/defs.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/defs.ts
index fdf7e58c8a3..f94aaefa7e9 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/defs.ts
@@ -2,31 +2,36 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as AppBskyEmbedImages from '../embed/images'
-import * as AppBskyEmbedVideo from '../embed/video'
-import * as AppBskyEmbedExternal from '../embed/external'
-import * as AppBskyEmbedRecord from '../embed/record'
-import * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as AppBskyGraphDefs from '../graph/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+import type * as AppBskyEmbedImages from '../embed/images.js'
+import type * as AppBskyEmbedVideo from '../embed/video.js'
+import type * as AppBskyEmbedExternal from '../embed/external.js'
+import type * as AppBskyEmbedRecord from '../embed/record.js'
+import type * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as AppBskyRichtextFacet from '../richtext/facet.js'
+import type * as AppBskyGraphDefs from '../graph/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.defs'
 
 export interface PostView {
+  $type?: 'app.bsky.feed.defs#postView'
   uri: string
   cid: string
   author: AppBskyActorDefs.ProfileViewBasic
-  record: {}
+  record: { [_ in string]: unknown }
   embed?:
-    | AppBskyEmbedImages.View
-    | AppBskyEmbedVideo.View
-    | AppBskyEmbedExternal.View
-    | AppBskyEmbedRecord.View
-    | AppBskyEmbedRecordWithMedia.View
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyEmbedImages.View>
+    | $Typed<AppBskyEmbedVideo.View>
+    | $Typed<AppBskyEmbedExternal.View>
+    | $Typed<AppBskyEmbedRecord.View>
+    | $Typed<AppBskyEmbedRecordWithMedia.View>
+    | { $type: string }
   replyCount?: number
   repostCount?: number
   likeCount?: number
@@ -35,225 +40,207 @@ export interface PostView {
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
   threadgate?: ThreadgateView
-  [k: string]: unknown
 }
 
-export function isPostView(v: unknown): v is PostView {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.defs#postView'
-  )
+const hashPostView = 'postView'
+
+export function isPostView<V>(v: V) {
+  return is$typed(v, id, hashPostView)
 }
 
-export function validatePostView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#postView', v)
+export function validatePostView<V>(v: V) {
+  return validate<PostView & V>(v, id, hashPostView)
 }
 
 /** Metadata about the requesting account's relationship with the subject content. Only has meaningful content for authed requests. */
 export interface ViewerState {
+  $type?: 'app.bsky.feed.defs#viewerState'
   repost?: string
   like?: string
   threadMuted?: boolean
   replyDisabled?: boolean
   embeddingDisabled?: boolean
   pinned?: boolean
-  [k: string]: unknown
 }
 
-export function isViewerState(v: unknown): v is ViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#viewerState'
-  )
+const hashViewerState = 'viewerState'
+
+export function isViewerState<V>(v: V) {
+  return is$typed(v, id, hashViewerState)
 }
 
-export function validateViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#viewerState', v)
+export function validateViewerState<V>(v: V) {
+  return validate<ViewerState & V>(v, id, hashViewerState)
 }
 
 /** Metadata about this post within the context of the thread it is in. */
 export interface ThreadContext {
+  $type?: 'app.bsky.feed.defs#threadContext'
   rootAuthorLike?: string
-  [k: string]: unknown
 }
 
-export function isThreadContext(v: unknown): v is ThreadContext {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#threadContext'
-  )
+const hashThreadContext = 'threadContext'
+
+export function isThreadContext<V>(v: V) {
+  return is$typed(v, id, hashThreadContext)
 }
 
-export function validateThreadContext(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#threadContext', v)
+export function validateThreadContext<V>(v: V) {
+  return validate<ThreadContext & V>(v, id, hashThreadContext)
 }
 
 export interface FeedViewPost {
+  $type?: 'app.bsky.feed.defs#feedViewPost'
   post: PostView
   reply?: ReplyRef
-  reason?: ReasonRepost | ReasonPin | { $type: string; [k: string]: unknown }
+  reason?: $Typed<ReasonRepost> | $Typed<ReasonPin> | { $type: string }
   /** Context provided by feed generator that may be passed back alongside interactions. */
   feedContext?: string
-  [k: string]: unknown
 }
 
-export function isFeedViewPost(v: unknown): v is FeedViewPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#feedViewPost'
-  )
+const hashFeedViewPost = 'feedViewPost'
+
+export function isFeedViewPost<V>(v: V) {
+  return is$typed(v, id, hashFeedViewPost)
 }
 
-export function validateFeedViewPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#feedViewPost', v)
+export function validateFeedViewPost<V>(v: V) {
+  return validate<FeedViewPost & V>(v, id, hashFeedViewPost)
 }
 
 export interface ReplyRef {
+  $type?: 'app.bsky.feed.defs#replyRef'
   root:
-    | PostView
-    | NotFoundPost
-    | BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<PostView>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | { $type: string }
   parent:
-    | PostView
-    | NotFoundPost
-    | BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<PostView>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | { $type: string }
   grandparentAuthor?: AppBskyActorDefs.ProfileViewBasic
-  [k: string]: unknown
 }
 
-export function isReplyRef(v: unknown): v is ReplyRef {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.defs#replyRef'
-  )
+const hashReplyRef = 'replyRef'
+
+export function isReplyRef<V>(v: V) {
+  return is$typed(v, id, hashReplyRef)
 }
 
-export function validateReplyRef(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#replyRef', v)
+export function validateReplyRef<V>(v: V) {
+  return validate<ReplyRef & V>(v, id, hashReplyRef)
 }
 
 export interface ReasonRepost {
+  $type?: 'app.bsky.feed.defs#reasonRepost'
   by: AppBskyActorDefs.ProfileViewBasic
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isReasonRepost(v: unknown): v is ReasonRepost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#reasonRepost'
-  )
+const hashReasonRepost = 'reasonRepost'
+
+export function isReasonRepost<V>(v: V) {
+  return is$typed(v, id, hashReasonRepost)
 }
 
-export function validateReasonRepost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#reasonRepost', v)
+export function validateReasonRepost<V>(v: V) {
+  return validate<ReasonRepost & V>(v, id, hashReasonRepost)
 }
 
 export interface ReasonPin {
-  [k: string]: unknown
+  $type?: 'app.bsky.feed.defs#reasonPin'
 }
 
-export function isReasonPin(v: unknown): v is ReasonPin {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#reasonPin'
-  )
+const hashReasonPin = 'reasonPin'
+
+export function isReasonPin<V>(v: V) {
+  return is$typed(v, id, hashReasonPin)
 }
 
-export function validateReasonPin(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#reasonPin', v)
+export function validateReasonPin<V>(v: V) {
+  return validate<ReasonPin & V>(v, id, hashReasonPin)
 }
 
 export interface ThreadViewPost {
+  $type?: 'app.bsky.feed.defs#threadViewPost'
   post: PostView
   parent?:
-    | ThreadViewPost
-    | NotFoundPost
-    | BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ThreadViewPost>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | { $type: string }
   replies?: (
-    | ThreadViewPost
-    | NotFoundPost
-    | BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ThreadViewPost>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | { $type: string }
   )[]
   threadContext?: ThreadContext
-  [k: string]: unknown
 }
 
-export function isThreadViewPost(v: unknown): v is ThreadViewPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#threadViewPost'
-  )
+const hashThreadViewPost = 'threadViewPost'
+
+export function isThreadViewPost<V>(v: V) {
+  return is$typed(v, id, hashThreadViewPost)
 }
 
-export function validateThreadViewPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#threadViewPost', v)
+export function validateThreadViewPost<V>(v: V) {
+  return validate<ThreadViewPost & V>(v, id, hashThreadViewPost)
 }
 
 export interface NotFoundPost {
+  $type?: 'app.bsky.feed.defs#notFoundPost'
   uri: string
   notFound: true
-  [k: string]: unknown
 }
 
-export function isNotFoundPost(v: unknown): v is NotFoundPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#notFoundPost'
-  )
+const hashNotFoundPost = 'notFoundPost'
+
+export function isNotFoundPost<V>(v: V) {
+  return is$typed(v, id, hashNotFoundPost)
 }
 
-export function validateNotFoundPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#notFoundPost', v)
+export function validateNotFoundPost<V>(v: V) {
+  return validate<NotFoundPost & V>(v, id, hashNotFoundPost)
 }
 
 export interface BlockedPost {
+  $type?: 'app.bsky.feed.defs#blockedPost'
   uri: string
   blocked: true
   author: BlockedAuthor
-  [k: string]: unknown
 }
 
-export function isBlockedPost(v: unknown): v is BlockedPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#blockedPost'
-  )
+const hashBlockedPost = 'blockedPost'
+
+export function isBlockedPost<V>(v: V) {
+  return is$typed(v, id, hashBlockedPost)
 }
 
-export function validateBlockedPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#blockedPost', v)
+export function validateBlockedPost<V>(v: V) {
+  return validate<BlockedPost & V>(v, id, hashBlockedPost)
 }
 
 export interface BlockedAuthor {
+  $type?: 'app.bsky.feed.defs#blockedAuthor'
   did: string
   viewer?: AppBskyActorDefs.ViewerState
-  [k: string]: unknown
 }
 
-export function isBlockedAuthor(v: unknown): v is BlockedAuthor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#blockedAuthor'
-  )
+const hashBlockedAuthor = 'blockedAuthor'
+
+export function isBlockedAuthor<V>(v: V) {
+  return is$typed(v, id, hashBlockedAuthor)
 }
 
-export function validateBlockedAuthor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#blockedAuthor', v)
+export function validateBlockedAuthor<V>(v: V) {
+  return validate<BlockedAuthor & V>(v, id, hashBlockedAuthor)
 }
 
 export interface GeneratorView {
+  $type?: 'app.bsky.feed.defs#generatorView'
   uri: string
   cid: string
   did: string
@@ -271,115 +258,103 @@ export interface GeneratorView {
     | 'app.bsky.feed.defs#contentModeVideo'
     | (string & {})
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isGeneratorView(v: unknown): v is GeneratorView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#generatorView'
-  )
+const hashGeneratorView = 'generatorView'
+
+export function isGeneratorView<V>(v: V) {
+  return is$typed(v, id, hashGeneratorView)
 }
 
-export function validateGeneratorView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#generatorView', v)
+export function validateGeneratorView<V>(v: V) {
+  return validate<GeneratorView & V>(v, id, hashGeneratorView)
 }
 
 export interface GeneratorViewerState {
+  $type?: 'app.bsky.feed.defs#generatorViewerState'
   like?: string
-  [k: string]: unknown
 }
 
-export function isGeneratorViewerState(v: unknown): v is GeneratorViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#generatorViewerState'
-  )
+const hashGeneratorViewerState = 'generatorViewerState'
+
+export function isGeneratorViewerState<V>(v: V) {
+  return is$typed(v, id, hashGeneratorViewerState)
 }
 
-export function validateGeneratorViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#generatorViewerState', v)
+export function validateGeneratorViewerState<V>(v: V) {
+  return validate<GeneratorViewerState & V>(v, id, hashGeneratorViewerState)
 }
 
 export interface SkeletonFeedPost {
+  $type?: 'app.bsky.feed.defs#skeletonFeedPost'
   post: string
   reason?:
-    | SkeletonReasonRepost
-    | SkeletonReasonPin
-    | { $type: string; [k: string]: unknown }
+    | $Typed<SkeletonReasonRepost>
+    | $Typed<SkeletonReasonPin>
+    | { $type: string }
   /** Context that will be passed through to client and may be passed to feed generator back alongside interactions. */
   feedContext?: string
-  [k: string]: unknown
 }
 
-export function isSkeletonFeedPost(v: unknown): v is SkeletonFeedPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonFeedPost'
-  )
+const hashSkeletonFeedPost = 'skeletonFeedPost'
+
+export function isSkeletonFeedPost<V>(v: V) {
+  return is$typed(v, id, hashSkeletonFeedPost)
 }
 
-export function validateSkeletonFeedPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonFeedPost', v)
+export function validateSkeletonFeedPost<V>(v: V) {
+  return validate<SkeletonFeedPost & V>(v, id, hashSkeletonFeedPost)
 }
 
 export interface SkeletonReasonRepost {
+  $type?: 'app.bsky.feed.defs#skeletonReasonRepost'
   repost: string
-  [k: string]: unknown
 }
 
-export function isSkeletonReasonRepost(v: unknown): v is SkeletonReasonRepost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonReasonRepost'
-  )
+const hashSkeletonReasonRepost = 'skeletonReasonRepost'
+
+export function isSkeletonReasonRepost<V>(v: V) {
+  return is$typed(v, id, hashSkeletonReasonRepost)
 }
 
-export function validateSkeletonReasonRepost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonReasonRepost', v)
+export function validateSkeletonReasonRepost<V>(v: V) {
+  return validate<SkeletonReasonRepost & V>(v, id, hashSkeletonReasonRepost)
 }
 
 export interface SkeletonReasonPin {
-  [k: string]: unknown
+  $type?: 'app.bsky.feed.defs#skeletonReasonPin'
 }
 
-export function isSkeletonReasonPin(v: unknown): v is SkeletonReasonPin {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonReasonPin'
-  )
+const hashSkeletonReasonPin = 'skeletonReasonPin'
+
+export function isSkeletonReasonPin<V>(v: V) {
+  return is$typed(v, id, hashSkeletonReasonPin)
 }
 
-export function validateSkeletonReasonPin(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonReasonPin', v)
+export function validateSkeletonReasonPin<V>(v: V) {
+  return validate<SkeletonReasonPin & V>(v, id, hashSkeletonReasonPin)
 }
 
 export interface ThreadgateView {
+  $type?: 'app.bsky.feed.defs#threadgateView'
   uri?: string
   cid?: string
-  record?: {}
+  record?: { [_ in string]: unknown }
   lists?: AppBskyGraphDefs.ListViewBasic[]
-  [k: string]: unknown
 }
 
-export function isThreadgateView(v: unknown): v is ThreadgateView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#threadgateView'
-  )
+const hashThreadgateView = 'threadgateView'
+
+export function isThreadgateView<V>(v: V) {
+  return is$typed(v, id, hashThreadgateView)
 }
 
-export function validateThreadgateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#threadgateView', v)
+export function validateThreadgateView<V>(v: V) {
+  return validate<ThreadgateView & V>(v, id, hashThreadgateView)
 }
 
 export interface Interaction {
+  $type?: 'app.bsky.feed.defs#interaction'
   item?: string
   event?:
     | 'app.bsky.feed.defs#requestLess'
@@ -397,47 +372,43 @@ export interface Interaction {
     | (string & {})
   /** Context on a feed item that was originally supplied by the feed generator on getFeedSkeleton. */
   feedContext?: string
-  [k: string]: unknown
 }
 
-export function isInteraction(v: unknown): v is Interaction {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#interaction'
-  )
+const hashInteraction = 'interaction'
+
+export function isInteraction<V>(v: V) {
+  return is$typed(v, id, hashInteraction)
 }
 
-export function validateInteraction(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#interaction', v)
+export function validateInteraction<V>(v: V) {
+  return validate<Interaction & V>(v, id, hashInteraction)
 }
 
 /** Request that less content like the given feed item be shown in the feed */
-export const REQUESTLESS = 'app.bsky.feed.defs#requestLess'
+export const REQUESTLESS = `${id}#requestLess`
 /** Request that more content like the given feed item be shown in the feed */
-export const REQUESTMORE = 'app.bsky.feed.defs#requestMore'
+export const REQUESTMORE = `${id}#requestMore`
 /** User clicked through to the feed item */
-export const CLICKTHROUGHITEM = 'app.bsky.feed.defs#clickthroughItem'
+export const CLICKTHROUGHITEM = `${id}#clickthroughItem`
 /** User clicked through to the author of the feed item */
-export const CLICKTHROUGHAUTHOR = 'app.bsky.feed.defs#clickthroughAuthor'
+export const CLICKTHROUGHAUTHOR = `${id}#clickthroughAuthor`
 /** User clicked through to the reposter of the feed item */
-export const CLICKTHROUGHREPOSTER = 'app.bsky.feed.defs#clickthroughReposter'
+export const CLICKTHROUGHREPOSTER = `${id}#clickthroughReposter`
 /** User clicked through to the embedded content of the feed item */
-export const CLICKTHROUGHEMBED = 'app.bsky.feed.defs#clickthroughEmbed'
+export const CLICKTHROUGHEMBED = `${id}#clickthroughEmbed`
 /** Declares the feed generator returns any types of posts. */
-export const CONTENTMODEUNSPECIFIED =
-  'app.bsky.feed.defs#contentModeUnspecified'
+export const CONTENTMODEUNSPECIFIED = `${id}#contentModeUnspecified`
 /** Declares the feed generator returns posts containing app.bsky.embed.video embeds. */
-export const CONTENTMODEVIDEO = 'app.bsky.feed.defs#contentModeVideo'
+export const CONTENTMODEVIDEO = `${id}#contentModeVideo`
 /** Feed item was seen by user */
-export const INTERACTIONSEEN = 'app.bsky.feed.defs#interactionSeen'
+export const INTERACTIONSEEN = `${id}#interactionSeen`
 /** User liked the feed item */
-export const INTERACTIONLIKE = 'app.bsky.feed.defs#interactionLike'
+export const INTERACTIONLIKE = `${id}#interactionLike`
 /** User reposted the feed item */
-export const INTERACTIONREPOST = 'app.bsky.feed.defs#interactionRepost'
+export const INTERACTIONREPOST = `${id}#interactionRepost`
 /** User replied to the feed item */
-export const INTERACTIONREPLY = 'app.bsky.feed.defs#interactionReply'
+export const INTERACTIONREPLY = `${id}#interactionReply`
 /** User quoted the feed item */
-export const INTERACTIONQUOTE = 'app.bsky.feed.defs#interactionQuote'
+export const INTERACTIONQUOTE = `${id}#interactionQuote`
 /** User shared the feed item */
-export const INTERACTIONSHARE = 'app.bsky.feed.defs#interactionShare'
+export const INTERACTIONSHARE = `${id}#interactionShare`
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
index 0a7d253ce8f..e3f17221cb1 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.describeFeedGenerator'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -16,7 +20,6 @@ export interface OutputSchema {
   did: string
   feeds: Feed[]
   links?: Links
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -46,36 +49,32 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Feed {
+  $type?: 'app.bsky.feed.describeFeedGenerator#feed'
   uri: string
-  [k: string]: unknown
 }
 
-export function isFeed(v: unknown): v is Feed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.describeFeedGenerator#feed'
-  )
+const hashFeed = 'feed'
+
+export function isFeed<V>(v: V) {
+  return is$typed(v, id, hashFeed)
 }
 
-export function validateFeed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.describeFeedGenerator#feed', v)
+export function validateFeed<V>(v: V) {
+  return validate<Feed & V>(v, id, hashFeed)
 }
 
 export interface Links {
+  $type?: 'app.bsky.feed.describeFeedGenerator#links'
   privacyPolicy?: string
   termsOfService?: string
-  [k: string]: unknown
 }
 
-export function isLinks(v: unknown): v is Links {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.describeFeedGenerator#links'
-  )
+const hashLinks = 'links'
+
+export function isLinks<V>(v: V) {
+  return is$typed(v, id, hashLinks)
 }
 
-export function validateLinks(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.describeFeedGenerator#links', v)
+export function validateLinks<V>(v: V) {
+  return validate<Links & V>(v, id, hashLinks)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/generator.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/generator.ts
index 482c7a7444e..3cddbae534b 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/generator.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/generator.ts
@@ -2,13 +2,18 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyRichtextFacet from '../richtext/facet.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.generator'
 
 export interface Record {
+  $type: 'app.bsky.feed.generator'
   did: string
   displayName: string
   description?: string
@@ -16,9 +21,7 @@ export interface Record {
   avatar?: BlobRef
   /** Declaration that a feed accepts feedback interactions from a client through app.bsky.feed.sendInteractions */
   acceptsInteractions?: boolean
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   contentMode?:
     | 'app.bsky.feed.defs#contentModeUnspecified'
     | 'app.bsky.feed.defs#contentModeVideo'
@@ -27,15 +30,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.generator#main' ||
-      v.$type === 'app.bsky.feed.generator')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.generator#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getActorFeeds.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
index 6af507c6e03..a2b257745b9 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getActorFeeds'
 
 export interface QueryParams {
   actor: string
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feeds: AppBskyFeedDefs.GeneratorView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getActorLikes.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getActorLikes.ts
index daf5060c8d2..b307c83b22d 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getActorLikes.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getActorLikes.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getActorLikes'
 
 export interface QueryParams {
   actor: string
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
index 2a14f45d6da..4d8b4098b77 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getAuthorFeed'
 
 export interface QueryParams {
   actor: string
@@ -29,7 +33,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeed.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeed.ts
index 5014c102155..593d3b63743 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeed.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeed.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getFeed'
 
 export interface QueryParams {
   feed: string
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
index 2b99efa318d..05ac731498e 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getFeedGenerator'
 
 export interface QueryParams {
   /** AT-URI of the feed generator record. */
@@ -22,7 +26,6 @@ export interface OutputSchema {
   isOnline: boolean
   /** Indicates whether the feed generator service is compatible with the record declaration. */
   isValid: boolean
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
index 2dd6f136f17..72a00cb2dd1 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getFeedGenerators'
 
 export interface QueryParams {
   feeds: string[]
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   feeds: AppBskyFeedDefs.GeneratorView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
index cd69f1a10b8..1f231dac80a 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getFeedSkeleton'
 
 export interface QueryParams {
   /** Reference to feed generator record describing the specific feed being requested. */
@@ -21,7 +25,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.SkeletonFeedPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getLikes.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getLikes.ts
index b035c2ea609..4b7e164cc2c 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getLikes.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getLikes.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getLikes'
 
 export interface QueryParams {
   /** AT-URI of the subject (eg, a post record). */
@@ -25,7 +29,6 @@ export interface OutputSchema {
   cid?: string
   cursor?: string
   likes: Like[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -55,18 +58,18 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Like {
+  $type?: 'app.bsky.feed.getLikes#like'
   indexedAt: string
   createdAt: string
   actor: AppBskyActorDefs.ProfileView
-  [k: string]: unknown
 }
 
-export function isLike(v: unknown): v is Like {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.getLikes#like'
-  )
+const hashLike = 'like'
+
+export function isLike<V>(v: V) {
+  return is$typed(v, id, hashLike)
 }
 
-export function validateLike(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.getLikes#like', v)
+export function validateLike<V>(v: V) {
+  return validate<Like & V>(v, id, hashLike)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getListFeed.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getListFeed.ts
index 0720feb5b6b..d131c5af040 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getListFeed.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getListFeed.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getListFeed'
 
 export interface QueryParams {
   /** Reference (AT-URI) to the list record. */
@@ -21,7 +25,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getPostThread.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getPostThread.ts
index 918faddfc1d..31e15ca72ac 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getPostThread.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getPostThread.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getPostThread'
 
 export interface QueryParams {
   /** Reference (AT-URI) to post record. */
@@ -22,12 +26,11 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   thread:
-    | AppBskyFeedDefs.ThreadViewPost
-    | AppBskyFeedDefs.NotFoundPost
-    | AppBskyFeedDefs.BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyFeedDefs.ThreadViewPost>
+    | $Typed<AppBskyFeedDefs.NotFoundPost>
+    | $Typed<AppBskyFeedDefs.BlockedPost>
+    | { $type: string }
   threadgate?: AppBskyFeedDefs.ThreadgateView
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getPosts.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getPosts.ts
index b7048083583..84dedf5816e 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getPosts.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getPosts.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getPosts'
 
 export interface QueryParams {
   /** List of post AT-URIs to return hydrated views for. */
@@ -18,7 +22,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   posts: AppBskyFeedDefs.PostView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getQuotes.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getQuotes.ts
index 23c7dd831f0..94a7b53c177 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getQuotes.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getQuotes.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getQuotes'
 
 export interface QueryParams {
   /** Reference (AT-URI) of post record */
@@ -25,7 +29,6 @@ export interface OutputSchema {
   cid?: string
   cursor?: string
   posts: AppBskyFeedDefs.PostView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getRepostedBy.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
index efae1c0b14f..81d65ae2c2b 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getRepostedBy'
 
 export interface QueryParams {
   /** Reference (AT-URI) of post record */
@@ -25,7 +29,6 @@ export interface OutputSchema {
   cid?: string
   cursor?: string
   repostedBy: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
index c660e995f9f..1dd00af2a37 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getSuggestedFeeds'
 
 export interface QueryParams {
   limit: number
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feeds: AppBskyFeedDefs.GeneratorView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getTimeline.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getTimeline.ts
index f9cd3d702c5..93f5b055b32 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getTimeline.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getTimeline.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getTimeline'
 
 export interface QueryParams {
   /** Variant 'algorithm' for timeline. Implementation-specific. NOTE: most feed flexibility has been moved to feed generator mechanism. */
@@ -21,7 +25,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/like.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/like.ts
index 1da9dd940dc..504023db951 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/like.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/like.ts
@@ -2,25 +2,28 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.like'
 
 export interface Record {
+  $type: 'app.bsky.feed.like'
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.like#main' || v.$type === 'app.bsky.feed.like')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.like#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/post.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/post.ts
index f9f2827c8d0..1c921bf4331 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/post.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/post.ts
@@ -2,19 +2,24 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as AppBskyEmbedImages from '../embed/images'
-import * as AppBskyEmbedVideo from '../embed/video'
-import * as AppBskyEmbedExternal from '../embed/external'
-import * as AppBskyEmbedRecord from '../embed/record'
-import * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyRichtextFacet from '../richtext/facet.js'
+import type * as AppBskyEmbedImages from '../embed/images.js'
+import type * as AppBskyEmbedVideo from '../embed/video.js'
+import type * as AppBskyEmbedExternal from '../embed/external.js'
+import type * as AppBskyEmbedRecord from '../embed/record.js'
+import type * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.post'
 
 export interface Record {
+  $type: 'app.bsky.feed.post'
   /** The primary post content. May be an empty string, if there are embeds. */
   text: string
   /** DEPRECATED: replaced by app.bsky.richtext.facet. */
@@ -23,17 +28,15 @@ export interface Record {
   facets?: AppBskyRichtextFacet.Main[]
   reply?: ReplyRef
   embed?:
-    | AppBskyEmbedImages.Main
-    | AppBskyEmbedVideo.Main
-    | AppBskyEmbedExternal.Main
-    | AppBskyEmbedRecord.Main
-    | AppBskyEmbedRecordWithMedia.Main
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyEmbedImages.Main>
+    | $Typed<AppBskyEmbedVideo.Main>
+    | $Typed<AppBskyEmbedExternal.Main>
+    | $Typed<AppBskyEmbedRecord.Main>
+    | $Typed<AppBskyEmbedRecordWithMedia.Main>
+    | { $type: string }
   /** Indicates human language of post primary text content. */
   langs?: string[]
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   /** Additional hashtags, in addition to any included in post text and facets. */
   tags?: string[]
   /** Client-declared timestamp when this post was originally created. */
@@ -41,68 +44,64 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.post#main' || v.$type === 'app.bsky.feed.post')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
 
 export interface ReplyRef {
+  $type?: 'app.bsky.feed.post#replyRef'
   root: ComAtprotoRepoStrongRef.Main
   parent: ComAtprotoRepoStrongRef.Main
-  [k: string]: unknown
 }
 
-export function isReplyRef(v: unknown): v is ReplyRef {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.post#replyRef'
-  )
+const hashReplyRef = 'replyRef'
+
+export function isReplyRef<V>(v: V) {
+  return is$typed(v, id, hashReplyRef)
 }
 
-export function validateReplyRef(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#replyRef', v)
+export function validateReplyRef<V>(v: V) {
+  return validate<ReplyRef & V>(v, id, hashReplyRef)
 }
 
 /** Deprecated: use facets instead. */
 export interface Entity {
+  $type?: 'app.bsky.feed.post#entity'
   index: TextSlice
   /** Expected values are 'mention' and 'link'. */
   type: string
   value: string
-  [k: string]: unknown
 }
 
-export function isEntity(v: unknown): v is Entity {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.post#entity'
-  )
+const hashEntity = 'entity'
+
+export function isEntity<V>(v: V) {
+  return is$typed(v, id, hashEntity)
 }
 
-export function validateEntity(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#entity', v)
+export function validateEntity<V>(v: V) {
+  return validate<Entity & V>(v, id, hashEntity)
 }
 
 /** Deprecated. Use app.bsky.richtext instead -- A text segment. Start is inclusive, end is exclusive. Indices are for utf16-encoded strings. */
 export interface TextSlice {
+  $type?: 'app.bsky.feed.post#textSlice'
   start: number
   end: number
-  [k: string]: unknown
 }
 
-export function isTextSlice(v: unknown): v is TextSlice {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.post#textSlice'
-  )
+const hashTextSlice = 'textSlice'
+
+export function isTextSlice<V>(v: V) {
+  return is$typed(v, id, hashTextSlice)
 }
 
-export function validateTextSlice(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#textSlice', v)
+export function validateTextSlice<V>(v: V) {
+  return validate<TextSlice & V>(v, id, hashTextSlice)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/postgate.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/postgate.ts
index da5d6b175b2..3bb6fa929ef 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/postgate.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/postgate.ts
@@ -2,47 +2,47 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.postgate'
 
 export interface Record {
+  $type: 'app.bsky.feed.postgate'
   createdAt: string
   /** Reference (AT-URI) to the post record. */
   post: string
   /** List of AT-URIs embedding this post that the author has detached from. */
   detachedEmbeddingUris?: string[]
   /** List of rules defining who can embed this post. If value is an empty array or is undefined, no particular rules apply and anyone can embed. */
-  embeddingRules?: (DisableRule | { $type: string; [k: string]: unknown })[]
+  embeddingRules?: ($Typed<DisableRule> | { $type: string })[]
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.postgate#main' ||
-      v.$type === 'app.bsky.feed.postgate')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.postgate#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
 
 /** Disables embedding of this post. */
 export interface DisableRule {
-  [k: string]: unknown
+  $type?: 'app.bsky.feed.postgate#disableRule'
 }
 
-export function isDisableRule(v: unknown): v is DisableRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.postgate#disableRule'
-  )
+const hashDisableRule = 'disableRule'
+
+export function isDisableRule<V>(v: V) {
+  return is$typed(v, id, hashDisableRule)
 }
 
-export function validateDisableRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.postgate#disableRule', v)
+export function validateDisableRule<V>(v: V) {
+  return validate<DisableRule & V>(v, id, hashDisableRule)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/repost.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/repost.ts
index 4c836d76e2a..00a74c8b617 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/repost.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/repost.ts
@@ -2,26 +2,28 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.repost'
 
 export interface Record {
+  $type: 'app.bsky.feed.repost'
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.repost#main' ||
-      v.$type === 'app.bsky.feed.repost')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.repost#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/searchPosts.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/searchPosts.ts
index 68e0b729b53..1f7a68d6085 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/searchPosts.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/searchPosts.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.searchPosts'
 
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
@@ -42,7 +46,6 @@ export interface OutputSchema {
   /** Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. */
   hitsTotal?: number
   posts: AppBskyFeedDefs.PostView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/sendInteractions.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/sendInteractions.ts
index b0280ad8028..e96f1a870f5 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/sendInteractions.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/sendInteractions.ts
@@ -3,22 +3,23 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.sendInteractions'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   interactions: AppBskyFeedDefs.Interaction[]
-  [k: string]: unknown
 }
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export interface HandlerInput {
   encoding: 'application/json'
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/threadgate.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/threadgate.ts
index 869b8d51d64..e15cda096aa 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/threadgate.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/threadgate.ts
@@ -2,20 +2,25 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.threadgate'
 
 export interface Record {
+  $type: 'app.bsky.feed.threadgate'
   /** Reference (AT-URI) to the post record. */
   post: string
   /** List of rules defining who can reply to this post. If value is an empty array, no one can reply. If value is undefined, anyone can reply. */
   allow?: (
-    | MentionRule
-    | FollowerRule
-    | FollowingRule
-    | ListRule
-    | { $type: string; [k: string]: unknown }
+    | $Typed<MentionRule>
+    | $Typed<FollowerRule>
+    | $Typed<FollowingRule>
+    | $Typed<ListRule>
+    | { $type: string }
   )[]
   createdAt: string
   /** List of hidden reply URIs. */
@@ -23,84 +28,73 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.threadgate#main' ||
-      v.$type === 'app.bsky.feed.threadgate')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
 
 /** Allow replies from actors mentioned in your post. */
 export interface MentionRule {
-  [k: string]: unknown
+  $type?: 'app.bsky.feed.threadgate#mentionRule'
 }
 
-export function isMentionRule(v: unknown): v is MentionRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#mentionRule'
-  )
+const hashMentionRule = 'mentionRule'
+
+export function isMentionRule<V>(v: V) {
+  return is$typed(v, id, hashMentionRule)
 }
 
-export function validateMentionRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#mentionRule', v)
+export function validateMentionRule<V>(v: V) {
+  return validate<MentionRule & V>(v, id, hashMentionRule)
 }
 
 /** Allow replies from actors who follow you. */
 export interface FollowerRule {
-  [k: string]: unknown
+  $type?: 'app.bsky.feed.threadgate#followerRule'
 }
 
-export function isFollowerRule(v: unknown): v is FollowerRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#followerRule'
-  )
+const hashFollowerRule = 'followerRule'
+
+export function isFollowerRule<V>(v: V) {
+  return is$typed(v, id, hashFollowerRule)
 }
 
-export function validateFollowerRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#followerRule', v)
+export function validateFollowerRule<V>(v: V) {
+  return validate<FollowerRule & V>(v, id, hashFollowerRule)
 }
 
 /** Allow replies from actors you follow. */
 export interface FollowingRule {
-  [k: string]: unknown
+  $type?: 'app.bsky.feed.threadgate#followingRule'
 }
 
-export function isFollowingRule(v: unknown): v is FollowingRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#followingRule'
-  )
+const hashFollowingRule = 'followingRule'
+
+export function isFollowingRule<V>(v: V) {
+  return is$typed(v, id, hashFollowingRule)
 }
 
-export function validateFollowingRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#followingRule', v)
+export function validateFollowingRule<V>(v: V) {
+  return validate<FollowingRule & V>(v, id, hashFollowingRule)
 }
 
 /** Allow replies from actors on a list. */
 export interface ListRule {
+  $type?: 'app.bsky.feed.threadgate#listRule'
   list: string
-  [k: string]: unknown
 }
 
-export function isListRule(v: unknown): v is ListRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#listRule'
-  )
+const hashListRule = 'listRule'
+
+export function isListRule<V>(v: V) {
+  return is$typed(v, id, hashListRule)
 }
 
-export function validateListRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#listRule', v)
+export function validateListRule<V>(v: V) {
+  return validate<ListRule & V>(v, id, hashListRule)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/block.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/block.ts
index b7f19f126b7..25ff38bd60d 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/block.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/block.ts
@@ -2,26 +2,28 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.block'
 
 export interface Record {
+  $type: 'app.bsky.graph.block'
   /** DID of the account to be blocked. */
   subject: string
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.block#main' ||
-      v.$type === 'app.bsky.graph.block')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.block#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/defs.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/defs.ts
index 63ecf7e00c0..bd9a4d6c07e 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/defs.ts
@@ -2,15 +2,20 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as AppBskyFeedDefs from '../feed/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+import type * as AppBskyRichtextFacet from '../richtext/facet.js'
+import type * as AppBskyFeedDefs from '../feed/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.defs'
 
 export interface ListViewBasic {
+  $type?: 'app.bsky.graph.defs#listViewBasic'
   uri: string
   cid: string
   name: string
@@ -20,22 +25,20 @@ export interface ListViewBasic {
   labels?: ComAtprotoLabelDefs.Label[]
   viewer?: ListViewerState
   indexedAt?: string
-  [k: string]: unknown
 }
 
-export function isListViewBasic(v: unknown): v is ListViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listViewBasic'
-  )
+const hashListViewBasic = 'listViewBasic'
+
+export function isListViewBasic<V>(v: V) {
+  return is$typed(v, id, hashListViewBasic)
 }
 
-export function validateListViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listViewBasic', v)
+export function validateListViewBasic<V>(v: V) {
+  return validate<ListViewBasic & V>(v, id, hashListViewBasic)
 }
 
 export interface ListView {
+  $type?: 'app.bsky.graph.defs#listView'
   uri: string
   cid: string
   creator: AppBskyActorDefs.ProfileView
@@ -48,43 +51,39 @@ export interface ListView {
   labels?: ComAtprotoLabelDefs.Label[]
   viewer?: ListViewerState
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isListView(v: unknown): v is ListView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listView'
-  )
+const hashListView = 'listView'
+
+export function isListView<V>(v: V) {
+  return is$typed(v, id, hashListView)
 }
 
-export function validateListView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listView', v)
+export function validateListView<V>(v: V) {
+  return validate<ListView & V>(v, id, hashListView)
 }
 
 export interface ListItemView {
+  $type?: 'app.bsky.graph.defs#listItemView'
   uri: string
   subject: AppBskyActorDefs.ProfileView
-  [k: string]: unknown
 }
 
-export function isListItemView(v: unknown): v is ListItemView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listItemView'
-  )
+const hashListItemView = 'listItemView'
+
+export function isListItemView<V>(v: V) {
+  return is$typed(v, id, hashListItemView)
 }
 
-export function validateListItemView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listItemView', v)
+export function validateListItemView<V>(v: V) {
+  return validate<ListItemView & V>(v, id, hashListItemView)
 }
 
 export interface StarterPackView {
+  $type?: 'app.bsky.graph.defs#starterPackView'
   uri: string
   cid: string
-  record: {}
+  record: { [_ in string]: unknown }
   creator: AppBskyActorDefs.ProfileViewBasic
   list?: ListViewBasic
   listItemsSample?: ListItemView[]
@@ -93,44 +92,39 @@ export interface StarterPackView {
   joinedAllTimeCount?: number
   labels?: ComAtprotoLabelDefs.Label[]
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isStarterPackView(v: unknown): v is StarterPackView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#starterPackView'
-  )
+const hashStarterPackView = 'starterPackView'
+
+export function isStarterPackView<V>(v: V) {
+  return is$typed(v, id, hashStarterPackView)
 }
 
-export function validateStarterPackView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#starterPackView', v)
+export function validateStarterPackView<V>(v: V) {
+  return validate<StarterPackView & V>(v, id, hashStarterPackView)
 }
 
 export interface StarterPackViewBasic {
+  $type?: 'app.bsky.graph.defs#starterPackViewBasic'
   uri: string
   cid: string
-  record: {}
+  record: { [_ in string]: unknown }
   creator: AppBskyActorDefs.ProfileViewBasic
   listItemCount?: number
   joinedWeekCount?: number
   joinedAllTimeCount?: number
   labels?: ComAtprotoLabelDefs.Label[]
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isStarterPackViewBasic(v: unknown): v is StarterPackViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#starterPackViewBasic'
-  )
+const hashStarterPackViewBasic = 'starterPackViewBasic'
+
+export function isStarterPackViewBasic<V>(v: V) {
+  return is$typed(v, id, hashStarterPackViewBasic)
 }
 
-export function validateStarterPackViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#starterPackViewBasic', v)
+export function validateStarterPackViewBasic<V>(v: V) {
+  return validate<StarterPackViewBasic & V>(v, id, hashStarterPackViewBasic)
 }
 
 export type ListPurpose =
@@ -140,67 +134,61 @@ export type ListPurpose =
   | (string & {})
 
 /** A list of actors to apply an aggregate moderation action (mute/block) on. */
-export const MODLIST = 'app.bsky.graph.defs#modlist'
+export const MODLIST = `${id}#modlist`
 /** A list of actors used for curation purposes such as list feeds or interaction gating. */
-export const CURATELIST = 'app.bsky.graph.defs#curatelist'
+export const CURATELIST = `${id}#curatelist`
 /** A list of actors used for only for reference purposes such as within a starter pack. */
-export const REFERENCELIST = 'app.bsky.graph.defs#referencelist'
+export const REFERENCELIST = `${id}#referencelist`
 
 export interface ListViewerState {
+  $type?: 'app.bsky.graph.defs#listViewerState'
   muted?: boolean
   blocked?: string
-  [k: string]: unknown
 }
 
-export function isListViewerState(v: unknown): v is ListViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listViewerState'
-  )
+const hashListViewerState = 'listViewerState'
+
+export function isListViewerState<V>(v: V) {
+  return is$typed(v, id, hashListViewerState)
 }
 
-export function validateListViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listViewerState', v)
+export function validateListViewerState<V>(v: V) {
+  return validate<ListViewerState & V>(v, id, hashListViewerState)
 }
 
 /** indicates that a handle or DID could not be resolved */
 export interface NotFoundActor {
+  $type?: 'app.bsky.graph.defs#notFoundActor'
   actor: string
   notFound: true
-  [k: string]: unknown
 }
 
-export function isNotFoundActor(v: unknown): v is NotFoundActor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#notFoundActor'
-  )
+const hashNotFoundActor = 'notFoundActor'
+
+export function isNotFoundActor<V>(v: V) {
+  return is$typed(v, id, hashNotFoundActor)
 }
 
-export function validateNotFoundActor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#notFoundActor', v)
+export function validateNotFoundActor<V>(v: V) {
+  return validate<NotFoundActor & V>(v, id, hashNotFoundActor)
 }
 
 /** lists the bi-directional graph relationships between one actor (not indicated in the object), and the target actors (the DID included in the object) */
 export interface Relationship {
+  $type?: 'app.bsky.graph.defs#relationship'
   did: string
   /** if the actor follows this DID, this is the AT-URI of the follow record */
   following?: string
   /** if the actor is followed by this DID, contains the AT-URI of the follow record */
   followedBy?: string
-  [k: string]: unknown
 }
 
-export function isRelationship(v: unknown): v is Relationship {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#relationship'
-  )
+const hashRelationship = 'relationship'
+
+export function isRelationship<V>(v: V) {
+  return is$typed(v, id, hashRelationship)
 }
 
-export function validateRelationship(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#relationship', v)
+export function validateRelationship<V>(v: V) {
+  return validate<Relationship & V>(v, id, hashRelationship)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/follow.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/follow.ts
index 4b74a58a5df..79478d39135 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/follow.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/follow.ts
@@ -2,25 +2,27 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.follow'
 
 export interface Record {
+  $type: 'app.bsky.graph.follow'
   subject: string
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.follow#main' ||
-      v.$type === 'app.bsky.graph.follow')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.follow#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
index 352c542990f..2e55945485a 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getActorStarterPacks'
 
 export interface QueryParams {
   actor: string
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   starterPacks: AppBskyGraphDefs.StarterPackViewBasic[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getBlocks.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getBlocks.ts
index 1fdd49c6831..dddd7a555a9 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getBlocks.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getBlocks.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getBlocks'
 
 export interface QueryParams {
   limit: number
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   blocks: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getFollowers.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getFollowers.ts
index 1f348e97d20..e631e3313ce 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getFollowers.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getFollowers.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getFollowers'
 
 export interface QueryParams {
   actor: string
@@ -21,7 +25,6 @@ export interface OutputSchema {
   subject: AppBskyActorDefs.ProfileView
   cursor?: string
   followers: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getFollows.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getFollows.ts
index a9664991c88..efd34eaedaa 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getFollows.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getFollows.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getFollows'
 
 export interface QueryParams {
   actor: string
@@ -21,7 +25,6 @@ export interface OutputSchema {
   subject: AppBskyActorDefs.ProfileView
   cursor?: string
   follows: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
index 1f348e97d20..92562abea9a 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getKnownFollowers'
 
 export interface QueryParams {
   actor: string
@@ -21,7 +25,6 @@ export interface OutputSchema {
   subject: AppBskyActorDefs.ProfileView
   cursor?: string
   followers: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getList.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getList.ts
index a8408edd622..eba37cede07 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getList.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getList.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getList'
 
 export interface QueryParams {
   /** Reference (AT-URI) of the list record to hydrate. */
@@ -22,7 +26,6 @@ export interface OutputSchema {
   cursor?: string
   list: AppBskyGraphDefs.ListView
   items: AppBskyGraphDefs.ListItemView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getListBlocks.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getListBlocks.ts
index 728892f4379..0918ecbac30 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getListBlocks.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getListBlocks.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getListBlocks'
 
 export interface QueryParams {
   limit: number
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   lists: AppBskyGraphDefs.ListView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getListMutes.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getListMutes.ts
index 728892f4379..d5ff5158769 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getListMutes.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getListMutes.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getListMutes'
 
 export interface QueryParams {
   limit: number
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   lists: AppBskyGraphDefs.ListView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getLists.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getLists.ts
index 0ed8abc586e..854fc9534f9 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getLists.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getLists.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getLists'
 
 export interface QueryParams {
   /** The account (actor) to enumerate lists from. */
@@ -21,7 +25,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   lists: AppBskyGraphDefs.ListView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getMutes.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getMutes.ts
index 45c7966644e..e1c5615e412 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getMutes.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getMutes.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getMutes'
 
 export interface QueryParams {
   limit: number
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   mutes: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getRelationships.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getRelationships.ts
index 677c8815d43..adff220f8ed 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getRelationships.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getRelationships.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getRelationships'
 
 export interface QueryParams {
   /** Primary account requesting relationships for. */
@@ -21,11 +25,10 @@ export type InputSchema = undefined
 export interface OutputSchema {
   actor?: string
   relationships: (
-    | AppBskyGraphDefs.Relationship
-    | AppBskyGraphDefs.NotFoundActor
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyGraphDefs.Relationship>
+    | $Typed<AppBskyGraphDefs.NotFoundActor>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPack.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPack.ts
index bbf8a537da0..a7e7e479201 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPack.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPack.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getStarterPack'
 
 export interface QueryParams {
   /** Reference (AT-URI) of the starter pack record. */
@@ -18,7 +22,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   starterPack: AppBskyGraphDefs.StarterPackView
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPacks.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
index 1ea054400b3..9b99308dba9 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getStarterPacks'
 
 export interface QueryParams {
   uris: string[]
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   starterPacks: AppBskyGraphDefs.StarterPackViewBasic[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
index 8736dc71b45..098070d2da7 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getSuggestedFollowsByActor'
 
 export interface QueryParams {
   actor: string
@@ -21,7 +25,6 @@ export interface OutputSchema {
   isFallback?: boolean
   /** Snowflake for this recommendation, use when submitting recommendation events. */
   recId?: number
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/list.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/list.ts
index 91c8ccee5bb..f899e73317a 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/list.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/list.ts
@@ -2,36 +2,36 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyGraphDefs from './defs'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyGraphDefs from './defs.js'
+import type * as AppBskyRichtextFacet from '../richtext/facet.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.list'
 
 export interface Record {
+  $type: 'app.bsky.graph.list'
   purpose: AppBskyGraphDefs.ListPurpose
   /** Display name for list; can not be empty. */
   name: string
   description?: string
   descriptionFacets?: AppBskyRichtextFacet.Main[]
   avatar?: BlobRef
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.list#main' ||
-      v.$type === 'app.bsky.graph.list')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.list#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/listblock.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/listblock.ts
index 592778c7a51..05a204fa3b5 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/listblock.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/listblock.ts
@@ -2,26 +2,28 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.listblock'
 
 export interface Record {
+  $type: 'app.bsky.graph.listblock'
   /** Reference (AT-URI) to the mod list record. */
   subject: string
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.listblock#main' ||
-      v.$type === 'app.bsky.graph.listblock')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.listblock#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/listitem.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/listitem.ts
index 5e93b34a111..46e0ccbf206 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/listitem.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/listitem.ts
@@ -2,11 +2,16 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.listitem'
 
 export interface Record {
+  $type: 'app.bsky.graph.listitem'
   /** The account which is included on the list. */
   subject: string
   /** Reference (AT-URI) to the list record (app.bsky.graph.list). */
@@ -15,15 +20,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.listitem#main' ||
-      v.$type === 'app.bsky.graph.listitem')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.listitem#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/muteActor.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/muteActor.ts
index 7d0057721d6..5b76c3eb88f 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/muteActor.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/muteActor.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.muteActor'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   actor: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/muteActorList.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/muteActorList.ts
index 1d80ac0d3db..62be146bdff 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/muteActorList.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/muteActorList.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.muteActorList'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   list: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/muteThread.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/muteThread.ts
index 659ced88112..bc9f0c2339d 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/muteThread.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/muteThread.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.muteThread'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   root: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
index 70bc184bb43..6ffc5517a74 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.searchStarterPacks'
 
 export interface QueryParams {
   /** Search query string. Syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
@@ -21,7 +25,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   starterPacks: AppBskyGraphDefs.StarterPackViewBasic[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/starterpack.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/starterpack.ts
index 0daf8daf688..d7761245080 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/starterpack.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/starterpack.ts
@@ -2,12 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyRichtextFacet from '../richtext/facet'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyRichtextFacet from '../richtext/facet.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.starterpack'
 
 export interface Record {
+  $type: 'app.bsky.graph.starterpack'
   /** Display name for starter pack; can not be empty. */
   name: string
   description?: string
@@ -19,32 +24,27 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.starterpack#main' ||
-      v.$type === 'app.bsky.graph.starterpack')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.starterpack#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
 
 export interface FeedItem {
+  $type?: 'app.bsky.graph.starterpack#feedItem'
   uri: string
-  [k: string]: unknown
 }
 
-export function isFeedItem(v: unknown): v is FeedItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.starterpack#feedItem'
-  )
+const hashFeedItem = 'feedItem'
+
+export function isFeedItem<V>(v: V) {
+  return is$typed(v, id, hashFeedItem)
 }
 
-export function validateFeedItem(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.starterpack#feedItem', v)
+export function validateFeedItem<V>(v: V) {
+  return validate<FeedItem & V>(v, id, hashFeedItem)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActor.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActor.ts
index 7d0057721d6..91519c3f2b3 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActor.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActor.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.unmuteActor'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   actor: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActorList.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
index 1d80ac0d3db..00e0959d70d 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.unmuteActorList'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   list: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteThread.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteThread.ts
index 659ced88112..2465768319e 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteThread.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteThread.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.unmuteThread'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   root: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/labeler/defs.ts b/packages/bsky/src/lexicon/types/app/bsky/labeler/defs.ts
index e12c7203c57..453b010db5e 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/labeler/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/labeler/defs.ts
@@ -2,13 +2,18 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.labeler.defs'
 
 export interface LabelerView {
+  $type?: 'app.bsky.labeler.defs#labelerView'
   uri: string
   cid: string
   creator: AppBskyActorDefs.ProfileView
@@ -16,22 +21,20 @@ export interface LabelerView {
   viewer?: LabelerViewerState
   indexedAt: string
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isLabelerView(v: unknown): v is LabelerView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerView'
-  )
+const hashLabelerView = 'labelerView'
+
+export function isLabelerView<V>(v: V) {
+  return is$typed(v, id, hashLabelerView)
 }
 
-export function validateLabelerView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerView', v)
+export function validateLabelerView<V>(v: V) {
+  return validate<LabelerView & V>(v, id, hashLabelerView)
 }
 
 export interface LabelerViewDetailed {
+  $type?: 'app.bsky.labeler.defs#labelerViewDetailed'
   uri: string
   cid: string
   creator: AppBskyActorDefs.ProfileView
@@ -40,54 +43,47 @@ export interface LabelerViewDetailed {
   viewer?: LabelerViewerState
   indexedAt: string
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isLabelerViewDetailed(v: unknown): v is LabelerViewDetailed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerViewDetailed'
-  )
+const hashLabelerViewDetailed = 'labelerViewDetailed'
+
+export function isLabelerViewDetailed<V>(v: V) {
+  return is$typed(v, id, hashLabelerViewDetailed)
 }
 
-export function validateLabelerViewDetailed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerViewDetailed', v)
+export function validateLabelerViewDetailed<V>(v: V) {
+  return validate<LabelerViewDetailed & V>(v, id, hashLabelerViewDetailed)
 }
 
 export interface LabelerViewerState {
+  $type?: 'app.bsky.labeler.defs#labelerViewerState'
   like?: string
-  [k: string]: unknown
 }
 
-export function isLabelerViewerState(v: unknown): v is LabelerViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerViewerState'
-  )
+const hashLabelerViewerState = 'labelerViewerState'
+
+export function isLabelerViewerState<V>(v: V) {
+  return is$typed(v, id, hashLabelerViewerState)
 }
 
-export function validateLabelerViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerViewerState', v)
+export function validateLabelerViewerState<V>(v: V) {
+  return validate<LabelerViewerState & V>(v, id, hashLabelerViewerState)
 }
 
 export interface LabelerPolicies {
+  $type?: 'app.bsky.labeler.defs#labelerPolicies'
   /** The label values which this labeler publishes. May include global or custom labels. */
   labelValues: ComAtprotoLabelDefs.LabelValue[]
   /** Label values created by this labeler and scoped exclusively to it. Labels defined here will override global label definitions for this labeler. */
   labelValueDefinitions?: ComAtprotoLabelDefs.LabelValueDefinition[]
-  [k: string]: unknown
 }
 
-export function isLabelerPolicies(v: unknown): v is LabelerPolicies {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerPolicies'
-  )
+const hashLabelerPolicies = 'labelerPolicies'
+
+export function isLabelerPolicies<V>(v: V) {
+  return is$typed(v, id, hashLabelerPolicies)
 }
 
-export function validateLabelerPolicies(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerPolicies', v)
+export function validateLabelerPolicies<V>(v: V) {
+  return validate<LabelerPolicies & V>(v, id, hashLabelerPolicies)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/labeler/getServices.ts b/packages/bsky/src/lexicon/types/app/bsky/labeler/getServices.ts
index e1d318b6177..edee111a234 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/labeler/getServices.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/labeler/getServices.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyLabelerDefs from './defs'
+import type * as AppBskyLabelerDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.labeler.getServices'
 
 export interface QueryParams {
   dids: string[]
@@ -18,11 +22,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   views: (
-    | AppBskyLabelerDefs.LabelerView
-    | AppBskyLabelerDefs.LabelerViewDetailed
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyLabelerDefs.LabelerView>
+    | $Typed<AppBskyLabelerDefs.LabelerViewDetailed>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/labeler/service.ts b/packages/bsky/src/lexicon/types/app/bsky/labeler/service.ts
index a044b8699b6..368f71e53bc 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/labeler/service.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/labeler/service.ts
@@ -2,30 +2,30 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyLabelerDefs from './defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyLabelerDefs from './defs.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.labeler.service'
 
 export interface Record {
+  $type: 'app.bsky.labeler.service'
   policies: AppBskyLabelerDefs.LabelerPolicies
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.labeler.service#main' ||
-      v.$type === 'app.bsky.labeler.service')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.service#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/notification/getUnreadCount.ts b/packages/bsky/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
index d2cff779da4..835ea895332 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.notification.getUnreadCount'
+
 export interface QueryParams {
   priority?: boolean
   seenAt?: string
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   count: number
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/notification/listNotifications.ts b/packages/bsky/src/lexicon/types/app/bsky/notification/listNotifications.ts
index 69d05288acb..de01a6b6b79 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/notification/listNotifications.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/notification/listNotifications.ts
@@ -3,12 +3,16 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.notification.listNotifications'
 
 export interface QueryParams {
   /** Notification reasons to include in response. */
@@ -26,7 +30,6 @@ export interface OutputSchema {
   notifications: Notification[]
   priority?: boolean
   seenAt?: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -56,6 +59,7 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Notification {
+  $type?: 'app.bsky.notification.listNotifications#notification'
   uri: string
   cid: string
   author: AppBskyActorDefs.ProfileView
@@ -70,24 +74,18 @@ export interface Notification {
     | 'starterpack-joined'
     | (string & {})
   reasonSubject?: string
-  record: {}
+  record: { [_ in string]: unknown }
   isRead: boolean
   indexedAt: string
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isNotification(v: unknown): v is Notification {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.notification.listNotifications#notification'
-  )
+const hashNotification = 'notification'
+
+export function isNotification<V>(v: V) {
+  return is$typed(v, id, hashNotification)
 }
 
-export function validateNotification(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'app.bsky.notification.listNotifications#notification',
-    v,
-  )
+export function validateNotification<V>(v: V) {
+  return validate<Notification & V>(v, id, hashNotification)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/notification/putPreferences.ts b/packages/bsky/src/lexicon/types/app/bsky/notification/putPreferences.ts
index 2271b658cb2..616ed6ed417 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/notification/putPreferences.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/notification/putPreferences.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.notification.putPreferences'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   priority: boolean
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/notification/registerPush.ts b/packages/bsky/src/lexicon/types/app/bsky/notification/registerPush.ts
index c4ca7104764..028b564401e 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/notification/registerPush.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/notification/registerPush.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.notification.registerPush'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -15,7 +19,6 @@ export interface InputSchema {
   token: string
   platform: 'ios' | 'android' | 'web' | (string & {})
   appId: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/notification/updateSeen.ts b/packages/bsky/src/lexicon/types/app/bsky/notification/updateSeen.ts
index 690e68dbeeb..4269de0642e 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/notification/updateSeen.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/notification/updateSeen.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.notification.updateSeen'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   seenAt: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/richtext/facet.ts b/packages/bsky/src/lexicon/types/app/bsky/richtext/facet.ts
index 139b5382caf..8085d33c8ee 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/richtext/facet.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/richtext/facet.ts
@@ -2,97 +2,92 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.richtext.facet'
 
 /** Annotation of a sub-string within rich text. */
 export interface Main {
+  $type?: 'app.bsky.richtext.facet'
   index: ByteSlice
-  features: (Mention | Link | Tag | { $type: string; [k: string]: unknown })[]
-  [k: string]: unknown
+  features: ($Typed<Mention> | $Typed<Link> | $Typed<Tag> | { $type: string })[]
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.richtext.facet#main' ||
-      v.$type === 'app.bsky.richtext.facet')
-  )
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#main', v)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
 /** Facet feature for mention of another account. The text is usually a handle, including a '@' prefix, but the facet reference is a DID. */
 export interface Mention {
+  $type?: 'app.bsky.richtext.facet#mention'
   did: string
-  [k: string]: unknown
 }
 
-export function isMention(v: unknown): v is Mention {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#mention'
-  )
+const hashMention = 'mention'
+
+export function isMention<V>(v: V) {
+  return is$typed(v, id, hashMention)
 }
 
-export function validateMention(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#mention', v)
+export function validateMention<V>(v: V) {
+  return validate<Mention & V>(v, id, hashMention)
 }
 
 /** Facet feature for a URL. The text URL may have been simplified or truncated, but the facet reference should be a complete URL. */
 export interface Link {
+  $type?: 'app.bsky.richtext.facet#link'
   uri: string
-  [k: string]: unknown
 }
 
-export function isLink(v: unknown): v is Link {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#link'
-  )
+const hashLink = 'link'
+
+export function isLink<V>(v: V) {
+  return is$typed(v, id, hashLink)
 }
 
-export function validateLink(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#link', v)
+export function validateLink<V>(v: V) {
+  return validate<Link & V>(v, id, hashLink)
 }
 
 /** Facet feature for a hashtag. The text usually includes a '#' prefix, but the facet reference should not (except in the case of 'double hash tags'). */
 export interface Tag {
+  $type?: 'app.bsky.richtext.facet#tag'
   tag: string
-  [k: string]: unknown
 }
 
-export function isTag(v: unknown): v is Tag {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.richtext.facet#tag'
-  )
+const hashTag = 'tag'
+
+export function isTag<V>(v: V) {
+  return is$typed(v, id, hashTag)
 }
 
-export function validateTag(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#tag', v)
+export function validateTag<V>(v: V) {
+  return validate<Tag & V>(v, id, hashTag)
 }
 
 /** Specifies the sub-string range a facet feature applies to. Start index is inclusive, end index is exclusive. Indices are zero-indexed, counting bytes of the UTF-8 encoded text. NOTE: some languages, like Javascript, use UTF-16 or Unicode codepoints for string slice indexing; in these languages, convert to byte arrays before working with facets. */
 export interface ByteSlice {
+  $type?: 'app.bsky.richtext.facet#byteSlice'
   byteStart: number
   byteEnd: number
-  [k: string]: unknown
 }
 
-export function isByteSlice(v: unknown): v is ByteSlice {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#byteSlice'
-  )
+const hashByteSlice = 'byteSlice'
+
+export function isByteSlice<V>(v: V) {
+  return is$typed(v, id, hashByteSlice)
 }
 
-export function validateByteSlice(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#byteSlice', v)
+export function validateByteSlice<V>(v: V) {
+  return validate<ByteSlice & V>(v, id, hashByteSlice)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/defs.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/defs.ts
index f25e35853c5..6bde35e5709 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/defs.ts
@@ -2,84 +2,77 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.defs'
 
 export interface SkeletonSearchPost {
+  $type?: 'app.bsky.unspecced.defs#skeletonSearchPost'
   uri: string
-  [k: string]: unknown
 }
 
-export function isSkeletonSearchPost(v: unknown): v is SkeletonSearchPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#skeletonSearchPost'
-  )
+const hashSkeletonSearchPost = 'skeletonSearchPost'
+
+export function isSkeletonSearchPost<V>(v: V) {
+  return is$typed(v, id, hashSkeletonSearchPost)
 }
 
-export function validateSkeletonSearchPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.unspecced.defs#skeletonSearchPost', v)
+export function validateSkeletonSearchPost<V>(v: V) {
+  return validate<SkeletonSearchPost & V>(v, id, hashSkeletonSearchPost)
 }
 
 export interface SkeletonSearchActor {
+  $type?: 'app.bsky.unspecced.defs#skeletonSearchActor'
   did: string
-  [k: string]: unknown
 }
 
-export function isSkeletonSearchActor(v: unknown): v is SkeletonSearchActor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#skeletonSearchActor'
-  )
+const hashSkeletonSearchActor = 'skeletonSearchActor'
+
+export function isSkeletonSearchActor<V>(v: V) {
+  return is$typed(v, id, hashSkeletonSearchActor)
 }
 
-export function validateSkeletonSearchActor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.unspecced.defs#skeletonSearchActor', v)
+export function validateSkeletonSearchActor<V>(v: V) {
+  return validate<SkeletonSearchActor & V>(v, id, hashSkeletonSearchActor)
 }
 
 export interface SkeletonSearchStarterPack {
+  $type?: 'app.bsky.unspecced.defs#skeletonSearchStarterPack'
   uri: string
-  [k: string]: unknown
 }
 
-export function isSkeletonSearchStarterPack(
-  v: unknown,
-): v is SkeletonSearchStarterPack {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#skeletonSearchStarterPack'
-  )
+const hashSkeletonSearchStarterPack = 'skeletonSearchStarterPack'
+
+export function isSkeletonSearchStarterPack<V>(v: V) {
+  return is$typed(v, id, hashSkeletonSearchStarterPack)
 }
 
-export function validateSkeletonSearchStarterPack(
-  v: unknown,
-): ValidationResult {
-  return lexicons.validate(
-    'app.bsky.unspecced.defs#skeletonSearchStarterPack',
+export function validateSkeletonSearchStarterPack<V>(v: V) {
+  return validate<SkeletonSearchStarterPack & V>(
     v,
+    id,
+    hashSkeletonSearchStarterPack,
   )
 }
 
 export interface TrendingTopic {
+  $type?: 'app.bsky.unspecced.defs#trendingTopic'
   topic: string
   displayName?: string
   description?: string
   link: string
-  [k: string]: unknown
 }
 
-export function isTrendingTopic(v: unknown): v is TrendingTopic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#trendingTopic'
-  )
+const hashTrendingTopic = 'trendingTopic'
+
+export function isTrendingTopic<V>(v: V) {
+  return is$typed(v, id, hashTrendingTopic)
 }
 
-export function validateTrendingTopic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.unspecced.defs#trendingTopic', v)
+export function validateTrendingTopic<V>(v: V) {
+  return validate<TrendingTopic & V>(v, id, hashTrendingTopic)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getConfig.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getConfig.ts
index e922e1f10df..c4ebde0c7bf 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getConfig.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getConfig.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.getConfig'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
 
 export interface OutputSchema {
   checkEmailConfirmed?: boolean
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
index 56ecba098be..ad662f6a41b 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from '../feed/defs'
+import type * as AppBskyFeedDefs from '../feed/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.getPopularFeedGenerators'
 
 export interface QueryParams {
   limit: number
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feeds: AppBskyFeedDefs.GeneratorView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
index 4b68e768e20..c6d9a6963c4 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyUnspeccedDefs from './defs'
+import type * as AppBskyUnspeccedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.getSuggestionsSkeleton'
 
 export interface QueryParams {
   /** DID of the account making the request (not included for public/unauthenticated queries). Used to boost followed accounts in ranking. */
@@ -27,7 +31,6 @@ export interface OutputSchema {
   relativeToDid?: string
   /** Snowflake for this recommendation, use when submitting recommendation events. */
   recId?: number
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
index 7febcd64994..bb0b8acd2b1 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.getTaggedSuggestions'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
 
 export interface OutputSchema {
   suggestions: Suggestion[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -44,23 +47,18 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Suggestion {
+  $type?: 'app.bsky.unspecced.getTaggedSuggestions#suggestion'
   tag: string
   subjectType: 'actor' | 'feed' | (string & {})
   subject: string
-  [k: string]: unknown
 }
 
-export function isSuggestion(v: unknown): v is Suggestion {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.getTaggedSuggestions#suggestion'
-  )
+const hashSuggestion = 'suggestion'
+
+export function isSuggestion<V>(v: V) {
+  return is$typed(v, id, hashSuggestion)
 }
 
-export function validateSuggestion(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'app.bsky.unspecced.getTaggedSuggestions#suggestion',
-    v,
-  )
+export function validateSuggestion<V>(v: V) {
+  return validate<Suggestion & V>(v, id, hashSuggestion)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
index 469ecd63b79..6ffd18ce20d 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyUnspeccedDefs from './defs'
+import type * as AppBskyUnspeccedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.getTrendingTopics'
 
 export interface QueryParams {
   /** DID of the account making the request (not included for public/unauthenticated queries). Used to boost followed accounts in ranking. */
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   topics: AppBskyUnspeccedDefs.TrendingTopic[]
   suggested: AppBskyUnspeccedDefs.TrendingTopic[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
index 0cb2c5e0b9c..8972f20da04 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyUnspeccedDefs from './defs'
+import type * as AppBskyUnspeccedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.searchActorsSkeleton'
 
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. For typeahead search, only simple term match is supported, not full syntax. */
@@ -28,7 +32,6 @@ export interface OutputSchema {
   /** Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. */
   hitsTotal?: number
   actors: AppBskyUnspeccedDefs.SkeletonSearchActor[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
index 00318176398..6e116ab78ba 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyUnspeccedDefs from './defs'
+import type * as AppBskyUnspeccedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.searchPostsSkeleton'
 
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
@@ -44,7 +48,6 @@ export interface OutputSchema {
   /** Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. */
   hitsTotal?: number
   posts: AppBskyUnspeccedDefs.SkeletonSearchPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
index d488cb43fed..05f18e7cc2b 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyUnspeccedDefs from './defs'
+import type * as AppBskyUnspeccedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.searchStarterPacksSkeleton'
 
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
@@ -26,7 +30,6 @@ export interface OutputSchema {
   /** Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. */
   hitsTotal?: number
   starterPacks: AppBskyUnspeccedDefs.SkeletonSearchStarterPack[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/video/defs.ts b/packages/bsky/src/lexicon/types/app/bsky/video/defs.ts
index 12f4d674794..15079613e68 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/video/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/video/defs.ts
@@ -2,11 +2,16 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.video.defs'
 
 export interface JobStatus {
+  $type?: 'app.bsky.video.defs#jobStatus'
   jobId: string
   did: string
   /** The state of the video processing job. All values not listed as a known value indicate that the job is in process. */
@@ -16,17 +21,14 @@ export interface JobStatus {
   blob?: BlobRef
   error?: string
   message?: string
-  [k: string]: unknown
 }
 
-export function isJobStatus(v: unknown): v is JobStatus {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.video.defs#jobStatus'
-  )
+const hashJobStatus = 'jobStatus'
+
+export function isJobStatus<V>(v: V) {
+  return is$typed(v, id, hashJobStatus)
 }
 
-export function validateJobStatus(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.video.defs#jobStatus', v)
+export function validateJobStatus<V>(v: V) {
+  return validate<JobStatus & V>(v, id, hashJobStatus)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/video/getJobStatus.ts b/packages/bsky/src/lexicon/types/app/bsky/video/getJobStatus.ts
index 846dbf5e0b5..8add5896050 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/video/getJobStatus.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/video/getJobStatus.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyVideoDefs from './defs'
+import type * as AppBskyVideoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.video.getJobStatus'
 
 export interface QueryParams {
   jobId: string
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   jobStatus: AppBskyVideoDefs.JobStatus
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/video/getUploadLimits.ts b/packages/bsky/src/lexicon/types/app/bsky/video/getUploadLimits.ts
index d1930430c9d..70069eaf71e 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/video/getUploadLimits.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/video/getUploadLimits.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.video.getUploadLimits'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -18,7 +22,6 @@ export interface OutputSchema {
   remainingDailyBytes?: number
   message?: string
   error?: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/video/uploadVideo.ts b/packages/bsky/src/lexicon/types/app/bsky/video/uploadVideo.ts
index 99291559507..576c84967a5 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/video/uploadVideo.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/video/uploadVideo.ts
@@ -2,13 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import stream from 'stream'
+import stream from 'node:stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyVideoDefs from './defs'
+import type * as AppBskyVideoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.video.uploadVideo'
 
 export interface QueryParams {}
 
@@ -16,7 +20,6 @@ export type InputSchema = string | Uint8Array | Blob
 
 export interface OutputSchema {
   jobStatus: AppBskyVideoDefs.JobStatus
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/actor/declaration.ts b/packages/bsky/src/lexicon/types/chat/bsky/actor/declaration.ts
index b837351c1e1..b153d13a088 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/actor/declaration.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/actor/declaration.ts
@@ -2,24 +2,26 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.actor.declaration'
 
 export interface Record {
+  $type: 'chat.bsky.actor.declaration'
   allowIncoming: 'all' | 'none' | 'following' | (string & {})
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'chat.bsky.actor.declaration#main' ||
-      v.$type === 'chat.bsky.actor.declaration')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.actor.declaration#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/actor/defs.ts b/packages/bsky/src/lexicon/types/chat/bsky/actor/defs.ts
index 8a05d480784..031c1d1a87c 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/actor/defs.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/actor/defs.ts
@@ -2,13 +2,18 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../../../app/bsky/actor/defs.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.actor.defs'
 
 export interface ProfileViewBasic {
+  $type?: 'chat.bsky.actor.defs#profileViewBasic'
   did: string
   handle: string
   displayName?: string
@@ -18,17 +23,14 @@ export interface ProfileViewBasic {
   labels?: ComAtprotoLabelDefs.Label[]
   /** Set to true when the actor cannot actively participate in converations */
   chatDisabled?: boolean
-  [k: string]: unknown
 }
 
-export function isProfileViewBasic(v: unknown): v is ProfileViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.actor.defs#profileViewBasic'
-  )
+const hashProfileViewBasic = 'profileViewBasic'
+
+export function isProfileViewBasic<V>(v: V) {
+  return is$typed(v, id, hashProfileViewBasic)
 }
 
-export function validateProfileViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.actor.defs#profileViewBasic', v)
+export function validateProfileViewBasic<V>(v: V) {
+  return validate<ProfileViewBasic & V>(v, id, hashProfileViewBasic)
 }
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/actor/deleteAccount.ts b/packages/bsky/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
index 1ae84f6c7cc..bfad6d56da6 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
@@ -3,18 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.actor.deleteAccount'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export type HandlerInput = undefined
 
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/actor/exportAccountData.ts b/packages/bsky/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
index 363a8c68b97..e97a0ede3ef 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
@@ -2,13 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import stream from 'stream'
+import stream from 'node:stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.actor.exportAccountData'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/defs.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/defs.ts
index b2452410be2..4d458fb798e 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/defs.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/defs.ts
@@ -2,215 +2,193 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyRichtextFacet from '../../../app/bsky/richtext/facet'
-import * as AppBskyEmbedRecord from '../../../app/bsky/embed/record'
-import * as ChatBskyActorDefs from '../actor/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyRichtextFacet from '../../../app/bsky/richtext/facet.js'
+import type * as AppBskyEmbedRecord from '../../../app/bsky/embed/record.js'
+import type * as ChatBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.defs'
 
 export interface MessageRef {
+  $type?: 'chat.bsky.convo.defs#messageRef'
   did: string
   convoId: string
   messageId: string
-  [k: string]: unknown
 }
 
-export function isMessageRef(v: unknown): v is MessageRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageRef'
-  )
+const hashMessageRef = 'messageRef'
+
+export function isMessageRef<V>(v: V) {
+  return is$typed(v, id, hashMessageRef)
 }
 
-export function validateMessageRef(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageRef', v)
+export function validateMessageRef<V>(v: V) {
+  return validate<MessageRef & V>(v, id, hashMessageRef)
 }
 
 export interface MessageInput {
+  $type?: 'chat.bsky.convo.defs#messageInput'
   text: string
   /** Annotations of text (mentions, URLs, hashtags, etc) */
   facets?: AppBskyRichtextFacet.Main[]
-  embed?: AppBskyEmbedRecord.Main | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+  embed?: $Typed<AppBskyEmbedRecord.Main> | { $type: string }
 }
 
-export function isMessageInput(v: unknown): v is MessageInput {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageInput'
-  )
+const hashMessageInput = 'messageInput'
+
+export function isMessageInput<V>(v: V) {
+  return is$typed(v, id, hashMessageInput)
 }
 
-export function validateMessageInput(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageInput', v)
+export function validateMessageInput<V>(v: V) {
+  return validate<MessageInput & V>(v, id, hashMessageInput)
 }
 
 export interface MessageView {
+  $type?: 'chat.bsky.convo.defs#messageView'
   id: string
   rev: string
   text: string
   /** Annotations of text (mentions, URLs, hashtags, etc) */
   facets?: AppBskyRichtextFacet.Main[]
-  embed?: AppBskyEmbedRecord.View | { $type: string; [k: string]: unknown }
+  embed?: $Typed<AppBskyEmbedRecord.View> | { $type: string }
   sender: MessageViewSender
   sentAt: string
-  [k: string]: unknown
 }
 
-export function isMessageView(v: unknown): v is MessageView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageView'
-  )
+const hashMessageView = 'messageView'
+
+export function isMessageView<V>(v: V) {
+  return is$typed(v, id, hashMessageView)
 }
 
-export function validateMessageView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageView', v)
+export function validateMessageView<V>(v: V) {
+  return validate<MessageView & V>(v, id, hashMessageView)
 }
 
 export interface DeletedMessageView {
+  $type?: 'chat.bsky.convo.defs#deletedMessageView'
   id: string
   rev: string
   sender: MessageViewSender
   sentAt: string
-  [k: string]: unknown
 }
 
-export function isDeletedMessageView(v: unknown): v is DeletedMessageView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#deletedMessageView'
-  )
+const hashDeletedMessageView = 'deletedMessageView'
+
+export function isDeletedMessageView<V>(v: V) {
+  return is$typed(v, id, hashDeletedMessageView)
 }
 
-export function validateDeletedMessageView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#deletedMessageView', v)
+export function validateDeletedMessageView<V>(v: V) {
+  return validate<DeletedMessageView & V>(v, id, hashDeletedMessageView)
 }
 
 export interface MessageViewSender {
+  $type?: 'chat.bsky.convo.defs#messageViewSender'
   did: string
-  [k: string]: unknown
 }
 
-export function isMessageViewSender(v: unknown): v is MessageViewSender {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageViewSender'
-  )
+const hashMessageViewSender = 'messageViewSender'
+
+export function isMessageViewSender<V>(v: V) {
+  return is$typed(v, id, hashMessageViewSender)
 }
 
-export function validateMessageViewSender(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageViewSender', v)
+export function validateMessageViewSender<V>(v: V) {
+  return validate<MessageViewSender & V>(v, id, hashMessageViewSender)
 }
 
 export interface ConvoView {
+  $type?: 'chat.bsky.convo.defs#convoView'
   id: string
   rev: string
   members: ChatBskyActorDefs.ProfileViewBasic[]
   lastMessage?:
-    | MessageView
-    | DeletedMessageView
-    | { $type: string; [k: string]: unknown }
+    | $Typed<MessageView>
+    | $Typed<DeletedMessageView>
+    | { $type: string }
   muted: boolean
   opened?: boolean
   unreadCount: number
-  [k: string]: unknown
 }
 
-export function isConvoView(v: unknown): v is ConvoView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#convoView'
-  )
+const hashConvoView = 'convoView'
+
+export function isConvoView<V>(v: V) {
+  return is$typed(v, id, hashConvoView)
 }
 
-export function validateConvoView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#convoView', v)
+export function validateConvoView<V>(v: V) {
+  return validate<ConvoView & V>(v, id, hashConvoView)
 }
 
 export interface LogBeginConvo {
+  $type?: 'chat.bsky.convo.defs#logBeginConvo'
   rev: string
   convoId: string
-  [k: string]: unknown
 }
 
-export function isLogBeginConvo(v: unknown): v is LogBeginConvo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logBeginConvo'
-  )
+const hashLogBeginConvo = 'logBeginConvo'
+
+export function isLogBeginConvo<V>(v: V) {
+  return is$typed(v, id, hashLogBeginConvo)
 }
 
-export function validateLogBeginConvo(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logBeginConvo', v)
+export function validateLogBeginConvo<V>(v: V) {
+  return validate<LogBeginConvo & V>(v, id, hashLogBeginConvo)
 }
 
 export interface LogLeaveConvo {
+  $type?: 'chat.bsky.convo.defs#logLeaveConvo'
   rev: string
   convoId: string
-  [k: string]: unknown
 }
 
-export function isLogLeaveConvo(v: unknown): v is LogLeaveConvo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logLeaveConvo'
-  )
+const hashLogLeaveConvo = 'logLeaveConvo'
+
+export function isLogLeaveConvo<V>(v: V) {
+  return is$typed(v, id, hashLogLeaveConvo)
 }
 
-export function validateLogLeaveConvo(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logLeaveConvo', v)
+export function validateLogLeaveConvo<V>(v: V) {
+  return validate<LogLeaveConvo & V>(v, id, hashLogLeaveConvo)
 }
 
 export interface LogCreateMessage {
+  $type?: 'chat.bsky.convo.defs#logCreateMessage'
   rev: string
   convoId: string
-  message:
-    | MessageView
-    | DeletedMessageView
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+  message: $Typed<MessageView> | $Typed<DeletedMessageView> | { $type: string }
 }
 
-export function isLogCreateMessage(v: unknown): v is LogCreateMessage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logCreateMessage'
-  )
+const hashLogCreateMessage = 'logCreateMessage'
+
+export function isLogCreateMessage<V>(v: V) {
+  return is$typed(v, id, hashLogCreateMessage)
 }
 
-export function validateLogCreateMessage(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logCreateMessage', v)
+export function validateLogCreateMessage<V>(v: V) {
+  return validate<LogCreateMessage & V>(v, id, hashLogCreateMessage)
 }
 
 export interface LogDeleteMessage {
+  $type?: 'chat.bsky.convo.defs#logDeleteMessage'
   rev: string
   convoId: string
-  message:
-    | MessageView
-    | DeletedMessageView
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+  message: $Typed<MessageView> | $Typed<DeletedMessageView> | { $type: string }
 }
 
-export function isLogDeleteMessage(v: unknown): v is LogDeleteMessage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logDeleteMessage'
-  )
+const hashLogDeleteMessage = 'logDeleteMessage'
+
+export function isLogDeleteMessage<V>(v: V) {
+  return is$typed(v, id, hashLogDeleteMessage)
 }
 
-export function validateLogDeleteMessage(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logDeleteMessage', v)
+export function validateLogDeleteMessage<V>(v: V) {
+  return validate<LogDeleteMessage & V>(v, id, hashLogDeleteMessage)
 }
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
index 2a70c63df4f..5a75ca53e09 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.deleteMessageForSelf'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
   messageId: string
-  [k: string]: unknown
 }
 
 export type OutputSchema = ChatBskyConvoDefs.DeletedMessageView
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvo.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvo.ts
index e6d1a651280..e0f3ed80b2a 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvo.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvo.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.getConvo'
 
 export interface QueryParams {
   convoId: string
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
index 0062e2230e6..0b085f06893 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.getConvoForMembers'
 
 export interface QueryParams {
   members: string[]
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/getLog.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/getLog.ts
index 2d1354f09bd..d439c2eabfb 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/getLog.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/getLog.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.getLog'
 
 export interface QueryParams {
   cursor?: string
@@ -18,13 +22,12 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   logs: (
-    | ChatBskyConvoDefs.LogBeginConvo
-    | ChatBskyConvoDefs.LogLeaveConvo
-    | ChatBskyConvoDefs.LogCreateMessage
-    | ChatBskyConvoDefs.LogDeleteMessage
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ChatBskyConvoDefs.LogBeginConvo>
+    | $Typed<ChatBskyConvoDefs.LogLeaveConvo>
+    | $Typed<ChatBskyConvoDefs.LogCreateMessage>
+    | $Typed<ChatBskyConvoDefs.LogDeleteMessage>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/getMessages.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/getMessages.ts
index 689dd4539dd..8c2c327986c 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/getMessages.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/getMessages.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.getMessages'
 
 export interface QueryParams {
   convoId: string
@@ -20,11 +24,10 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   messages: (
-    | ChatBskyConvoDefs.MessageView
-    | ChatBskyConvoDefs.DeletedMessageView
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ChatBskyConvoDefs.MessageView>
+    | $Typed<ChatBskyConvoDefs.DeletedMessageView>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/leaveConvo.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
index 99af5702e29..d7c557469dc 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
@@ -3,22 +3,24 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.leaveConvo'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convoId: string
   rev: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/listConvos.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/listConvos.ts
index 5e9a3dad264..2db1d29308f 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/listConvos.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/listConvos.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.listConvos'
 
 export interface QueryParams {
   limit: number
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   convos: ChatBskyConvoDefs.ConvoView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/muteConvo.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/muteConvo.ts
index 4d39442ff86..3b843c62122 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/muteConvo.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/muteConvo.ts
@@ -3,22 +3,24 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.muteConvo'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessage.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessage.ts
index 94acb7f018d..d8ebca50f53 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessage.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessage.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.sendMessage'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
   message: ChatBskyConvoDefs.MessageInput
-  [k: string]: unknown
 }
 
 export type OutputSchema = ChatBskyConvoDefs.MessageView
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
index 29556e52e7a..9c2e1a22623 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
@@ -3,22 +3,24 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.sendMessageBatch'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   items: BatchItem[]
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   items: ChatBskyConvoDefs.MessageView[]
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
@@ -51,19 +53,17 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface BatchItem {
+  $type?: 'chat.bsky.convo.sendMessageBatch#batchItem'
   convoId: string
   message: ChatBskyConvoDefs.MessageInput
-  [k: string]: unknown
 }
 
-export function isBatchItem(v: unknown): v is BatchItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.sendMessageBatch#batchItem'
-  )
+const hashBatchItem = 'batchItem'
+
+export function isBatchItem<V>(v: V) {
+  return is$typed(v, id, hashBatchItem)
 }
 
-export function validateBatchItem(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.sendMessageBatch#batchItem', v)
+export function validateBatchItem<V>(v: V) {
+  return validate<BatchItem & V>(v, id, hashBatchItem)
 }
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
index 4d39442ff86..cc29f5bb24e 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
@@ -3,22 +3,24 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.unmuteConvo'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/updateRead.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/updateRead.ts
index 6aa23309332..f4f12cd7789 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/updateRead.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/updateRead.ts
@@ -3,23 +3,25 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.updateRead'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
   messageId?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts b/packages/bsky/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
index f99260a1b85..5c24a50c5b5 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.moderation.getActorMetadata'
+
 export interface QueryParams {
   actor: string
 }
@@ -18,7 +22,6 @@ export interface OutputSchema {
   day: Metadata
   month: Metadata
   all: Metadata
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -48,21 +51,19 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Metadata {
+  $type?: 'chat.bsky.moderation.getActorMetadata#metadata'
   messagesSent: number
   messagesReceived: number
   convos: number
   convosStarted: number
-  [k: string]: unknown
 }
 
-export function isMetadata(v: unknown): v is Metadata {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.moderation.getActorMetadata#metadata'
-  )
+const hashMetadata = 'metadata'
+
+export function isMetadata<V>(v: V) {
+  return is$typed(v, id, hashMetadata)
 }
 
-export function validateMetadata(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.moderation.getActorMetadata#metadata', v)
+export function validateMetadata<V>(v: V) {
+  return validate<Metadata & V>(v, id, hashMetadata)
 }
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts b/packages/bsky/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
index 39489eb7c12..037d4dde4ec 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from '../convo/defs'
+import type * as ChatBskyConvoDefs from '../convo/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.moderation.getMessageContext'
 
 export interface QueryParams {
   /** Conversation that the message is from. NOTE: this field will eventually be required. */
@@ -21,11 +25,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   messages: (
-    | ChatBskyConvoDefs.MessageView
-    | ChatBskyConvoDefs.DeletedMessageView
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ChatBskyConvoDefs.MessageView>
+    | $Typed<ChatBskyConvoDefs.DeletedMessageView>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts b/packages/bsky/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
index 17324495c1c..6bf8c511da7 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.moderation.updateActorAccess'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   actor: string
   allowAccess: boolean
   ref?: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/defs.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/defs.ts
index f58b7c7ece4..c130e5bb0c2 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/defs.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/defs.ts
@@ -2,34 +2,37 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoServerDefs from '../server/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoServerDefs from '../server/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.defs'
 
 export interface StatusAttr {
+  $type?: 'com.atproto.admin.defs#statusAttr'
   applied: boolean
   ref?: string
-  [k: string]: unknown
 }
 
-export function isStatusAttr(v: unknown): v is StatusAttr {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#statusAttr'
-  )
+const hashStatusAttr = 'statusAttr'
+
+export function isStatusAttr<V>(v: V) {
+  return is$typed(v, id, hashStatusAttr)
 }
 
-export function validateStatusAttr(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#statusAttr', v)
+export function validateStatusAttr<V>(v: V) {
+  return validate<StatusAttr & V>(v, id, hashStatusAttr)
 }
 
 export interface AccountView {
+  $type?: 'com.atproto.admin.defs#accountView'
   did: string
   handle: string
   email?: string
-  relatedRecords?: {}[]
+  relatedRecords?: { [_ in string]: unknown }[]
   indexedAt: string
   invitedBy?: ComAtprotoServerDefs.InviteCode
   invites?: ComAtprotoServerDefs.InviteCode[]
@@ -38,71 +41,62 @@ export interface AccountView {
   inviteNote?: string
   deactivatedAt?: string
   threatSignatures?: ThreatSignature[]
-  [k: string]: unknown
 }
 
-export function isAccountView(v: unknown): v is AccountView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#accountView'
-  )
+const hashAccountView = 'accountView'
+
+export function isAccountView<V>(v: V) {
+  return is$typed(v, id, hashAccountView)
 }
 
-export function validateAccountView(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#accountView', v)
+export function validateAccountView<V>(v: V) {
+  return validate<AccountView & V>(v, id, hashAccountView)
 }
 
 export interface RepoRef {
+  $type?: 'com.atproto.admin.defs#repoRef'
   did: string
-  [k: string]: unknown
 }
 
-export function isRepoRef(v: unknown): v is RepoRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#repoRef'
-  )
+const hashRepoRef = 'repoRef'
+
+export function isRepoRef<V>(v: V) {
+  return is$typed(v, id, hashRepoRef)
 }
 
-export function validateRepoRef(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#repoRef', v)
+export function validateRepoRef<V>(v: V) {
+  return validate<RepoRef & V>(v, id, hashRepoRef)
 }
 
 export interface RepoBlobRef {
+  $type?: 'com.atproto.admin.defs#repoBlobRef'
   did: string
   cid: string
   recordUri?: string
-  [k: string]: unknown
 }
 
-export function isRepoBlobRef(v: unknown): v is RepoBlobRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#repoBlobRef'
-  )
+const hashRepoBlobRef = 'repoBlobRef'
+
+export function isRepoBlobRef<V>(v: V) {
+  return is$typed(v, id, hashRepoBlobRef)
 }
 
-export function validateRepoBlobRef(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#repoBlobRef', v)
+export function validateRepoBlobRef<V>(v: V) {
+  return validate<RepoBlobRef & V>(v, id, hashRepoBlobRef)
 }
 
 export interface ThreatSignature {
+  $type?: 'com.atproto.admin.defs#threatSignature'
   property: string
   value: string
-  [k: string]: unknown
 }
 
-export function isThreatSignature(v: unknown): v is ThreatSignature {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#threatSignature'
-  )
+const hashThreatSignature = 'threatSignature'
+
+export function isThreatSignature<V>(v: V) {
+  return is$typed(v, id, hashThreatSignature)
 }
 
-export function validateThreatSignature(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#threatSignature', v)
+export function validateThreatSignature<V>(v: V) {
+  return validate<ThreatSignature & V>(v, id, hashThreatSignature)
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/deleteAccount.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/deleteAccount.ts
index 1b0223ea303..f000acc12b1 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/deleteAccount.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/deleteAccount.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.deleteAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   did: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
index d8f8ecad320..1d01b3a8860 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.disableAccountInvites'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   account: string
   /** Optional reason for disabled invites. */
   note?: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
index 75a9fb472a5..5b112c656e8 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
@@ -3,17 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.disableInviteCodes'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   codes?: string[]
   accounts?: string[]
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
index b072ad7ec56..a8e1a00894c 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.enableAccountInvites'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   account: string
   /** Optional reason for enabled invites. */
   note?: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfo.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
index acea7749774..c6f703d1625 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
+import type * as ComAtprotoAdminDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.getAccountInfo'
 
 export interface QueryParams {
   did: string
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfos.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
index 7d9fa3fdcbf..c876c92ef6b 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
+import type * as ComAtprotoAdminDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.getAccountInfos'
 
 export interface QueryParams {
   dids: string[]
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   infos: ComAtprotoAdminDefs.AccountView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/getInviteCodes.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
index 9619d5e4b5b..d685988633c 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoServerDefs from '../server/defs'
+import type * as ComAtprotoServerDefs from '../server/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.getInviteCodes'
 
 export interface QueryParams {
   sort: 'recent' | 'usage' | (string & {})
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   codes: ComAtprotoServerDefs.InviteCode[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
index 3aff3e6f322..06d25f389ec 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
@@ -3,12 +3,16 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
-import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
+import type * as ComAtprotoAdminDefs from './defs.js'
+import type * as ComAtprotoRepoStrongRef from '../repo/strongRef.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.getSubjectStatus'
 
 export interface QueryParams {
   did?: string
@@ -20,13 +24,12 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ComAtprotoAdminDefs.RepoBlobRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ComAtprotoAdminDefs.RepoBlobRef>
+    | { $type: string }
   takedown?: ComAtprotoAdminDefs.StatusAttr
   deactivated?: ComAtprotoAdminDefs.StatusAttr
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/searchAccounts.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/searchAccounts.ts
index 96b26867f41..043d5a0ba31 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/searchAccounts.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/searchAccounts.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
+import type * as ComAtprotoAdminDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.searchAccounts'
 
 export interface QueryParams {
   email?: string
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   accounts: ComAtprotoAdminDefs.AccountView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/sendEmail.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/sendEmail.ts
index 5c8bebe791d..462e403aa0c 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/sendEmail.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/sendEmail.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.sendEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -17,12 +21,10 @@ export interface InputSchema {
   senderDid: string
   /** Additional comment by the sender that won't be used in the email itself but helpful to provide more context for moderators/reviewers */
   comment?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   sent: boolean
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
index e3ea26f7298..c9e60e9c621 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.updateAccountEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   /** The handle or DID of the repo. */
   account: string
   email: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
index 87d861faef5..721a486dc16 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
@@ -3,17 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.updateAccountHandle'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   did: string
   handle: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
index b6aef601e13..c782b5cc9ce 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
@@ -3,17 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.updateAccountPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   did: string
   password: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
index ae48689cb4f..f768e076005 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
@@ -3,34 +3,36 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
-import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
+import type * as ComAtprotoAdminDefs from './defs.js'
+import type * as ComAtprotoRepoStrongRef from '../repo/strongRef.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.updateSubjectStatus'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ComAtprotoAdminDefs.RepoBlobRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ComAtprotoAdminDefs.RepoBlobRef>
+    | { $type: string }
   takedown?: ComAtprotoAdminDefs.StatusAttr
   deactivated?: ComAtprotoAdminDefs.StatusAttr
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ComAtprotoAdminDefs.RepoBlobRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ComAtprotoAdminDefs.RepoBlobRef>
+    | { $type: string }
   takedown?: ComAtprotoAdminDefs.StatusAttr
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts b/packages/bsky/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
index 33bd5f6fa05..add1d696b5c 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.getRecommendedDidCredentials'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -16,9 +20,8 @@ export interface OutputSchema {
   /** Recommended rotation keys for PLC dids. Should be undefined (or ignored) for did:webs. */
   rotationKeys?: string[]
   alsoKnownAs?: string[]
-  verificationMethods?: {}
-  services?: {}
-  [k: string]: unknown
+  verificationMethods?: { [_ in string]: unknown }
+  services?: { [_ in string]: unknown }
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts b/packages/bsky/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
index 7620d0abb69..a9818c9bece 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.requestPlcOperationSignature'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/identity/resolveHandle.ts b/packages/bsky/src/lexicon/types/com/atproto/identity/resolveHandle.ts
index e319fbfbadb..7c7fd5fe225 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/identity/resolveHandle.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/resolveHandle.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.resolveHandle'
+
 export interface QueryParams {
   /** The handle to resolve. */
   handle: string
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   did: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/identity/signPlcOperation.ts b/packages/bsky/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
index 9b0cb540b8e..b8b684fd5c2 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.signPlcOperation'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -15,15 +19,13 @@ export interface InputSchema {
   token?: string
   rotationKeys?: string[]
   alsoKnownAs?: string[]
-  verificationMethods?: {}
-  services?: {}
-  [k: string]: unknown
+  verificationMethods?: { [_ in string]: unknown }
+  services?: { [_ in string]: unknown }
 }
 
 export interface OutputSchema {
   /** A signed DID PLC operation. */
-  operation: {}
-  [k: string]: unknown
+  operation: { [_ in string]: unknown }
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts b/packages/bsky/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
index 9b85d7dcb2f..388ad351dec 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.submitPlcOperation'
+
 export interface QueryParams {}
 
 export interface InputSchema {
-  operation: {}
-  [k: string]: unknown
+  operation: { [_ in string]: unknown }
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/identity/updateHandle.ts b/packages/bsky/src/lexicon/types/com/atproto/identity/updateHandle.ts
index 8a271d80264..dee985db8f2 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/identity/updateHandle.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/updateHandle.ts
@@ -3,17 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.updateHandle'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   /** The new handle. */
   handle: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/label/defs.ts b/packages/bsky/src/lexicon/types/com/atproto/label/defs.ts
index 348e985622b..b5f75bfce0b 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/label/defs.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/label/defs.ts
@@ -2,12 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.label.defs'
 
 /** Metadata tag on an atproto resource (eg, repo or record). */
 export interface Label {
+  $type?: 'com.atproto.label.defs#label'
   /** The AT Protocol version of the label object. */
   ver?: number
   /** DID of the actor who created this label. */
@@ -26,60 +31,54 @@ export interface Label {
   exp?: string
   /** Signature of dag-cbor encoded label. */
   sig?: Uint8Array
-  [k: string]: unknown
 }
 
-export function isLabel(v: unknown): v is Label {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#label'
-  )
+const hashLabel = 'label'
+
+export function isLabel<V>(v: V) {
+  return is$typed(v, id, hashLabel)
 }
 
-export function validateLabel(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#label', v)
+export function validateLabel<V>(v: V) {
+  return validate<Label & V>(v, id, hashLabel)
 }
 
 /** Metadata tags on an atproto record, published by the author within the record. */
 export interface SelfLabels {
+  $type?: 'com.atproto.label.defs#selfLabels'
   values: SelfLabel[]
-  [k: string]: unknown
 }
 
-export function isSelfLabels(v: unknown): v is SelfLabels {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#selfLabels'
-  )
+const hashSelfLabels = 'selfLabels'
+
+export function isSelfLabels<V>(v: V) {
+  return is$typed(v, id, hashSelfLabels)
 }
 
-export function validateSelfLabels(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#selfLabels', v)
+export function validateSelfLabels<V>(v: V) {
+  return validate<SelfLabels & V>(v, id, hashSelfLabels)
 }
 
 /** Metadata tag on an atproto record, published by the author within the record. Note that schemas should use #selfLabels, not #selfLabel. */
 export interface SelfLabel {
+  $type?: 'com.atproto.label.defs#selfLabel'
   /** The short string name of the value or type of this label. */
   val: string
-  [k: string]: unknown
 }
 
-export function isSelfLabel(v: unknown): v is SelfLabel {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#selfLabel'
-  )
+const hashSelfLabel = 'selfLabel'
+
+export function isSelfLabel<V>(v: V) {
+  return is$typed(v, id, hashSelfLabel)
 }
 
-export function validateSelfLabel(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#selfLabel', v)
+export function validateSelfLabel<V>(v: V) {
+  return validate<SelfLabel & V>(v, id, hashSelfLabel)
 }
 
 /** Declares a label value and its expected interpretations and behaviors. */
 export interface LabelValueDefinition {
+  $type?: 'com.atproto.label.defs#labelValueDefinition'
   /** The value of the label being defined. Must only include lowercase ascii and the '-' character ([a-z-]+). */
   identifier: string
   /** How should a client visually convey this label? 'inform' means neutral and informational; 'alert' means negative and warning; 'none' means show nothing. */
@@ -91,48 +90,40 @@ export interface LabelValueDefinition {
   /** Does the user need to have adult content enabled in order to configure this label? */
   adultOnly?: boolean
   locales: LabelValueDefinitionStrings[]
-  [k: string]: unknown
 }
 
-export function isLabelValueDefinition(v: unknown): v is LabelValueDefinition {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#labelValueDefinition'
-  )
+const hashLabelValueDefinition = 'labelValueDefinition'
+
+export function isLabelValueDefinition<V>(v: V) {
+  return is$typed(v, id, hashLabelValueDefinition)
 }
 
-export function validateLabelValueDefinition(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#labelValueDefinition', v)
+export function validateLabelValueDefinition<V>(v: V) {
+  return validate<LabelValueDefinition & V>(v, id, hashLabelValueDefinition)
 }
 
 /** Strings which describe the label in the UI, localized into a specific language. */
 export interface LabelValueDefinitionStrings {
+  $type?: 'com.atproto.label.defs#labelValueDefinitionStrings'
   /** The code of the language these strings are written in. */
   lang: string
   /** A short human-readable name for the label. */
   name: string
   /** A longer description of what the label means and why it might be applied. */
   description: string
-  [k: string]: unknown
 }
 
-export function isLabelValueDefinitionStrings(
-  v: unknown,
-): v is LabelValueDefinitionStrings {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#labelValueDefinitionStrings'
-  )
+const hashLabelValueDefinitionStrings = 'labelValueDefinitionStrings'
+
+export function isLabelValueDefinitionStrings<V>(v: V) {
+  return is$typed(v, id, hashLabelValueDefinitionStrings)
 }
 
-export function validateLabelValueDefinitionStrings(
-  v: unknown,
-): ValidationResult {
-  return lexicons.validate(
-    'com.atproto.label.defs#labelValueDefinitionStrings',
+export function validateLabelValueDefinitionStrings<V>(v: V) {
+  return validate<LabelValueDefinitionStrings & V>(
     v,
+    id,
+    hashLabelValueDefinitionStrings,
   )
 }
 
diff --git a/packages/bsky/src/lexicon/types/com/atproto/label/queryLabels.ts b/packages/bsky/src/lexicon/types/com/atproto/label/queryLabels.ts
index 9873f6914b4..b179124e639 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/label/queryLabels.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/label/queryLabels.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoLabelDefs from './defs'
+import type * as ComAtprotoLabelDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.label.queryLabels'
 
 export interface QueryParams {
   /** List of AT URI patterns to match (boolean 'OR'). Each may be a prefix (ending with '*'; will match inclusive of the string leading to '*'), or a full URI. */
@@ -23,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   labels: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/label/subscribeLabels.ts b/packages/bsky/src/lexicon/types/com/atproto/label/subscribeLabels.ts
index 6034b35d895..da6e961fa94 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/label/subscribeLabels.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/label/subscribeLabels.ts
@@ -2,22 +2,23 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, ErrorFrame } from '@atproto/xrpc-server'
-import { IncomingMessage } from 'http'
-import * as ComAtprotoLabelDefs from './defs'
+import { IncomingMessage } from 'node:http'
+import type * as ComAtprotoLabelDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.label.subscribeLabels'
 
 export interface QueryParams {
   /** The last known event seq number to backfill from. */
   cursor?: number
 }
 
-export type OutputSchema =
-  | Labels
-  | Info
-  | { $type: string; [k: string]: unknown }
+export type OutputSchema = $Typed<Labels> | $Typed<Info> | { $type: string }
 export type HandlerError = ErrorFrame<'FutureCursor'>
 export type HandlerOutput = HandlerError | OutputSchema
 export type HandlerReqCtx<HA extends HandlerAuth = never> = {
@@ -31,37 +32,33 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => AsyncIterable<HandlerOutput>
 
 export interface Labels {
+  $type?: 'com.atproto.label.subscribeLabels#labels'
   seq: number
   labels: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isLabels(v: unknown): v is Labels {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.subscribeLabels#labels'
-  )
+const hashLabels = 'labels'
+
+export function isLabels<V>(v: V) {
+  return is$typed(v, id, hashLabels)
 }
 
-export function validateLabels(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.subscribeLabels#labels', v)
+export function validateLabels<V>(v: V) {
+  return validate<Labels & V>(v, id, hashLabels)
 }
 
 export interface Info {
+  $type?: 'com.atproto.label.subscribeLabels#info'
   name: 'OutdatedCursor' | (string & {})
   message?: string
-  [k: string]: unknown
 }
 
-export function isInfo(v: unknown): v is Info {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.subscribeLabels#info'
-  )
+const hashInfo = 'info'
+
+export function isInfo<V>(v: V) {
+  return is$typed(v, id, hashInfo)
 }
 
-export function validateInfo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.subscribeLabels#info', v)
+export function validateInfo<V>(v: V) {
+  return validate<Info & V>(v, id, hashInfo)
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/lexicon/schema.ts b/packages/bsky/src/lexicon/types/com/atproto/lexicon/schema.ts
index fbb12809710..4f632560c7f 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/lexicon/schema.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/lexicon/schema.ts
@@ -2,25 +2,27 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.lexicon.schema'
 
 export interface Record {
+  $type: 'com.atproto.lexicon.schema'
   /** Indicates the 'version' of the Lexicon language. Must be '1' for the current atproto/Lexicon schema system. */
   lexicon: number
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'com.atproto.lexicon.schema#main' ||
-      v.$type === 'com.atproto.lexicon.schema')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.lexicon.schema#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/moderation/createReport.ts b/packages/bsky/src/lexicon/types/com/atproto/moderation/createReport.ts
index dc7985c7685..5022352bc70 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/moderation/createReport.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/moderation/createReport.ts
@@ -3,13 +3,17 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoModerationDefs from './defs'
-import * as ComAtprotoAdminDefs from '../admin/defs'
-import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
+import type * as ComAtprotoModerationDefs from './defs.js'
+import type * as ComAtprotoAdminDefs from '../admin/defs.js'
+import type * as ComAtprotoRepoStrongRef from '../repo/strongRef.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.moderation.createReport'
 
 export interface QueryParams {}
 
@@ -18,10 +22,9 @@ export interface InputSchema {
   /** Additional context about the content and violation. */
   reason?: string
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | { $type: string }
 }
 
 export interface OutputSchema {
@@ -29,12 +32,11 @@ export interface OutputSchema {
   reasonType: ComAtprotoModerationDefs.ReasonType
   reason?: string
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | { $type: string }
   reportedBy: string
   createdAt: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/moderation/defs.ts b/packages/bsky/src/lexicon/types/com/atproto/moderation/defs.ts
index 08e555c2422..2d7a46f5dd8 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/moderation/defs.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/moderation/defs.ts
@@ -2,9 +2,13 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.moderation.defs'
 
 export type ReasonType =
   | 'com.atproto.moderation.defs#reasonSpam'
@@ -17,16 +21,16 @@ export type ReasonType =
   | (string & {})
 
 /** Spam: frequent unwanted promotion, replies, mentions */
-export const REASONSPAM = 'com.atproto.moderation.defs#reasonSpam'
+export const REASONSPAM = `${id}#reasonSpam`
 /** Direct violation of server rules, laws, terms of service */
-export const REASONVIOLATION = 'com.atproto.moderation.defs#reasonViolation'
+export const REASONVIOLATION = `${id}#reasonViolation`
 /** Misleading identity, affiliation, or content */
-export const REASONMISLEADING = 'com.atproto.moderation.defs#reasonMisleading'
+export const REASONMISLEADING = `${id}#reasonMisleading`
 /** Unwanted or mislabeled sexual content */
-export const REASONSEXUAL = 'com.atproto.moderation.defs#reasonSexual'
+export const REASONSEXUAL = `${id}#reasonSexual`
 /** Rude, harassing, explicit, or otherwise unwelcoming behavior */
-export const REASONRUDE = 'com.atproto.moderation.defs#reasonRude'
+export const REASONRUDE = `${id}#reasonRude`
 /** Other: reports not falling under another report category */
-export const REASONOTHER = 'com.atproto.moderation.defs#reasonOther'
+export const REASONOTHER = `${id}#reasonOther`
 /** Appeal: appeal a previously taken moderation action */
-export const REASONAPPEAL = 'com.atproto.moderation.defs#reasonAppeal'
+export const REASONAPPEAL = `${id}#reasonAppeal`
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/applyWrites.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/applyWrites.ts
index a58fcc0a56b..c6e07aff94e 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/applyWrites.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/applyWrites.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoRepoDefs from './defs'
+import type * as ComAtprotoRepoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.applyWrites'
 
 export interface QueryParams {}
 
@@ -16,16 +20,18 @@ export interface InputSchema {
   repo: string
   /** Can be set to 'false' to skip Lexicon schema validation of record data across all operations, 'true' to require it, or leave unset to validate only for known Lexicons. */
   validate?: boolean
-  writes: (Create | Update | Delete)[]
+  writes: ($Typed<Create> | $Typed<Update> | $Typed<Delete>)[]
   /** If provided, the entire operation will fail if the current repo commit CID does not match this value. Used to prevent conflicting repo mutations. */
   swapCommit?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   commit?: ComAtprotoRepoDefs.CommitMeta
-  results?: (CreateResult | UpdateResult | DeleteResult)[]
-  [k: string]: unknown
+  results?: (
+    | $Typed<CreateResult>
+    | $Typed<UpdateResult>
+    | $Typed<DeleteResult>
+  )[]
 }
 
 export interface HandlerInput {
@@ -60,113 +66,101 @@ export type Handler<HA extends HandlerAuth = never> = (
 
 /** Operation which creates a new record. */
 export interface Create {
+  $type?: 'com.atproto.repo.applyWrites#create'
   collection: string
   rkey?: string
-  value: {}
-  [k: string]: unknown
+  value: { [_ in string]: unknown }
 }
 
-export function isCreate(v: unknown): v is Create {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#create'
-  )
+const hashCreate = 'create'
+
+export function isCreate<V>(v: V) {
+  return is$typed(v, id, hashCreate)
 }
 
-export function validateCreate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#create', v)
+export function validateCreate<V>(v: V) {
+  return validate<Create & V>(v, id, hashCreate)
 }
 
 /** Operation which updates an existing record. */
 export interface Update {
+  $type?: 'com.atproto.repo.applyWrites#update'
   collection: string
   rkey: string
-  value: {}
-  [k: string]: unknown
+  value: { [_ in string]: unknown }
 }
 
-export function isUpdate(v: unknown): v is Update {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#update'
-  )
+const hashUpdate = 'update'
+
+export function isUpdate<V>(v: V) {
+  return is$typed(v, id, hashUpdate)
 }
 
-export function validateUpdate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#update', v)
+export function validateUpdate<V>(v: V) {
+  return validate<Update & V>(v, id, hashUpdate)
 }
 
 /** Operation which deletes an existing record. */
 export interface Delete {
+  $type?: 'com.atproto.repo.applyWrites#delete'
   collection: string
   rkey: string
-  [k: string]: unknown
 }
 
-export function isDelete(v: unknown): v is Delete {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#delete'
-  )
+const hashDelete = 'delete'
+
+export function isDelete<V>(v: V) {
+  return is$typed(v, id, hashDelete)
 }
 
-export function validateDelete(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#delete', v)
+export function validateDelete<V>(v: V) {
+  return validate<Delete & V>(v, id, hashDelete)
 }
 
 export interface CreateResult {
+  $type?: 'com.atproto.repo.applyWrites#createResult'
   uri: string
   cid: string
   validationStatus?: 'valid' | 'unknown' | (string & {})
-  [k: string]: unknown
 }
 
-export function isCreateResult(v: unknown): v is CreateResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#createResult'
-  )
+const hashCreateResult = 'createResult'
+
+export function isCreateResult<V>(v: V) {
+  return is$typed(v, id, hashCreateResult)
 }
 
-export function validateCreateResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#createResult', v)
+export function validateCreateResult<V>(v: V) {
+  return validate<CreateResult & V>(v, id, hashCreateResult)
 }
 
 export interface UpdateResult {
+  $type?: 'com.atproto.repo.applyWrites#updateResult'
   uri: string
   cid: string
   validationStatus?: 'valid' | 'unknown' | (string & {})
-  [k: string]: unknown
 }
 
-export function isUpdateResult(v: unknown): v is UpdateResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#updateResult'
-  )
+const hashUpdateResult = 'updateResult'
+
+export function isUpdateResult<V>(v: V) {
+  return is$typed(v, id, hashUpdateResult)
 }
 
-export function validateUpdateResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#updateResult', v)
+export function validateUpdateResult<V>(v: V) {
+  return validate<UpdateResult & V>(v, id, hashUpdateResult)
 }
 
 export interface DeleteResult {
-  [k: string]: unknown
+  $type?: 'com.atproto.repo.applyWrites#deleteResult'
 }
 
-export function isDeleteResult(v: unknown): v is DeleteResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#deleteResult'
-  )
+const hashDeleteResult = 'deleteResult'
+
+export function isDeleteResult<V>(v: V) {
+  return is$typed(v, id, hashDeleteResult)
 }
 
-export function validateDeleteResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#deleteResult', v)
+export function validateDeleteResult<V>(v: V) {
+  return validate<DeleteResult & V>(v, id, hashDeleteResult)
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/createRecord.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/createRecord.ts
index 0982f49bf3d..f844aa60313 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/createRecord.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/createRecord.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoRepoDefs from './defs'
+import type * as ComAtprotoRepoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.createRecord'
 
 export interface QueryParams {}
 
@@ -21,10 +25,9 @@ export interface InputSchema {
   /** Can be set to 'false' to skip Lexicon schema validation of record data, 'true' to require it, or leave unset to validate only for known Lexicons. */
   validate?: boolean
   /** The record itself. Must contain a $type field. */
-  record: {}
+  record: { [_ in string]: unknown }
   /** Compare and swap with the previous commit by CID. */
   swapCommit?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
@@ -32,7 +35,6 @@ export interface OutputSchema {
   cid: string
   commit?: ComAtprotoRepoDefs.CommitMeta
   validationStatus?: 'valid' | 'unknown' | (string & {})
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/defs.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/defs.ts
index 8357fe2a611..3b02739d7dd 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/defs.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/defs.ts
@@ -2,24 +2,26 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.defs'
 
 export interface CommitMeta {
+  $type?: 'com.atproto.repo.defs#commitMeta'
   cid: string
   rev: string
-  [k: string]: unknown
 }
 
-export function isCommitMeta(v: unknown): v is CommitMeta {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.defs#commitMeta'
-  )
+const hashCommitMeta = 'commitMeta'
+
+export function isCommitMeta<V>(v: V) {
+  return is$typed(v, id, hashCommitMeta)
 }
 
-export function validateCommitMeta(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.defs#commitMeta', v)
+export function validateCommitMeta<V>(v: V) {
+  return validate<CommitMeta & V>(v, id, hashCommitMeta)
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/deleteRecord.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/deleteRecord.ts
index c86ab7ba47a..ce903f82544 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/deleteRecord.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/deleteRecord.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoRepoDefs from './defs'
+import type * as ComAtprotoRepoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.deleteRecord'
 
 export interface QueryParams {}
 
@@ -22,12 +26,10 @@ export interface InputSchema {
   swapRecord?: string
   /** Compare and swap with the previous commit by CID. */
   swapCommit?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   commit?: ComAtprotoRepoDefs.CommitMeta
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/describeRepo.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/describeRepo.ts
index 5b187f3758c..c2c6afe848d 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/describeRepo.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/describeRepo.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.describeRepo'
+
 export interface QueryParams {
   /** The handle or DID of the repo. */
   repo: string
@@ -19,12 +23,11 @@ export interface OutputSchema {
   handle: string
   did: string
   /** The complete DID document for this account. */
-  didDoc: {}
+  didDoc: { [_ in string]: unknown }
   /** List of all the collections (NSIDs) for which this repo contains at least one record. */
   collections: string[]
   /** Indicates if handle is currently valid (resolves bi-directionally) */
   handleIsCorrect: boolean
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/getRecord.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/getRecord.ts
index 96ce9ee551f..62509f77008 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/getRecord.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/getRecord.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.getRecord'
+
 export interface QueryParams {
   /** The handle or DID of the repo. */
   repo: string
@@ -24,8 +28,7 @@ export type InputSchema = undefined
 export interface OutputSchema {
   uri: string
   cid?: string
-  value: {}
-  [k: string]: unknown
+  value: { [_ in string]: unknown }
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/importRepo.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/importRepo.ts
index 685918f455f..f15a7784258 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/importRepo.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/importRepo.ts
@@ -2,13 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import stream from 'stream'
+import stream from 'node:stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.importRepo'
+
 export interface QueryParams {}
 
 export type InputSchema = string | Uint8Array | Blob
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
index f1be00d8e87..0404bac3f48 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.listMissingBlobs'
+
 export interface QueryParams {
   limit: number
   cursor?: string
@@ -18,7 +22,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   blobs: RecordBlob[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -48,19 +51,17 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface RecordBlob {
+  $type?: 'com.atproto.repo.listMissingBlobs#recordBlob'
   cid: string
   recordUri: string
-  [k: string]: unknown
 }
 
-export function isRecordBlob(v: unknown): v is RecordBlob {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.listMissingBlobs#recordBlob'
-  )
+const hashRecordBlob = 'recordBlob'
+
+export function isRecordBlob<V>(v: V) {
+  return is$typed(v, id, hashRecordBlob)
 }
 
-export function validateRecordBlob(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.listMissingBlobs#recordBlob', v)
+export function validateRecordBlob<V>(v: V) {
+  return validate<RecordBlob & V>(v, id, hashRecordBlob)
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/listRecords.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/listRecords.ts
index e328cfbb204..573d34d70a8 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/listRecords.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/listRecords.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.listRecords'
+
 export interface QueryParams {
   /** The handle or DID of the repo. */
   repo: string
@@ -29,7 +33,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   records: Record[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -59,20 +62,18 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Record {
+  $type?: 'com.atproto.repo.listRecords#record'
   uri: string
   cid: string
-  value: {}
-  [k: string]: unknown
+  value: { [_ in string]: unknown }
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.listRecords#record'
-  )
+const hashRecord = 'record'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.listRecords#record', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/putRecord.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/putRecord.ts
index 269244ede91..7d417a860f6 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/putRecord.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/putRecord.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoRepoDefs from './defs'
+import type * as ComAtprotoRepoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.putRecord'
 
 export interface QueryParams {}
 
@@ -21,12 +25,11 @@ export interface InputSchema {
   /** Can be set to 'false' to skip Lexicon schema validation of record data, 'true' to require it, or leave unset to validate only for known Lexicons. */
   validate?: boolean
   /** The record to write. */
-  record: {}
+  record: { [_ in string]: unknown }
   /** Compare and swap with the previous record by CID. WARNING: nullable and optional field; may cause problems with golang implementation */
   swapRecord?: string | null
   /** Compare and swap with the previous commit by CID. */
   swapCommit?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
@@ -34,7 +37,6 @@ export interface OutputSchema {
   cid: string
   commit?: ComAtprotoRepoDefs.CommitMeta
   validationStatus?: 'valid' | 'unknown' | (string & {})
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/strongRef.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/strongRef.ts
index 8b21a6ddf81..e2652df53cb 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/strongRef.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/strongRef.ts
@@ -2,25 +2,26 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+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
-  [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'com.atproto.repo.strongRef#main' ||
-      v.$type === 'com.atproto.repo.strongRef')
-  )
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.strongRef#main', v)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/uploadBlob.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/uploadBlob.ts
index 7595e7295e6..c523b188706 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/uploadBlob.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/uploadBlob.ts
@@ -2,20 +2,23 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import stream from 'stream'
+import stream from 'node:stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.uploadBlob'
+
 export interface QueryParams {}
 
 export type InputSchema = string | Uint8Array | Blob
 
 export interface OutputSchema {
   blob: BlobRef
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/activateAccount.ts b/packages/bsky/src/lexicon/types/com/atproto/server/activateAccount.ts
index 7620d0abb69..70cd19e46a5 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/activateAccount.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/activateAccount.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.activateAccount'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/checkAccountStatus.ts b/packages/bsky/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
index 2ad98689303..0487aea5938 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.checkAccountStatus'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -22,7 +26,6 @@ export interface OutputSchema {
   privateStateValues: number
   expectedBlobs: number
   importedBlobs: number
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/confirmEmail.ts b/packages/bsky/src/lexicon/types/com/atproto/server/confirmEmail.ts
index d6338b80fc5..9a3cb61558b 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/confirmEmail.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/confirmEmail.ts
@@ -3,17 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.confirmEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   email: string
   token: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/createAccount.ts b/packages/bsky/src/lexicon/types/com/atproto/server/createAccount.ts
index a85c83edffc..c1efde363c2 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/createAccount.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/createAccount.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.createAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -24,8 +28,7 @@ export interface InputSchema {
   /** DID PLC rotation key (aka, recovery key) to be included in PLC creation operation. */
   recoveryKey?: string
   /** A signed DID PLC operation to be submitted as part of importing an existing account to this instance. NOTE: this optional field may be updated when full account migration is implemented. */
-  plcOp?: {}
-  [k: string]: unknown
+  plcOp?: { [_ in string]: unknown }
 }
 
 /** Account login session returned on successful account creation. */
@@ -36,8 +39,7 @@ export interface OutputSchema {
   /** The DID of the new account. */
   did: string
   /** Complete DID document. */
-  didDoc?: {}
-  [k: string]: unknown
+  didDoc?: { [_ in string]: unknown }
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/createAppPassword.ts b/packages/bsky/src/lexicon/types/com/atproto/server/createAppPassword.ts
index 65ad1d4b4cb..4ef50d9f210 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/createAppPassword.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/createAppPassword.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.createAppPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -15,7 +19,6 @@ export interface InputSchema {
   name: string
   /** If an app password has 'privileged' access to possibly sensitive account state. Meant for use with trusted clients. */
   privileged?: boolean
-  [k: string]: unknown
 }
 
 export type OutputSchema = AppPassword
@@ -51,24 +54,19 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface AppPassword {
+  $type?: 'com.atproto.server.createAppPassword#appPassword'
   name: string
   password: string
   createdAt: string
   privileged?: boolean
-  [k: string]: unknown
 }
 
-export function isAppPassword(v: unknown): v is AppPassword {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.createAppPassword#appPassword'
-  )
+const hashAppPassword = 'appPassword'
+
+export function isAppPassword<V>(v: V) {
+  return is$typed(v, id, hashAppPassword)
 }
 
-export function validateAppPassword(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'com.atproto.server.createAppPassword#appPassword',
-    v,
-  )
+export function validateAppPassword<V>(v: V) {
+  return validate<AppPassword & V>(v, id, hashAppPassword)
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCode.ts b/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCode.ts
index 82daf7eea6f..fcda04f920b 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCode.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCode.ts
@@ -3,22 +3,24 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.createInviteCode'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   useCount: number
   forAccount?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   code: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCodes.ts b/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCodes.ts
index fa2c1f73c2a..6f447d94d74 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCodes.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCodes.ts
@@ -3,23 +3,25 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.createInviteCodes'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   codeCount: number
   useCount: number
   forAccounts?: string[]
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   codes: AccountCodes[]
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
@@ -52,22 +54,17 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface AccountCodes {
+  $type?: 'com.atproto.server.createInviteCodes#accountCodes'
   account: string
   codes: string[]
-  [k: string]: unknown
 }
 
-export function isAccountCodes(v: unknown): v is AccountCodes {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.createInviteCodes#accountCodes'
-  )
+const hashAccountCodes = 'accountCodes'
+
+export function isAccountCodes<V>(v: V) {
+  return is$typed(v, id, hashAccountCodes)
 }
 
-export function validateAccountCodes(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'com.atproto.server.createInviteCodes#accountCodes',
-    v,
-  )
+export function validateAccountCodes<V>(v: V) {
+  return validate<AccountCodes & V>(v, id, hashAccountCodes)
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/createSession.ts b/packages/bsky/src/lexicon/types/com/atproto/server/createSession.ts
index 47ffaaaa0bd..1f3b974ce63 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/createSession.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/createSession.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.createSession'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -17,7 +21,6 @@ export interface InputSchema {
   authFactorToken?: string
   /** When true, instead of throwing error for takendown accounts, a valid response with a narrow scoped token will be returned */
   allowTakendown?: boolean
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
@@ -25,14 +28,13 @@ export interface OutputSchema {
   refreshJwt: string
   handle: string
   did: string
-  didDoc?: {}
+  didDoc?: { [_ in string]: unknown }
   email?: string
   emailConfirmed?: boolean
   emailAuthFactor?: boolean
   active?: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/deactivateAccount.ts b/packages/bsky/src/lexicon/types/com/atproto/server/deactivateAccount.ts
index 56b86424e61..6bf18012bda 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/deactivateAccount.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/deactivateAccount.ts
@@ -3,17 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.deactivateAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   /** A recommendation to server as to how long they should hold onto the deactivated account before deleting. */
   deleteAfter?: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/defs.ts b/packages/bsky/src/lexicon/types/com/atproto/server/defs.ts
index 9bd67c9d7a5..a3b0bb6d989 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/defs.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/defs.ts
@@ -2,11 +2,16 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.defs'
 
 export interface InviteCode {
+  $type?: 'com.atproto.server.defs#inviteCode'
   code: string
   available: number
   disabled: boolean
@@ -14,35 +19,30 @@ export interface InviteCode {
   createdBy: string
   createdAt: string
   uses: InviteCodeUse[]
-  [k: string]: unknown
 }
 
-export function isInviteCode(v: unknown): v is InviteCode {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.defs#inviteCode'
-  )
+const hashInviteCode = 'inviteCode'
+
+export function isInviteCode<V>(v: V) {
+  return is$typed(v, id, hashInviteCode)
 }
 
-export function validateInviteCode(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.defs#inviteCode', v)
+export function validateInviteCode<V>(v: V) {
+  return validate<InviteCode & V>(v, id, hashInviteCode)
 }
 
 export interface InviteCodeUse {
+  $type?: 'com.atproto.server.defs#inviteCodeUse'
   usedBy: string
   usedAt: string
-  [k: string]: unknown
 }
 
-export function isInviteCodeUse(v: unknown): v is InviteCodeUse {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.defs#inviteCodeUse'
-  )
+const hashInviteCodeUse = 'inviteCodeUse'
+
+export function isInviteCodeUse<V>(v: V) {
+  return is$typed(v, id, hashInviteCodeUse)
 }
 
-export function validateInviteCodeUse(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.defs#inviteCodeUse', v)
+export function validateInviteCodeUse<V>(v: V) {
+  return validate<InviteCodeUse & V>(v, id, hashInviteCodeUse)
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/deleteAccount.ts b/packages/bsky/src/lexicon/types/com/atproto/server/deleteAccount.ts
index 93b7b78a0e5..f717788711b 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/deleteAccount.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/deleteAccount.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.deleteAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   did: string
   password: string
   token: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/deleteSession.ts b/packages/bsky/src/lexicon/types/com/atproto/server/deleteSession.ts
index 7620d0abb69..644d4ffde04 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/deleteSession.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/deleteSession.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.deleteSession'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/describeServer.ts b/packages/bsky/src/lexicon/types/com/atproto/server/describeServer.ts
index 6964a59ffdf..17b0400d611 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/describeServer.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/describeServer.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.describeServer'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -22,7 +26,6 @@ export interface OutputSchema {
   links?: Links
   contact?: Contact
   did: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -52,36 +55,32 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Links {
+  $type?: 'com.atproto.server.describeServer#links'
   privacyPolicy?: string
   termsOfService?: string
-  [k: string]: unknown
 }
 
-export function isLinks(v: unknown): v is Links {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.describeServer#links'
-  )
+const hashLinks = 'links'
+
+export function isLinks<V>(v: V) {
+  return is$typed(v, id, hashLinks)
 }
 
-export function validateLinks(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.describeServer#links', v)
+export function validateLinks<V>(v: V) {
+  return validate<Links & V>(v, id, hashLinks)
 }
 
 export interface Contact {
+  $type?: 'com.atproto.server.describeServer#contact'
   email?: string
-  [k: string]: unknown
 }
 
-export function isContact(v: unknown): v is Contact {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.describeServer#contact'
-  )
+const hashContact = 'contact'
+
+export function isContact<V>(v: V) {
+  return is$typed(v, id, hashContact)
 }
 
-export function validateContact(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.describeServer#contact', v)
+export function validateContact<V>(v: V) {
+  return validate<Contact & V>(v, id, hashContact)
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts b/packages/bsky/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
index 1cdf1299961..3c6998c47ee 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoServerDefs from './defs'
+import type * as ComAtprotoServerDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.getAccountInviteCodes'
 
 export interface QueryParams {
   includeUsed: boolean
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   codes: ComAtprotoServerDefs.InviteCode[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/getServiceAuth.ts b/packages/bsky/src/lexicon/types/com/atproto/server/getServiceAuth.ts
index 1e9d1398be7..a8c53382f01 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/getServiceAuth.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/getServiceAuth.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.getServiceAuth'
+
 export interface QueryParams {
   /** The DID of the service that the token will be used to authenticate with */
   aud: string
@@ -21,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   token: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/getSession.ts b/packages/bsky/src/lexicon/types/com/atproto/server/getSession.ts
index cafa6bc7452..1c5ad0d543f 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/getSession.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/getSession.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.getSession'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -18,11 +22,10 @@ export interface OutputSchema {
   email?: string
   emailConfirmed?: boolean
   emailAuthFactor?: boolean
-  didDoc?: {}
+  didDoc?: { [_ in string]: unknown }
   active?: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/listAppPasswords.ts b/packages/bsky/src/lexicon/types/com/atproto/server/listAppPasswords.ts
index 99219e67f7f..4881fa79fc0 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/listAppPasswords.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/listAppPasswords.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.listAppPasswords'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
 
 export interface OutputSchema {
   passwords: AppPassword[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -45,20 +48,18 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface AppPassword {
+  $type?: 'com.atproto.server.listAppPasswords#appPassword'
   name: string
   createdAt: string
   privileged?: boolean
-  [k: string]: unknown
 }
 
-export function isAppPassword(v: unknown): v is AppPassword {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.listAppPasswords#appPassword'
-  )
+const hashAppPassword = 'appPassword'
+
+export function isAppPassword<V>(v: V) {
+  return is$typed(v, id, hashAppPassword)
 }
 
-export function validateAppPassword(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.listAppPasswords#appPassword', v)
+export function validateAppPassword<V>(v: V) {
+  return validate<AppPassword & V>(v, id, hashAppPassword)
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/refreshSession.ts b/packages/bsky/src/lexicon/types/com/atproto/server/refreshSession.ts
index 59e8f9d5a32..bc13c402019 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/refreshSession.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/refreshSession.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.refreshSession'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -17,11 +21,10 @@ export interface OutputSchema {
   refreshJwt: string
   handle: string
   did: string
-  didDoc?: {}
+  didDoc?: { [_ in string]: unknown }
   active?: boolean
   /** Hosting status of the account. If not specified, then assume 'active'. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/requestAccountDelete.ts b/packages/bsky/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
index 7620d0abb69..e8eac86efbf 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.requestAccountDelete'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts b/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
index 7620d0abb69..2d64a2adf1b 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.requestEmailConfirmation'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts b/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
index 87b9a094ccc..548b4f3a26f 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.requestEmailUpdate'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
 
 export interface OutputSchema {
   tokenRequired: boolean
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/requestPasswordReset.ts b/packages/bsky/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
index ae541342aff..58ae5e8d70e 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.requestPasswordReset'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   email: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/reserveSigningKey.ts b/packages/bsky/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
index 72850ce061b..71a4dd20515 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
@@ -3,23 +3,25 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.reserveSigningKey'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   /** The DID to reserve a key for. */
   did?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   /** The public key for the reserved signing key, in did:key serialization. */
   signingKey: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/resetPassword.ts b/packages/bsky/src/lexicon/types/com/atproto/server/resetPassword.ts
index 4b5b8ea1ecc..d292f7c5f93 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/resetPassword.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/resetPassword.ts
@@ -3,17 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.resetPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   token: string
   password: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/revokeAppPassword.ts b/packages/bsky/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
index 80131f8c9e3..b52e6d5103b 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.revokeAppPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   name: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/updateEmail.ts b/packages/bsky/src/lexicon/types/com/atproto/server/updateEmail.ts
index a80982da4f8..ffd0e2e23b9 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/updateEmail.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/updateEmail.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.updateEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -15,7 +19,6 @@ export interface InputSchema {
   emailAuthFactor?: boolean
   /** Requires a token from com.atproto.sever.requestEmailUpdate if the account's email has been confirmed. */
   token?: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getBlob.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getBlob.ts
index 659c71c1a8d..89c40de7cb7 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getBlob.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getBlob.ts
@@ -2,13 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import stream from 'stream'
+import stream from 'node:stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getBlob'
+
 export interface QueryParams {
   /** The DID of the account. */
   did: string
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getBlocks.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getBlocks.ts
index 7fef8b7f64d..f51e262791a 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getBlocks.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getBlocks.ts
@@ -2,13 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import stream from 'stream'
+import stream from 'node:stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getBlocks'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getCheckout.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getCheckout.ts
index 3d519f6916d..571e3a2badd 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getCheckout.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getCheckout.ts
@@ -2,13 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import stream from 'stream'
+import stream from 'node:stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getCheckout'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getHead.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getHead.ts
index d9bb230cef5..f2a144c2675 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getHead.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getHead.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getHead'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   root: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getLatestCommit.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
index 6041841e311..0446f442025 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getLatestCommit'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
@@ -18,7 +22,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cid: string
   rev: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getRecord.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getRecord.ts
index afbd779faf1..1c7a509b1b4 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getRecord.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getRecord.ts
@@ -2,13 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import stream from 'stream'
+import stream from 'node:stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getRecord'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getRepo.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getRepo.ts
index 62a86f56a38..4e62086f457 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getRepo.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getRepo.ts
@@ -2,13 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import stream from 'stream'
+import stream from 'node:stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getRepo'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getRepoStatus.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
index 743bcc45767..e23b538dc38 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getRepoStatus'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
@@ -22,7 +26,6 @@ export interface OutputSchema {
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
   /** Optional field, the current rev of the repo, if active=true */
   rev?: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/listBlobs.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/listBlobs.ts
index abb1719f41b..34d8557c3a8 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/listBlobs.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/listBlobs.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.listBlobs'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
@@ -22,7 +26,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   cids: string[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/listRepos.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/listRepos.ts
index 228d6a004b5..22d1cfa2db6 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/listRepos.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/listRepos.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.listRepos'
+
 export interface QueryParams {
   limit: number
   cursor?: string
@@ -18,7 +22,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   repos: Repo[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -48,6 +51,7 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Repo {
+  $type?: 'com.atproto.sync.listRepos#repo'
   did: string
   /** Current repo commit CID */
   head: string
@@ -55,17 +59,14 @@ export interface Repo {
   active?: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
-export function isRepo(v: unknown): v is Repo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.listRepos#repo'
-  )
+const hashRepo = 'repo'
+
+export function isRepo<V>(v: V) {
+  return is$typed(v, id, hashRepo)
 }
 
-export function validateRepo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.listRepos#repo', v)
+export function validateRepo<V>(v: V) {
+  return validate<Repo & V>(v, id, hashRepo)
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
index b2d2e6b2e48..1bc47cea7d8 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
@@ -3,17 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.notifyOfUpdate'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   /** Hostname of the current service (usually a PDS) that is notifying of update. */
   hostname: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/requestCrawl.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/requestCrawl.ts
index fd54e157b7b..c50adf43847 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/requestCrawl.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/requestCrawl.ts
@@ -3,17 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.requestCrawl'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   /** Hostname of the current service (eg, PDS) that is requesting to be crawled. */
   hostname: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/subscribeRepos.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
index 8f9855a5da4..0cb11e48b86 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
@@ -2,11 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, ErrorFrame } from '@atproto/xrpc-server'
-import { IncomingMessage } from 'http'
+import { IncomingMessage } from 'node:http'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.subscribeRepos'
 
 export interface QueryParams {
   /** The last known event seq number to backfill from. */
@@ -14,14 +18,14 @@ export interface QueryParams {
 }
 
 export type OutputSchema =
-  | Commit
-  | Identity
-  | Account
-  | Handle
-  | Migrate
-  | Tombstone
-  | Info
-  | { $type: string; [k: string]: unknown }
+  | $Typed<Commit>
+  | $Typed<Identity>
+  | $Typed<Account>
+  | $Typed<Handle>
+  | $Typed<Migrate>
+  | $Typed<Tombstone>
+  | $Typed<Info>
+  | { $type: string }
 export type HandlerError = ErrorFrame<'FutureCursor' | 'ConsumerTooSlow'>
 export type HandlerOutput = HandlerError | OutputSchema
 export type HandlerReqCtx<HA extends HandlerAuth = never> = {
@@ -36,6 +40,7 @@ export type Handler<HA extends HandlerAuth = never> = (
 
 /** Represents an update of repository state. Note that empty commits are allowed, which include no repo data changes, but an update to rev and signature. */
 export interface Commit {
+  $type?: 'com.atproto.sync.subscribeRepos#commit'
   /** The stream sequence number of this message. */
   seq: number
   /** DEPRECATED -- unused */
@@ -58,45 +63,41 @@ export interface Commit {
   blobs: CID[]
   /** Timestamp of when this message was originally broadcast. */
   time: string
-  [k: string]: unknown
 }
 
-export function isCommit(v: unknown): v is Commit {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#commit'
-  )
+const hashCommit = 'commit'
+
+export function isCommit<V>(v: V) {
+  return is$typed(v, id, hashCommit)
 }
 
-export function validateCommit(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#commit', v)
+export function validateCommit<V>(v: V) {
+  return validate<Commit & V>(v, id, hashCommit)
 }
 
 /** Represents a change to an account's identity. Could be an updated handle, signing key, or pds hosting endpoint. Serves as a prod to all downstream services to refresh their identity cache. */
 export interface Identity {
+  $type?: 'com.atproto.sync.subscribeRepos#identity'
   seq: number
   did: string
   time: string
   /** The current handle for the account, or 'handle.invalid' if validation fails. This field is optional, might have been validated or passed-through from an upstream source. Semantics and behaviors for PDS vs Relay may evolve in the future; see atproto specs for more details. */
   handle?: string
-  [k: string]: unknown
 }
 
-export function isIdentity(v: unknown): v is Identity {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#identity'
-  )
+const hashIdentity = 'identity'
+
+export function isIdentity<V>(v: V) {
+  return is$typed(v, id, hashIdentity)
 }
 
-export function validateIdentity(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#identity', v)
+export function validateIdentity<V>(v: V) {
+  return validate<Identity & V>(v, id, hashIdentity)
 }
 
 /** Represents a change to an account's status on a host (eg, PDS or Relay). The semantics of this event are that the status is at the host which emitted the event, not necessarily that at the currently active PDS. Eg, a Relay takedown would emit a takedown with active=false, even if the PDS is still active. */
 export interface Account {
+  $type?: 'com.atproto.sync.subscribeRepos#account'
   seq: number
   did: string
   time: string
@@ -104,118 +105,105 @@ export interface Account {
   active: boolean
   /** If active=false, this optional field indicates a reason for why the account is not active. */
   status?: 'takendown' | 'suspended' | 'deleted' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
-export function isAccount(v: unknown): v is Account {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#account'
-  )
+const hashAccount = 'account'
+
+export function isAccount<V>(v: V) {
+  return is$typed(v, id, hashAccount)
 }
 
-export function validateAccount(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#account', v)
+export function validateAccount<V>(v: V) {
+  return validate<Account & V>(v, id, hashAccount)
 }
 
 /** DEPRECATED -- Use #identity event instead */
 export interface Handle {
+  $type?: 'com.atproto.sync.subscribeRepos#handle'
   seq: number
   did: string
   handle: string
   time: string
-  [k: string]: unknown
 }
 
-export function isHandle(v: unknown): v is Handle {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#handle'
-  )
+const hashHandle = 'handle'
+
+export function isHandle<V>(v: V) {
+  return is$typed(v, id, hashHandle)
 }
 
-export function validateHandle(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#handle', v)
+export function validateHandle<V>(v: V) {
+  return validate<Handle & V>(v, id, hashHandle)
 }
 
 /** DEPRECATED -- Use #account event instead */
 export interface Migrate {
+  $type?: 'com.atproto.sync.subscribeRepos#migrate'
   seq: number
   did: string
   migrateTo: string | null
   time: string
-  [k: string]: unknown
 }
 
-export function isMigrate(v: unknown): v is Migrate {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#migrate'
-  )
+const hashMigrate = 'migrate'
+
+export function isMigrate<V>(v: V) {
+  return is$typed(v, id, hashMigrate)
 }
 
-export function validateMigrate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#migrate', v)
+export function validateMigrate<V>(v: V) {
+  return validate<Migrate & V>(v, id, hashMigrate)
 }
 
 /** DEPRECATED -- Use #account event instead */
 export interface Tombstone {
+  $type?: 'com.atproto.sync.subscribeRepos#tombstone'
   seq: number
   did: string
   time: string
-  [k: string]: unknown
 }
 
-export function isTombstone(v: unknown): v is Tombstone {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#tombstone'
-  )
+const hashTombstone = 'tombstone'
+
+export function isTombstone<V>(v: V) {
+  return is$typed(v, id, hashTombstone)
 }
 
-export function validateTombstone(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#tombstone', v)
+export function validateTombstone<V>(v: V) {
+  return validate<Tombstone & V>(v, id, hashTombstone)
 }
 
 export interface Info {
+  $type?: 'com.atproto.sync.subscribeRepos#info'
   name: 'OutdatedCursor' | (string & {})
   message?: string
-  [k: string]: unknown
 }
 
-export function isInfo(v: unknown): v is Info {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#info'
-  )
+const hashInfo = 'info'
+
+export function isInfo<V>(v: V) {
+  return is$typed(v, id, hashInfo)
 }
 
-export function validateInfo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#info', v)
+export function validateInfo<V>(v: V) {
+  return validate<Info & V>(v, id, hashInfo)
 }
 
 /** A repo operation, ie a mutation of a single record. */
 export interface RepoOp {
+  $type?: 'com.atproto.sync.subscribeRepos#repoOp'
   action: 'create' | 'update' | 'delete' | (string & {})
   path: string
   /** For creates and updates, the new record CID. For deletions, null. */
   cid: CID | null
-  [k: string]: unknown
 }
 
-export function isRepoOp(v: unknown): v is RepoOp {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#repoOp'
-  )
+const hashRepoOp = 'repoOp'
+
+export function isRepoOp<V>(v: V) {
+  return is$typed(v, id, hashRepoOp)
 }
 
-export function validateRepoOp(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#repoOp', v)
+export function validateRepoOp<V>(v: V) {
+  return validate<RepoOp & V>(v, id, hashRepoOp)
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/temp/addReservedHandle.ts b/packages/bsky/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
index 69be85f72df..78679f078eb 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
@@ -3,21 +3,22 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.temp.addReservedHandle'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   handle: string
-  [k: string]: unknown
 }
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export interface HandlerInput {
   encoding: 'application/json'
diff --git a/packages/bsky/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts b/packages/bsky/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
index 9c7ef1ae6ab..375cdcab7d8 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.temp.checkSignupQueue'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -16,7 +20,6 @@ export interface OutputSchema {
   activated: boolean
   placeInQueue?: number
   estimatedTimeMs?: number
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/temp/fetchLabels.ts b/packages/bsky/src/lexicon/types/com/atproto/temp/fetchLabels.ts
index 0392ba06ea2..bda6d96d968 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/temp/fetchLabels.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/temp/fetchLabels.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoLabelDefs from '../label/defs'
+import type * as ComAtprotoLabelDefs from '../label/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.temp.fetchLabels'
 
 export interface QueryParams {
   since?: number
@@ -18,7 +22,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   labels: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts b/packages/bsky/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
index 8ebee2ad46d..f8c12f72948 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.temp.requestPhoneVerification'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   phoneNumber: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/bsky/src/lexicon/util.ts b/packages/bsky/src/lexicon/util.ts
index d7e70440d6e..7f88b6a6ef3 100644
--- a/packages/bsky/src/lexicon/util.ts
+++ b/packages/bsky/src/lexicon/util.ts
@@ -1,13 +1,82 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
-export function isObj(v: unknown): v is Record<string, unknown> {
-  return typeof v === 'object' && v !== null
+
+import { 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 function hasProp<K extends PropertyKey>(
-  data: object,
-  prop: K,
-): data is Record<K, unknown> {
-  return prop in data
+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/packages/bsky/src/views/index.ts b/packages/bsky/src/views/index.ts
index d28b1bc7cb2..ec40166e4dd 100644
--- a/packages/bsky/src/views/index.ts
+++ b/packages/bsky/src/views/index.ts
@@ -1,18 +1,24 @@
 import { mapDefined } from '@atproto/common'
 import { AtUri, INVALID_HANDLE, normalizeDatetimeAlways } from '@atproto/syntax'
 import { ProfileViewerState } from '../hydration/actor'
-import { FeedItem, Post, Repost } from '../hydration/feed'
+import { FeedItem, Like, Post, Repost } from '../hydration/feed'
+import { Follow } from '../hydration/graph'
 import { HydrationState } from '../hydration/hydrator'
 import { Label } from '../hydration/label'
 import { RecordInfo } from '../hydration/util'
 import { ImageUriBuilder } from '../image/uri'
 import { ids } from '../lexicon/lexicons'
 import {
+  KnownFollowers,
   ProfileView,
   ProfileViewBasic,
   ProfileViewDetailed,
   ViewerState as ProfileViewer,
 } from '../lexicon/types/app/bsky/actor/defs'
+import {
+  Record as ProfileRecord,
+  isRecord as isProfileRecord,
+} from '../lexicon/types/app/bsky/actor/profile'
 import {
   BlockedPost,
   FeedViewPost,
@@ -26,7 +32,12 @@ import {
   ThreadgateView,
   isPostView,
 } from '../lexicon/types/app/bsky/feed/defs'
-import { isRecord as isPostRecord } from '../lexicon/types/app/bsky/feed/post'
+import { Record as LikeRecord } from '../lexicon/types/app/bsky/feed/like'
+import {
+  Record as PostRecord,
+  isRecord as isPostRecord,
+} from '../lexicon/types/app/bsky/feed/post'
+import { Record as RepostRecord } from '../lexicon/types/app/bsky/feed/repost'
 import { isListRule } from '../lexicon/types/app/bsky/feed/threadgate'
 import {
   ListView,
@@ -34,11 +45,17 @@ import {
   StarterPackView,
   StarterPackViewBasic,
 } from '../lexicon/types/app/bsky/graph/defs'
+import { Record as FollowRecord } from '../lexicon/types/app/bsky/graph/follow'
 import {
   LabelerView,
   LabelerViewDetailed,
 } from '../lexicon/types/app/bsky/labeler/defs'
+import {
+  Record as LabelerRecord,
+  isRecord as isLabelerRecord,
+} from '../lexicon/types/app/bsky/labeler/service'
 import { isSelfLabels } from '../lexicon/types/com/atproto/label/defs'
+import { $Typed, Un$Typed } from '../lexicon/util'
 import { Notification } from '../proto/bsky_pb'
 import {
   postUriToPostgateUri,
@@ -181,7 +198,7 @@ export class Views {
   profileDetailed(
     did: string,
     state: HydrationState,
-  ): ProfileViewDetailed | undefined {
+  ): Un$Typed<ProfileViewDetailed> | undefined {
     const actor = state.actors?.get(did)
     if (!actor) return
     const baseView = this.profile(did, state)
@@ -223,7 +240,10 @@ export class Views {
     }
   }
 
-  profile(did: string, state: HydrationState): ProfileView | undefined {
+  profile(
+    did: string,
+    state: HydrationState,
+  ): Un$Typed<ProfileView> | undefined {
     const actor = state.actors?.get(did)
     if (!actor) return
     const basicView = this.profileBasic(did, state)
@@ -244,7 +264,7 @@ export class Views {
   profileBasic(
     did: string,
     state: HydrationState,
-  ): ProfileViewBasic | undefined {
+  ): Un$Typed<ProfileViewBasic> | undefined {
     const actor = state.actors?.get(did)
     if (!actor) return
     const profileUri = AtUri.make(
@@ -332,7 +352,10 @@ export class Views {
     }
   }
 
-  knownFollowers(did: string, state: HydrationState) {
+  knownFollowers(
+    did: string,
+    state: HydrationState,
+  ): KnownFollowers | undefined {
     const knownFollowers = state.knownFollowers?.get(did)
     if (!knownFollowers) return
     const blocks = state.bidirectionalBlocks?.get(did)
@@ -369,7 +392,7 @@ export class Views {
   // Graph
   // ------------
 
-  list(uri: string, state: HydrationState): ListView | undefined {
+  list(uri: string, state: HydrationState): Un$Typed<ListView> | undefined {
     const creatorDid = creatorFromUri(uri)
     const list = state.lists?.get(uri)
     if (!list) return
@@ -387,7 +410,10 @@ export class Views {
     }
   }
 
-  listBasic(uri: string, state: HydrationState): ListViewBasic | undefined {
+  listBasic(
+    uri: string,
+    state: HydrationState,
+  ): Un$Typed<ListViewBasic> | undefined {
     const list = state.lists?.get(uri)
     if (!list) {
       return undefined
@@ -423,7 +449,7 @@ export class Views {
   starterPackBasic(
     uri: string,
     state: HydrationState,
-  ): StarterPackViewBasic | undefined {
+  ): Un$Typed<StarterPackViewBasic> | undefined {
     const sp = state.starterPacks?.get(uri)
     if (!sp) return
     const parsedUri = new AtUri(uri)
@@ -443,7 +469,10 @@ export class Views {
     }
   }
 
-  starterPack(uri: string, state: HydrationState): StarterPackView | undefined {
+  starterPack(
+    uri: string,
+    state: HydrationState,
+  ): Un$Typed<StarterPackView> | undefined {
     const sp = state.starterPacks?.get(uri)
     const basicView = this.starterPackBasic(uri, state)
     if (!sp || !basicView) return
@@ -470,14 +499,37 @@ export class Views {
   // Labels
   // ------------
 
-  selfLabels(details: {
+  selfLabels({
+    uri,
+    cid,
+    record,
+  }: {
     uri?: string
     cid?: string
-    record?: Record<string, unknown>
+    record?:
+      | PostRecord
+      | LikeRecord
+      | RepostRecord
+      | FollowRecord
+      | ProfileRecord
+      | LabelerRecord
   }): Label[] {
-    const { uri, cid, record } = details
     if (!uri || !cid || !record) return []
-    if (!isSelfLabels(record.labels)) return []
+
+    // Only these have a "labels" property:
+    if (
+      !isPostRecord(record) &&
+      !isProfileRecord(record) &&
+      !isLabelerRecord(record)
+    ) {
+      return []
+    }
+
+    // Ignore if no labels defines
+    if (!isSelfLabels(record.labels) || !record.labels.values.length) {
+      return []
+    }
+
     const src = creatorFromUri(uri) // record creator
     const cts =
       typeof record.createdAt === 'string'
@@ -488,7 +540,10 @@ export class Views {
     })
   }
 
-  labeler(did: string, state: HydrationState): LabelerView | undefined {
+  labeler(
+    did: string,
+    state: HydrationState,
+  ): Un$Typed<LabelerView> | undefined {
     const labeler = state.labelers?.get(did)
     if (!labeler) return
     const creator = this.profile(did, state)
@@ -524,7 +579,7 @@ export class Views {
   labelerDetailed(
     did: string,
     state: HydrationState,
-  ): LabelerViewDetailed | undefined {
+  ): Un$Typed<LabelerViewDetailed> | undefined {
     const baseView = this.labeler(did, state)
     if (!baseView) return
     const record = state.labelers?.get(did)
@@ -572,7 +627,10 @@ export class Views {
     }
   }
 
-  feedGenerator(uri: string, state: HydrationState): GeneratorView | undefined {
+  feedGenerator(
+    uri: string,
+    state: HydrationState,
+  ): Un$Typed<GeneratorView> | undefined {
     const feedgen = state.feedgens?.get(uri)
     if (!feedgen) return
     const creatorDid = creatorFromUri(uri)
@@ -609,7 +667,10 @@ export class Views {
     }
   }
 
-  threadgate(uri: string, state: HydrationState): ThreadgateView | undefined {
+  threadgate(
+    uri: string,
+    state: HydrationState,
+  ): Un$Typed<ThreadgateView> | undefined {
     const gate = state.threadgates?.get(uri)
     if (!gate) return
     return {
@@ -623,7 +684,11 @@ export class Views {
     }
   }
 
-  post(uri: string, state: HydrationState, depth = 0): PostView | undefined {
+  post(
+    uri: string,
+    state: HydrationState,
+    depth = 0,
+  ): Un$Typed<PostView> | undefined {
     const post = state.posts?.get(uri)
     if (!post) return
     const parsedUri = new AtUri(uri)
@@ -675,9 +740,9 @@ export class Views {
   feedViewPost(
     item: FeedItem,
     state: HydrationState,
-  ): FeedViewPost | undefined {
+  ): Un$Typed<FeedViewPost> | undefined {
     const postInfo = state.posts?.get(item.post.uri)
-    let reason: ReasonRepost | ReasonPin | undefined
+    let reason: $Typed<ReasonRepost> | $Typed<ReasonPin> | undefined
     if (item.authorPinned) {
       reason = this.reasonPin()
     } else if (item.repost) {
@@ -699,7 +764,7 @@ export class Views {
     }
   }
 
-  replyRef(uri: string, state: HydrationState): ReplyRef | undefined {
+  replyRef(uri: string, state: HydrationState): Un$Typed<ReplyRef> | undefined {
     const postRecord = state.posts?.get(uri.toString())?.record
     if (!postRecord?.reply) return
     let root = this.maybePost(postRecord.reply.root.uri, state)
@@ -717,8 +782,13 @@ export class Views {
       }
     }
     let grandparentAuthor: ProfileViewBasic | undefined
-    if (isPostRecord(parent.record) && parent.record.reply) {
+    if (
+      isPostView(parent) &&
+      isPostRecord(parent.record) &&
+      parent.record.reply
+    ) {
       grandparentAuthor = this.profileBasic(
+        // @ts-expect-error isValidPostRecord(parent.record) should be used but the "parent" is not IPDL decoded
         creatorFromUri(parent.record.reply.parent.uri),
         state,
       )
@@ -730,7 +800,7 @@ export class Views {
     }
   }
 
-  maybePost(uri: string, state: HydrationState): MaybePostView {
+  maybePost(uri: string, state: HydrationState): $Typed<MaybePostView> {
     const post = this.post(uri, state)
     if (!post) {
       return this.notFoundPost(uri)
@@ -739,8 +809,8 @@ export class Views {
       return this.blockedPost(uri, post.author.did, state)
     }
     return {
-      $type: 'app.bsky.feed.defs#postView',
       ...post,
+      $type: 'app.bsky.feed.defs#postView',
     }
   }
 
@@ -748,7 +818,7 @@ export class Views {
     uri: string,
     authorDid: string,
     state: HydrationState,
-  ): BlockedPost {
+  ): $Typed<BlockedPost> {
     return {
       $type: 'app.bsky.feed.defs#blockedPost',
       uri,
@@ -760,7 +830,7 @@ export class Views {
     }
   }
 
-  notFoundPost(uri: string): NotFoundPost {
+  notFoundPost(uri: string): $Typed<NotFoundPost> {
     return {
       $type: 'app.bsky.feed.defs#notFoundPost',
       uri,
@@ -772,7 +842,7 @@ export class Views {
     creatorDid: string,
     repost: Repost,
     state: HydrationState,
-  ): ReasonRepost | undefined {
+  ): $Typed<ReasonRepost> | undefined {
     const creator = this.profileBasic(creatorDid, state)
     if (!creator) return
     return {
@@ -782,7 +852,7 @@ export class Views {
     }
   }
 
-  reasonPin() {
+  reasonPin(): $Typed<ReasonPin> {
     return {
       $type: 'app.bsky.feed.defs#reasonPin',
     }
@@ -795,7 +865,7 @@ export class Views {
     skele: { anchor: string; uris: string[] },
     state: HydrationState,
     opts: { height: number; depth: number },
-  ): ThreadViewPost | NotFoundPost | BlockedPost {
+  ): $Typed<ThreadViewPost> | $Typed<NotFoundPost> | $Typed<BlockedPost> {
     const { anchor, uris } = skele
     const post = this.post(anchor, state)
     const postInfo = state.posts?.get(anchor)
@@ -843,7 +913,11 @@ export class Views {
     rootUri: string,
     state: HydrationState,
     height: number,
-  ): ThreadViewPost | NotFoundPost | BlockedPost | undefined {
+  ):
+    | $Typed<ThreadViewPost>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | undefined {
     if (height < 1) return undefined
     const parentUri = state.posts?.get(childUri)?.record.reply?.parent.uri
     if (!parentUri) return undefined
@@ -876,7 +950,7 @@ export class Views {
     childrenByParentUri: Record<string, string[]>,
     state: HydrationState,
     depth: number,
-  ): (ThreadViewPost | BlockedPost)[] | undefined {
+  ): ($Typed<ThreadViewPost> | $Typed<BlockedPost>)[] | undefined {
     if (depth < 1) return undefined
     const childrenUris = childrenByParentUri[parentUri] ?? []
     return mapDefined(childrenUris, (uri) => {
@@ -926,7 +1000,7 @@ export class Views {
     embed: Embed | { $type: string },
     state: HydrationState,
     depth: number,
-  ): EmbedView | undefined {
+  ): $Typed<EmbedView> | undefined {
     if (isImagesEmbed(embed)) {
       return this.imagesEmbed(creatorFromUri(postUri), embed)
     } else if (isVideoEmbed(embed)) {
@@ -942,7 +1016,7 @@ export class Views {
     }
   }
 
-  imagesEmbed(did: string, embed: ImagesEmbed): ImagesEmbedView {
+  imagesEmbed(did: string, embed: ImagesEmbed): $Typed<ImagesEmbedView> {
     const imgViews = embed.images.map((img) => ({
       thumb: this.imgUriBuilder.getPresetUri(
         'feed_thumbnail',
@@ -963,7 +1037,7 @@ export class Views {
     }
   }
 
-  videoEmbed(did: string, embed: VideoEmbed): VideoEmbedView {
+  videoEmbed(did: string, embed: VideoEmbed): $Typed<VideoEmbedView> {
     const cid = cidFromBlobJson(embed.video)
     return {
       $type: 'app.bsky.embed.video#view',
@@ -975,7 +1049,7 @@ export class Views {
     }
   }
 
-  externalEmbed(did: string, embed: ExternalEmbed): ExternalEmbedView {
+  externalEmbed(did: string, embed: ExternalEmbed): $Typed<ExternalEmbedView> {
     const { uri, title, description, thumb } = embed.external
     return {
       $type: 'app.bsky.embed.external#view',
@@ -994,7 +1068,10 @@ export class Views {
     }
   }
 
-  embedNotFound(uri: string): { $type: string; record: EmbedNotFound } {
+  embedNotFound(uri: string): {
+    $type: 'app.bsky.embed.record#view'
+    record: $Typed<EmbedNotFound>
+  } {
     return {
       $type: 'app.bsky.embed.record#view',
       record: {
@@ -1005,7 +1082,10 @@ export class Views {
     }
   }
 
-  embedDetached(uri: string): { $type: string; record: EmbedDetached } {
+  embedDetached(uri: string): {
+    $type: 'app.bsky.embed.record#view'
+    record: $Typed<EmbedDetached>
+  } {
     return {
       $type: 'app.bsky.embed.record#view',
       record: {
@@ -1019,7 +1099,10 @@ export class Views {
   embedBlocked(
     uri: string,
     state: HydrationState,
-  ): { $type: string; record: EmbedBlocked } {
+  ): {
+    $type: 'app.bsky.embed.record#view'
+    record: $Typed<EmbedBlocked>
+  } {
     const creator = creatorFromUri(uri)
     return {
       $type: 'app.bsky.embed.record#view',
@@ -1039,7 +1122,7 @@ export class Views {
     uri: string,
     state: HydrationState,
     depth: number,
-  ): PostEmbedView | undefined {
+  ): $Typed<PostEmbedView> | undefined {
     const postView = this.post(uri, state, depth)
     if (!postView) return
     return {
@@ -1058,6 +1141,20 @@ export class Views {
     }
   }
 
+  recordEmbed(
+    postUri: string,
+    embed: RecordEmbed,
+    state: HydrationState,
+    depth: number,
+    withTypeTag: false,
+  ): RecordEmbedView
+  recordEmbed(
+    postUri: string,
+    embed: RecordEmbed,
+    state: HydrationState,
+    depth: number,
+    withTypeTag?: true,
+  ): $Typed<RecordEmbedView>
   recordEmbed(
     postUri: string,
     embed: RecordEmbed,
@@ -1091,35 +1188,43 @@ export class Views {
     } else if (parsedUri.collection === ids.AppBskyFeedGenerator) {
       const view = this.feedGenerator(uri, state)
       if (!view) return this.embedNotFound(uri)
-      view.$type = 'app.bsky.feed.defs#generatorView'
-      return this.recordEmbedWrapper(view, withTypeTag)
+      return this.recordEmbedWrapper(
+        { ...view, $type: 'app.bsky.feed.defs#generatorView' },
+        withTypeTag,
+      )
     } else if (parsedUri.collection === ids.AppBskyGraphList) {
       const view = this.list(uri, state)
       if (!view) return this.embedNotFound(uri)
-      view.$type = 'app.bsky.graph.defs#listView'
-      return this.recordEmbedWrapper(view, withTypeTag)
+      return this.recordEmbedWrapper(
+        { ...view, $type: 'app.bsky.graph.defs#listView' },
+        withTypeTag,
+      )
     } else if (parsedUri.collection === ids.AppBskyLabelerService) {
       const view = this.labeler(parsedUri.hostname, state)
       if (!view) return this.embedNotFound(uri)
-      view.$type = 'app.bsky.labeler.defs#labelerView'
-      return this.recordEmbedWrapper(view, withTypeTag)
+      return this.recordEmbedWrapper(
+        { ...view, $type: 'app.bsky.labeler.defs#labelerView' },
+        withTypeTag,
+      )
     } else if (parsedUri.collection === ids.AppBskyGraphStarterpack) {
       const view = this.starterPackBasic(uri, state)
       if (!view) return this.embedNotFound(uri)
-      view.$type = 'app.bsky.graph.defs#starterPackViewBasic'
-      return this.recordEmbedWrapper(view, withTypeTag)
+      return this.recordEmbedWrapper(
+        { ...view, $type: 'app.bsky.graph.defs#starterPackViewBasic' },
+        withTypeTag,
+      )
     }
     return this.embedNotFound(uri)
   }
 
-  private recordEmbedWrapper(
-    record: RecordEmbedViewInternal,
+  private recordEmbedWrapper<T extends $Typed<RecordEmbedViewInternal>>(
+    record: T,
     withTypeTag: boolean,
-  ): RecordEmbedView {
+  ) {
     return {
-      $type: withTypeTag ? 'app.bsky.embed.record#view' : undefined,
+      $type: withTypeTag ? ('app.bsky.embed.record#view' as const) : undefined,
       record,
-    }
+    } satisfies RecordEmbedView
   }
 
   recordWithMediaEmbed(
@@ -1127,9 +1232,12 @@ export class Views {
     embed: RecordWithMedia,
     state: HydrationState,
     depth: number,
-  ): RecordWithMediaView | undefined {
+  ): $Typed<RecordWithMediaView> | undefined {
     const creator = creatorFromUri(postUri)
-    let mediaEmbed: ImagesEmbedView | VideoEmbedView | ExternalEmbedView
+    let mediaEmbed:
+      | $Typed<ImagesEmbedView>
+      | $Typed<VideoEmbedView>
+      | $Typed<ExternalEmbedView>
     if (isImagesEmbed(embed.media)) {
       mediaEmbed = this.imagesEmbed(creator, embed.media)
     } else if (isVideoEmbed(embed.media)) {
@@ -1222,13 +1330,22 @@ export class Views {
     notif: Notification,
     lastSeenAt: string | undefined,
     state: HydrationState,
-  ): NotificationView | undefined {
+  ): Un$Typed<NotificationView> | undefined {
     if (!notif.timestamp || !notif.reason) return
     const uri = new AtUri(notif.uri)
     const authorDid = uri.hostname
     const author = this.profile(authorDid, state)
     if (!author) return
-    let recordInfo: RecordInfo<Record<string, unknown>> | null | undefined
+
+    let recordInfo:
+      | Post
+      | Like
+      | Repost
+      | Follow
+      | RecordInfo<ProfileRecord>
+      | undefined
+      | null
+
     if (uri.collection === ids.AppBskyFeedPost) {
       recordInfo = state.posts?.get(notif.uri)
     } else if (uri.collection === ids.AppBskyFeedLike) {
@@ -1248,9 +1365,10 @@ export class Views {
               indexedAt: actor.indexedAt ?? new Date(0), // @NOTE will be present since profile record is present
               takedownRef: actor.profileTakedownRef,
             }
-          : null
+          : undefined
     }
     if (!recordInfo) return
+
     const labels = state.labels?.getBySubject(notif.uri) ?? []
     const selfLabels = this.selfLabels({
       uri: notif.uri,
diff --git a/packages/bsky/src/views/types.ts b/packages/bsky/src/views/types.ts
index a3e30c827f5..84549ab76b3 100644
--- a/packages/bsky/src/views/types.ts
+++ b/packages/bsky/src/views/types.ts
@@ -25,7 +25,10 @@ import {
   NotFoundPost,
   PostView,
 } from '../lexicon/types/app/bsky/feed/defs'
-import { ListView } from '../lexicon/types/app/bsky/graph/defs'
+import {
+  ListView,
+  StarterPackViewBasic,
+} from '../lexicon/types/app/bsky/graph/defs'
 import { LabelerView } from '../lexicon/types/app/bsky/labeler/defs'
 
 export type {
@@ -89,3 +92,4 @@ export type RecordEmbedViewInternal =
   | GeneratorView
   | ListView
   | LabelerView
+  | StarterPackViewBasic
diff --git a/packages/bsky/tests/_util.ts b/packages/bsky/tests/_util.ts
index 954c6c69035..78346277166 100644
--- a/packages/bsky/tests/_util.ts
+++ b/packages/bsky/tests/_util.ts
@@ -5,11 +5,16 @@ import { CID } from 'multiformats/cid'
 import { AppBskyFeedGetPostThread } from '@atproto/api'
 import { lexToJson } from '@atproto/lexicon'
 import { AtUri } from '@atproto/syntax'
-import { isViewRecord } from '../src/lexicon/types/app/bsky/embed/record'
+import {
+  isView as isEmbedRecordView,
+  isViewRecord,
+} from '../src/lexicon/types/app/bsky/embed/record'
+import { isView as isEmbedRecordWithMediaView } from '../src/lexicon/types/app/bsky/embed/recordWithMedia'
 import {
   FeedViewPost,
   PostView,
   isPostView,
+  isReasonRepost,
   isThreadViewPost,
 } from '../src/lexicon/types/app/bsky/feed/defs'
 import {
@@ -17,6 +22,7 @@ import {
   isLabelerView,
   isLabelerViewDetailed,
 } from '../src/lexicon/types/app/bsky/labeler/defs'
+import { $Typed } from '../src/lexicon/util'
 
 type ThreadViewPost = Extract<
   AppBskyFeedGetPostThread.OutputSchema['thread'],
@@ -109,10 +115,10 @@ export const forSnapshot = (obj: unknown) => {
 // Feed testing utils
 
 export const getOriginator = (item: FeedViewPost) => {
-  if (!item.reason) {
-    return item.post.author.did
+  if (isReasonRepost(item.reason)) {
+    return item.reason.by.did
   } else {
-    return (item.reason.by as { [did: string]: string }).did
+    return item.post.author.did
   }
 }
 
@@ -122,8 +128,11 @@ export const getOriginator = (item: FeedViewPost) => {
 // to this:
 //   [{ uri: '0'}, { uri: '1' }, { uri: '0'}]
 const kTake = Symbol('take')
-export function take(obj, value: string): string
-export function take(obj, value: string | undefined): string | undefined
+export function take(obj: Record<string, number>, value: string): string
+export function take(
+  obj: Record<string, number>,
+  value?: string,
+): string | undefined
 export function take(
   obj: { [s: string]: number; [kTake]?: string },
   value: string | undefined,
@@ -143,7 +152,10 @@ export function take(
 export const constantDate = new Date(0).toISOString()
 export const constantKeysetCursor = '0000000000000__bafycid'
 
-const mapLeafValues = (obj: unknown, fn: (val: unknown) => unknown) => {
+const mapLeafValues = (
+  obj: unknown,
+  fn: (val: unknown) => unknown,
+): unknown => {
   if (Array.isArray(obj)) {
     return obj.map((item) => mapLeafValues(item, fn))
   }
@@ -172,34 +184,43 @@ export const paginateAll = async <T extends { cursor?: string }>(
 }
 
 // @NOTE mutates
-export const stripViewer = <T extends { viewer?: Record<string, unknown> }>(
+export const stripViewer = <T extends { viewer?: unknown }>(
   val: T,
-): T => {
+): Omit<T, 'viewer'> => {
   delete val.viewer
   return val
 }
 
 // @NOTE mutates
-export const stripViewerFromPost = (postUnknown: unknown): PostView => {
-  if (postUnknown?.['$type'] && !isPostView(postUnknown)) {
+export function stripViewerFromPost(
+  postUnknown: object,
+  withType?: false,
+): PostView
+export function stripViewerFromPost(
+  postUnknown: object,
+  withType: true,
+): $Typed<PostView>
+export function stripViewerFromPost(
+  postUnknown: object,
+  withType = false,
+): PostView {
+  if ('$type' in postUnknown && !isPostView(postUnknown)) {
     throw new Error('Expected post view')
   }
   const post = postUnknown as PostView
+  if (withType) {
+    post.$type = 'app.bsky.feed.defs#postView'
+  } else {
+    delete post.$type
+  }
   post.author = stripViewer(post.author)
-  const recordEmbed =
-    post.embed && isViewRecord(post.embed.record)
-      ? post.embed.record // Record from record embed
-      : post.embed?.['record'] && isViewRecord(post.embed['record']['record'])
-        ? post.embed['record']['record'] // Record from record-with-media embed
-        : undefined
+
+  const recordEmbed = extractRecordEmbed(post.embed)
+
   if (recordEmbed) {
     recordEmbed.author = stripViewer(recordEmbed.author)
     recordEmbed.embeds?.forEach((deepEmbed) => {
-      const deepRecordEmbed = isViewRecord(deepEmbed.record)
-        ? deepEmbed.record // Record from record embed
-        : deepEmbed['record'] && isViewRecord(deepEmbed['record']['record'])
-          ? deepEmbed['record']['record'] // Record from record-with-media embed
-          : undefined
+      const deepRecordEmbed = extractRecordEmbed(deepEmbed)
       if (deepRecordEmbed) {
         deepRecordEmbed.author = stripViewer(deepRecordEmbed.author)
       }
@@ -208,10 +229,26 @@ export const stripViewerFromPost = (postUnknown: unknown): PostView => {
   return stripViewer(post)
 }
 
+const extractRecordEmbed = (embed: PostView['embed']) =>
+  isEmbedRecordView(embed)
+    ? isViewRecord(embed.record)
+      ? embed.record
+      : undefined
+    : isEmbedRecordWithMediaView(embed)
+      ? isViewRecord(embed.record.record)
+        ? embed.record.record
+        : undefined
+      : undefined
+
 // @NOTE mutates
-export const stripViewerFromThread = <T>(thread: T): T => {
-  if (!isThreadViewPost(thread)) return thread
+export const stripViewerFromThread = <T>(threadUnknown: T): T => {
+  if (!isThreadViewPost(threadUnknown)) return threadUnknown
+
+  const thread = threadUnknown as typeof threadUnknown & ThreadViewPost
+
+  // @ts-expect-error "viewer" does not exist on type 'ThreadViewPost'
   delete thread.viewer
+
   thread.post = stripViewerFromPost(thread.post)
   if (isThreadViewPost(thread.parent)) {
     thread.parent = stripViewerFromThread(thread.parent)
@@ -223,11 +260,9 @@ export const stripViewerFromThread = <T>(thread: T): T => {
 }
 
 // @NOTE mutates
-export const stripViewerFromLabeler = (
-  serviceUnknown: unknown,
-): LabelerView => {
+export const stripViewerFromLabeler = (serviceUnknown: object): LabelerView => {
   if (
-    serviceUnknown?.['$type'] &&
+    '$type' in serviceUnknown &&
     !isLabelerView(serviceUnknown) &&
     !isLabelerViewDetailed(serviceUnknown)
   ) {
diff --git a/packages/bsky/tests/admin/admin-auth.test.ts b/packages/bsky/tests/admin/admin-auth.test.ts
index 8379cb83361..2d73b233724 100644
--- a/packages/bsky/tests/admin/admin-auth.test.ts
+++ b/packages/bsky/tests/admin/admin-auth.test.ts
@@ -1,16 +1,21 @@
+import assert from 'node:assert'
 import { AtpAgent } from '@atproto/api'
 import { Secp256k1Keypair } from '@atproto/crypto'
 import { SeedClient, TestNetwork, usersSeed } from '@atproto/dev-env'
 import { createServiceAuthHeaders } from '@atproto/xrpc-server'
 import { ids } from '../../src/lexicon/lexicons'
-import { RepoRef } from '../../src/lexicon/types/com/atproto/admin/defs'
+import {
+  RepoRef,
+  isRepoRef,
+} from '../../src/lexicon/types/com/atproto/admin/defs'
+import { $Typed } from '../../src/lexicon/util'
 
 describe('admin auth', () => {
   let network: TestNetwork
   let agent: AtpAgent
   let sc: SeedClient
 
-  let repoSubject: RepoRef
+  let repoSubject: $Typed<RepoRef>
 
   const modServiceDid = 'did:example:mod'
   const altModDid = 'did:example:alt'
@@ -96,6 +101,7 @@ describe('admin auth', () => {
       { did: repoSubject.did },
       getHeaders,
     )
+    assert(isRepoRef(res.data.subject))
     expect(res.data.subject.did).toBe(repoSubject.did)
     expect(res.data.takedown?.applied).toBe(true)
   })
diff --git a/packages/bsky/tests/admin/moderation.test.ts b/packages/bsky/tests/admin/moderation.test.ts
index 8ce65843013..3fe1562d5a0 100644
--- a/packages/bsky/tests/admin/moderation.test.ts
+++ b/packages/bsky/tests/admin/moderation.test.ts
@@ -1,19 +1,26 @@
+import assert from 'node:assert'
 import { AtpAgent } from '@atproto/api'
 import { ImageRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import {
   RepoBlobRef,
   RepoRef,
+  isRepoBlobRef,
+  isRepoRef,
 } from '../../src/lexicon/types/com/atproto/admin/defs'
-import { Main as StrongRef } from '../../src/lexicon/types/com/atproto/repo/strongRef'
+import {
+  Main as StrongRef,
+  isMain as isStrongRef,
+} from '../../src/lexicon/types/com/atproto/repo/strongRef'
+import { $Typed } from '../../src/lexicon/util'
 
 describe('moderation', () => {
   let network: TestNetwork
   let agent: AtpAgent
   let sc: SeedClient
 
-  let repoSubject: RepoRef
-  let recordSubject: StrongRef
-  let blobSubject: RepoBlobRef
+  let repoSubject: $Typed<RepoRef>
+  let recordSubject: $Typed<StrongRef>
+  let blobSubject: $Typed<RepoBlobRef>
   let blobRef: ImageRef
 
   beforeAll(async () => {
@@ -64,6 +71,7 @@ describe('moderation', () => {
       },
       { headers: network.bsky.adminAuthHeaders() },
     )
+    assert(isRepoRef(res.data.subject))
     expect(res.data.subject.did).toEqual(sc.dids.bob)
     expect(res.data.takedown?.applied).toBe(true)
     // expect(res.data.takedown?.ref).toBe('test-repo') @TODO add these checks back in once takedown refs make it into dataplane
@@ -86,6 +94,7 @@ describe('moderation', () => {
       },
       { headers: network.bsky.adminAuthHeaders() },
     )
+    assert(isRepoRef(res.data.subject))
     expect(res.data.subject.did).toEqual(sc.dids.bob)
     expect(res.data.takedown?.applied).toBe(false)
     expect(res.data.takedown?.ref).toBeUndefined()
@@ -108,6 +117,7 @@ describe('moderation', () => {
       },
       { headers: network.bsky.adminAuthHeaders() },
     )
+    assert(isStrongRef(res.data.subject))
     expect(res.data.subject.uri).toEqual(recordSubject.uri)
     expect(res.data.takedown?.applied).toBe(true)
     // expect(res.data.takedown?.ref).toBe('test-record')
@@ -130,6 +140,7 @@ describe('moderation', () => {
       },
       { headers: network.bsky.adminAuthHeaders() },
     )
+    assert(isStrongRef(res.data.subject))
     expect(res.data.subject.uri).toEqual(recordSubject.uri)
     expect(res.data.takedown?.applied).toBe(false)
     expect(res.data.takedown?.ref).toBeUndefined()
@@ -168,6 +179,7 @@ describe('moderation', () => {
         },
         { headers: network.bsky.adminAuthHeaders() },
       )
+      assert(isRepoBlobRef(res.data.subject))
       expect(res.data.subject.did).toEqual(blobSubject.did)
       expect(res.data.subject.cid).toEqual(blobSubject.cid)
       expect(res.data.takedown?.applied).toBe(true)
diff --git a/packages/bsky/tests/views/__snapshots__/author-feed.test.ts.snap b/packages/bsky/tests/views/__snapshots__/author-feed.test.ts.snap
index 8ac1b1d68c5..a194292f8bd 100644
--- a/packages/bsky/tests/views/__snapshots__/author-feed.test.ts.snap
+++ b/packages/bsky/tests/views/__snapshots__/author-feed.test.ts.snap
@@ -1770,9 +1770,27 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
@@ -1801,15 +1819,33 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(1)",
+      "cid": "cids(3)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
@@ -1821,7 +1857,7 @@ Array [
       },
       "replyCount": 0,
       "repostCount": 0,
-      "uri": "record(1)",
+      "uri": "record(2)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -1832,15 +1868,33 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(2)",
+      "cid": "cids(4)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
@@ -1852,7 +1906,7 @@ Array [
       },
       "replyCount": 0,
       "repostCount": 0,
-      "uri": "record(2)",
+      "uri": "record(3)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -1863,15 +1917,33 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(3)",
+      "cid": "cids(5)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
@@ -1883,7 +1955,7 @@ Array [
       },
       "replyCount": 0,
       "repostCount": 0,
-      "uri": "record(3)",
+      "uri": "record(4)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -1894,15 +1966,33 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(4)",
+      "cid": "cids(6)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
@@ -1914,7 +2004,7 @@ Array [
       },
       "replyCount": 0,
       "repostCount": 0,
-      "uri": "record(4)",
+      "uri": "record(5)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -1925,15 +2015,33 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(5)",
+      "cid": "cids(7)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
@@ -1945,7 +2053,7 @@ Array [
       },
       "replyCount": 0,
       "repostCount": 0,
-      "uri": "record(5)",
+      "uri": "record(6)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -1956,15 +2064,33 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(6)",
+      "cid": "cids(8)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
@@ -1976,7 +2102,7 @@ Array [
       },
       "replyCount": 0,
       "repostCount": 0,
-      "uri": "record(6)",
+      "uri": "record(7)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -1987,15 +2113,33 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(7)",
+      "cid": "cids(9)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
@@ -2007,7 +2151,7 @@ Array [
       },
       "replyCount": 0,
       "repostCount": 0,
-      "uri": "record(7)",
+      "uri": "record(8)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -2018,15 +2162,33 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(8)",
+      "cid": "cids(10)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
@@ -2036,19 +2198,19 @@ Array [
         "createdAt": "1970-01-01T00:00:00.000Z",
         "reply": Object {
           "parent": Object {
-            "cid": "cids(10)",
-            "uri": "record(10)",
+            "cid": "cids(12)",
+            "uri": "record(11)",
           },
           "root": Object {
-            "cid": "cids(9)",
-            "uri": "record(9)",
+            "cid": "cids(11)",
+            "uri": "record(10)",
           },
         },
         "text": "thanks bob",
       },
       "replyCount": 0,
       "repostCount": 1,
-      "uri": "record(8)",
+      "uri": "record(9)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -2057,9 +2219,27 @@ Array [
     },
     "reply": Object {
       "grandparentAuthor": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
@@ -2068,44 +2248,44 @@ Array [
       "parent": Object {
         "$type": "app.bsky.feed.defs#postView",
         "author": Object {
-          "avatar": "https://bsky.public.url/img/avatar/plain/user(2)/cids(11)@jpeg",
+          "avatar": "https://bsky.public.url/img/avatar/plain/user(3)/cids(1)@jpeg",
           "createdAt": "1970-01-01T00:00:00.000Z",
-          "did": "user(1)",
+          "did": "user(2)",
           "displayName": "bobby",
           "handle": "bob.test",
           "labels": Array [],
           "viewer": Object {
             "blockedBy": false,
-            "followedBy": "record(12)",
-            "following": "record(11)",
+            "followedBy": "record(13)",
+            "following": "record(12)",
             "muted": false,
           },
         },
-        "cid": "cids(10)",
+        "cid": "cids(12)",
         "embed": Object {
           "$type": "app.bsky.embed.images#view",
           "images": Array [
             Object {
               "alt": "../dev-env/assets/key-landscape-small.jpg",
-              "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(2)/cids(12)@jpeg",
-              "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(2)/cids(12)@jpeg",
+              "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(3)/cids(13)@jpeg",
+              "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(3)/cids(13)@jpeg",
             },
           ],
         },
         "indexedAt": "1970-01-01T00:00:00.000Z",
         "labels": Array [
           Object {
-            "cid": "cids(10)",
+            "cid": "cids(12)",
             "cts": "1970-01-01T00:00:00.000Z",
             "src": "did:example:labeler",
-            "uri": "record(10)",
+            "uri": "record(11)",
             "val": "test-label",
           },
           Object {
-            "cid": "cids(10)",
+            "cid": "cids(12)",
             "cts": "1970-01-01T00:00:00.000Z",
             "src": "did:example:labeler",
-            "uri": "record(10)",
+            "uri": "record(11)",
             "val": "test-label-2",
           },
         ],
@@ -2123,7 +2303,7 @@ Array [
                   "$type": "blob",
                   "mimeType": "image/jpeg",
                   "ref": Object {
-                    "$link": "cids(12)",
+                    "$link": "cids(13)",
                   },
                   "size": 4114,
                 },
@@ -2132,19 +2312,19 @@ Array [
           },
           "reply": Object {
             "parent": Object {
-              "cid": "cids(9)",
-              "uri": "record(9)",
+              "cid": "cids(11)",
+              "uri": "record(10)",
             },
             "root": Object {
-              "cid": "cids(9)",
-              "uri": "record(9)",
+              "cid": "cids(11)",
+              "uri": "record(10)",
             },
           },
           "text": "hear that label_me label_me_2",
         },
         "replyCount": 1,
         "repostCount": 0,
-        "uri": "record(10)",
+        "uri": "record(11)",
         "viewer": Object {
           "embeddingDisabled": false,
           "threadMuted": false,
@@ -2153,15 +2333,33 @@ Array [
       "root": Object {
         "$type": "app.bsky.feed.defs#postView",
         "author": Object {
+          "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+          "createdAt": "1970-01-01T00:00:00.000Z",
           "did": "user(0)",
+          "displayName": "ali",
           "handle": "alice.test",
-          "labels": Array [],
+          "labels": Array [
+            Object {
+              "cid": "cids(2)",
+              "cts": "1970-01-01T00:00:00.000Z",
+              "src": "user(0)",
+              "uri": "record(1)",
+              "val": "self-label-a",
+            },
+            Object {
+              "cid": "cids(2)",
+              "cts": "1970-01-01T00:00:00.000Z",
+              "src": "user(0)",
+              "uri": "record(1)",
+              "val": "self-label-b",
+            },
+          ],
           "viewer": Object {
             "blockedBy": false,
             "muted": false,
           },
         },
-        "cid": "cids(9)",
+        "cid": "cids(11)",
         "indexedAt": "1970-01-01T00:00:00.000Z",
         "labels": Array [],
         "likeCount": 3,
@@ -2173,7 +2371,7 @@ Array [
         },
         "replyCount": 3,
         "repostCount": 1,
-        "uri": "record(9)",
+        "uri": "record(10)",
         "viewer": Object {
           "embeddingDisabled": false,
           "pinned": false,
@@ -2185,15 +2383,33 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(13)",
+      "cid": "cids(14)",
       "embed": Object {
         "$type": "app.bsky.embed.record#view",
         "record": Object {
@@ -2204,40 +2420,40 @@ Array [
                 "allowIncoming": "none",
               },
             },
-            "did": "user(3)",
+            "did": "user(4)",
             "handle": "dan.test",
             "labels": Array [],
             "viewer": Object {
               "blockedBy": false,
-              "following": "record(15)",
+              "following": "record(16)",
               "muted": false,
             },
           },
-          "cid": "cids(14)",
+          "cid": "cids(15)",
           "embeds": Array [
             Object {
               "$type": "app.bsky.embed.record#view",
               "record": Object {
                 "$type": "app.bsky.embed.record#viewRecord",
                 "author": Object {
-                  "did": "user(4)",
+                  "did": "user(5)",
                   "handle": "carol.test",
                   "labels": Array [],
                   "viewer": Object {
                     "blockedBy": false,
-                    "followedBy": "record(18)",
-                    "following": "record(17)",
+                    "followedBy": "record(19)",
+                    "following": "record(18)",
                     "muted": false,
                   },
                 },
-                "cid": "cids(15)",
+                "cid": "cids(16)",
                 "indexedAt": "1970-01-01T00:00:00.000Z",
                 "labels": Array [],
                 "likeCount": 2,
                 "quoteCount": 1,
                 "replyCount": 0,
                 "repostCount": 0,
-                "uri": "record(16)",
+                "uri": "record(17)",
                 "value": Object {
                   "$type": "app.bsky.feed.post",
                   "createdAt": "1970-01-01T00:00:00.000Z",
@@ -2252,7 +2468,7 @@ Array [
                             "$type": "blob",
                             "mimeType": "image/jpeg",
                             "ref": Object {
-                              "$link": "cids(12)",
+                              "$link": "cids(13)",
                             },
                             "size": 4114,
                           },
@@ -2263,7 +2479,7 @@ Array [
                             "$type": "blob",
                             "mimeType": "image/jpeg",
                             "ref": Object {
-                              "$link": "cids(16)",
+                              "$link": "cids(17)",
                             },
                             "size": 12736,
                           },
@@ -2272,8 +2488,8 @@ Array [
                     },
                     "record": Object {
                       "record": Object {
-                        "cid": "cids(17)",
-                        "uri": "record(19)",
+                        "cid": "cids(18)",
+                        "uri": "record(20)",
                       },
                     },
                   },
@@ -2288,15 +2504,15 @@ Array [
           "quoteCount": 1,
           "replyCount": 0,
           "repostCount": 1,
-          "uri": "record(14)",
+          "uri": "record(15)",
           "value": Object {
             "$type": "app.bsky.feed.post",
             "createdAt": "1970-01-01T00:00:00.000Z",
             "embed": Object {
               "$type": "app.bsky.embed.record",
               "record": Object {
-                "cid": "cids(15)",
-                "uri": "record(16)",
+                "cid": "cids(16)",
+                "uri": "record(17)",
               },
             },
             "facets": Array [
@@ -2320,10 +2536,10 @@ Array [
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [
         Object {
-          "cid": "cids(13)",
+          "cid": "cids(14)",
           "cts": "1970-01-01T00:00:00.000Z",
           "src": "did:example:labeler",
-          "uri": "record(13)",
+          "uri": "record(14)",
           "val": "test-label",
         },
       ],
@@ -2335,15 +2551,15 @@ Array [
         "embed": Object {
           "$type": "app.bsky.embed.record",
           "record": Object {
-            "cid": "cids(14)",
-            "uri": "record(14)",
+            "cid": "cids(15)",
+            "uri": "record(15)",
           },
         },
         "text": "yoohoo label_me",
       },
       "replyCount": 0,
       "repostCount": 0,
-      "uri": "record(13)",
+      "uri": "record(14)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -2354,15 +2570,33 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(9)",
+      "cid": "cids(11)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 3,
@@ -2374,7 +2608,7 @@ Array [
       },
       "replyCount": 3,
       "repostCount": 1,
-      "uri": "record(9)",
+      "uri": "record(10)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -2385,22 +2619,40 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(18)",
+      "cid": "cids(19)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [
         Object {
-          "cid": "cids(18)",
+          "cid": "cids(19)",
           "cts": "1970-01-01T00:00:00.000Z",
           "src": "user(0)",
-          "uri": "record(20)",
+          "uri": "record(21)",
           "val": "self-label",
         },
       ],
@@ -2421,7 +2673,7 @@ Array [
       },
       "replyCount": 0,
       "repostCount": 0,
-      "uri": "record(20)",
+      "uri": "record(21)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -2437,9 +2689,27 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
@@ -2468,15 +2738,33 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(1)",
+      "cid": "cids(3)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
@@ -2488,7 +2776,7 @@ Array [
       },
       "replyCount": 0,
       "repostCount": 0,
-      "uri": "record(1)",
+      "uri": "record(2)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -2499,15 +2787,33 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(2)",
+      "cid": "cids(4)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
@@ -2519,7 +2825,7 @@ Array [
       },
       "replyCount": 0,
       "repostCount": 0,
-      "uri": "record(2)",
+      "uri": "record(3)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -2530,15 +2836,33 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(3)",
+      "cid": "cids(5)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
@@ -2550,7 +2874,7 @@ Array [
       },
       "replyCount": 0,
       "repostCount": 0,
-      "uri": "record(3)",
+      "uri": "record(4)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -2561,15 +2885,33 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(4)",
+      "cid": "cids(6)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
@@ -2581,7 +2923,7 @@ Array [
       },
       "replyCount": 0,
       "repostCount": 0,
-      "uri": "record(4)",
+      "uri": "record(5)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -2592,15 +2934,33 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(5)",
+      "cid": "cids(7)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
@@ -2612,7 +2972,7 @@ Array [
       },
       "replyCount": 0,
       "repostCount": 0,
-      "uri": "record(5)",
+      "uri": "record(6)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -2623,15 +2983,33 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(6)",
+      "cid": "cids(8)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
@@ -2643,7 +3021,7 @@ Array [
       },
       "replyCount": 0,
       "repostCount": 0,
-      "uri": "record(6)",
+      "uri": "record(7)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -2654,15 +3032,33 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(7)",
+      "cid": "cids(9)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
@@ -2672,19 +3068,19 @@ Array [
         "createdAt": "1970-01-01T00:00:00.000Z",
         "reply": Object {
           "parent": Object {
-            "cid": "cids(9)",
-            "uri": "record(9)",
+            "cid": "cids(11)",
+            "uri": "record(10)",
           },
           "root": Object {
-            "cid": "cids(8)",
-            "uri": "record(8)",
+            "cid": "cids(10)",
+            "uri": "record(9)",
           },
         },
         "text": "thanks bob",
       },
       "replyCount": 0,
       "repostCount": 1,
-      "uri": "record(7)",
+      "uri": "record(8)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -2693,9 +3089,27 @@ Array [
     },
     "reply": Object {
       "grandparentAuthor": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
@@ -2704,44 +3118,44 @@ Array [
       "parent": Object {
         "$type": "app.bsky.feed.defs#postView",
         "author": Object {
-          "avatar": "https://bsky.public.url/img/avatar/plain/user(2)/cids(10)@jpeg",
+          "avatar": "https://bsky.public.url/img/avatar/plain/user(3)/cids(1)@jpeg",
           "createdAt": "1970-01-01T00:00:00.000Z",
-          "did": "user(1)",
+          "did": "user(2)",
           "displayName": "bobby",
           "handle": "bob.test",
           "labels": Array [],
           "viewer": Object {
             "blockedBy": false,
-            "followedBy": "record(11)",
-            "following": "record(10)",
+            "followedBy": "record(12)",
+            "following": "record(11)",
             "muted": false,
           },
         },
-        "cid": "cids(9)",
+        "cid": "cids(11)",
         "embed": Object {
           "$type": "app.bsky.embed.images#view",
           "images": Array [
             Object {
               "alt": "../dev-env/assets/key-landscape-small.jpg",
-              "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(2)/cids(11)@jpeg",
-              "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(2)/cids(11)@jpeg",
+              "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(3)/cids(12)@jpeg",
+              "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(3)/cids(12)@jpeg",
             },
           ],
         },
         "indexedAt": "1970-01-01T00:00:00.000Z",
         "labels": Array [
           Object {
-            "cid": "cids(9)",
+            "cid": "cids(11)",
             "cts": "1970-01-01T00:00:00.000Z",
             "src": "did:example:labeler",
-            "uri": "record(9)",
+            "uri": "record(10)",
             "val": "test-label",
           },
           Object {
-            "cid": "cids(9)",
+            "cid": "cids(11)",
             "cts": "1970-01-01T00:00:00.000Z",
             "src": "did:example:labeler",
-            "uri": "record(9)",
+            "uri": "record(10)",
             "val": "test-label-2",
           },
         ],
@@ -2759,7 +3173,7 @@ Array [
                   "$type": "blob",
                   "mimeType": "image/jpeg",
                   "ref": Object {
-                    "$link": "cids(11)",
+                    "$link": "cids(12)",
                   },
                   "size": 4114,
                 },
@@ -2768,19 +3182,19 @@ Array [
           },
           "reply": Object {
             "parent": Object {
-              "cid": "cids(8)",
-              "uri": "record(8)",
+              "cid": "cids(10)",
+              "uri": "record(9)",
             },
             "root": Object {
-              "cid": "cids(8)",
-              "uri": "record(8)",
+              "cid": "cids(10)",
+              "uri": "record(9)",
             },
           },
           "text": "hear that label_me label_me_2",
         },
         "replyCount": 1,
         "repostCount": 0,
-        "uri": "record(9)",
+        "uri": "record(10)",
         "viewer": Object {
           "embeddingDisabled": false,
           "threadMuted": false,
@@ -2789,15 +3203,33 @@ Array [
       "root": Object {
         "$type": "app.bsky.feed.defs#postView",
         "author": Object {
+          "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+          "createdAt": "1970-01-01T00:00:00.000Z",
           "did": "user(0)",
+          "displayName": "ali",
           "handle": "alice.test",
-          "labels": Array [],
+          "labels": Array [
+            Object {
+              "cid": "cids(2)",
+              "cts": "1970-01-01T00:00:00.000Z",
+              "src": "user(0)",
+              "uri": "record(1)",
+              "val": "self-label-a",
+            },
+            Object {
+              "cid": "cids(2)",
+              "cts": "1970-01-01T00:00:00.000Z",
+              "src": "user(0)",
+              "uri": "record(1)",
+              "val": "self-label-b",
+            },
+          ],
           "viewer": Object {
             "blockedBy": false,
             "muted": false,
           },
         },
-        "cid": "cids(8)",
+        "cid": "cids(10)",
         "indexedAt": "1970-01-01T00:00:00.000Z",
         "labels": Array [],
         "likeCount": 3,
@@ -2809,7 +3241,7 @@ Array [
         },
         "replyCount": 3,
         "repostCount": 1,
-        "uri": "record(8)",
+        "uri": "record(9)",
         "viewer": Object {
           "embeddingDisabled": false,
           "pinned": false,
@@ -2821,15 +3253,33 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(12)",
+      "cid": "cids(13)",
       "embed": Object {
         "$type": "app.bsky.embed.record#view",
         "record": Object {
@@ -2840,40 +3290,40 @@ Array [
                 "allowIncoming": "none",
               },
             },
-            "did": "user(3)",
+            "did": "user(4)",
             "handle": "dan.test",
             "labels": Array [],
             "viewer": Object {
               "blockedBy": false,
-              "following": "record(14)",
+              "following": "record(15)",
               "muted": false,
             },
           },
-          "cid": "cids(13)",
+          "cid": "cids(14)",
           "embeds": Array [
             Object {
               "$type": "app.bsky.embed.record#view",
               "record": Object {
                 "$type": "app.bsky.embed.record#viewRecord",
                 "author": Object {
-                  "did": "user(4)",
+                  "did": "user(5)",
                   "handle": "carol.test",
                   "labels": Array [],
                   "viewer": Object {
                     "blockedBy": false,
-                    "followedBy": "record(17)",
-                    "following": "record(16)",
+                    "followedBy": "record(18)",
+                    "following": "record(17)",
                     "muted": false,
                   },
                 },
-                "cid": "cids(14)",
+                "cid": "cids(15)",
                 "indexedAt": "1970-01-01T00:00:00.000Z",
                 "labels": Array [],
                 "likeCount": 2,
                 "quoteCount": 1,
                 "replyCount": 0,
                 "repostCount": 0,
-                "uri": "record(15)",
+                "uri": "record(16)",
                 "value": Object {
                   "$type": "app.bsky.feed.post",
                   "createdAt": "1970-01-01T00:00:00.000Z",
@@ -2888,7 +3338,7 @@ Array [
                             "$type": "blob",
                             "mimeType": "image/jpeg",
                             "ref": Object {
-                              "$link": "cids(11)",
+                              "$link": "cids(12)",
                             },
                             "size": 4114,
                           },
@@ -2899,7 +3349,7 @@ Array [
                             "$type": "blob",
                             "mimeType": "image/jpeg",
                             "ref": Object {
-                              "$link": "cids(15)",
+                              "$link": "cids(16)",
                             },
                             "size": 12736,
                           },
@@ -2908,8 +3358,8 @@ Array [
                     },
                     "record": Object {
                       "record": Object {
-                        "cid": "cids(16)",
-                        "uri": "record(18)",
+                        "cid": "cids(17)",
+                        "uri": "record(19)",
                       },
                     },
                   },
@@ -2924,15 +3374,15 @@ Array [
           "quoteCount": 1,
           "replyCount": 0,
           "repostCount": 1,
-          "uri": "record(13)",
+          "uri": "record(14)",
           "value": Object {
             "$type": "app.bsky.feed.post",
             "createdAt": "1970-01-01T00:00:00.000Z",
             "embed": Object {
               "$type": "app.bsky.embed.record",
               "record": Object {
-                "cid": "cids(14)",
-                "uri": "record(15)",
+                "cid": "cids(15)",
+                "uri": "record(16)",
               },
             },
             "facets": Array [
@@ -2956,10 +3406,10 @@ Array [
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [
         Object {
-          "cid": "cids(12)",
+          "cid": "cids(13)",
           "cts": "1970-01-01T00:00:00.000Z",
           "src": "did:example:labeler",
-          "uri": "record(12)",
+          "uri": "record(13)",
           "val": "test-label",
         },
       ],
@@ -2971,15 +3421,15 @@ Array [
         "embed": Object {
           "$type": "app.bsky.embed.record",
           "record": Object {
-            "cid": "cids(13)",
-            "uri": "record(13)",
+            "cid": "cids(14)",
+            "uri": "record(14)",
           },
         },
         "text": "yoohoo label_me",
       },
       "replyCount": 0,
       "repostCount": 0,
-      "uri": "record(12)",
+      "uri": "record(13)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -2990,15 +3440,33 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(8)",
+      "cid": "cids(10)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 3,
@@ -3010,7 +3478,7 @@ Array [
       },
       "replyCount": 3,
       "repostCount": 1,
-      "uri": "record(8)",
+      "uri": "record(9)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -3021,22 +3489,40 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(17)",
+      "cid": "cids(18)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [
         Object {
-          "cid": "cids(17)",
+          "cid": "cids(18)",
           "cts": "1970-01-01T00:00:00.000Z",
           "src": "user(0)",
-          "uri": "record(19)",
+          "uri": "record(20)",
           "val": "self-label",
         },
       ],
@@ -3057,7 +3543,7 @@ Array [
       },
       "replyCount": 0,
       "repostCount": 0,
-      "uri": "record(19)",
+      "uri": "record(20)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -3073,9 +3559,27 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
@@ -3107,15 +3611,33 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(1)",
+      "cid": "cids(3)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
@@ -3127,7 +3649,7 @@ Array [
       },
       "replyCount": 0,
       "repostCount": 0,
-      "uri": "record(1)",
+      "uri": "record(2)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -3138,15 +3660,33 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(2)",
+      "cid": "cids(4)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
@@ -3158,7 +3698,7 @@ Array [
       },
       "replyCount": 0,
       "repostCount": 0,
-      "uri": "record(2)",
+      "uri": "record(3)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -3174,9 +3714,27 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
@@ -3205,15 +3763,33 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(1)",
+      "cid": "cids(3)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
@@ -3225,7 +3801,7 @@ Array [
       },
       "replyCount": 0,
       "repostCount": 0,
-      "uri": "record(1)",
+      "uri": "record(2)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -3236,15 +3812,33 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(2)",
+      "cid": "cids(4)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
@@ -3256,7 +3850,7 @@ Array [
       },
       "replyCount": 0,
       "repostCount": 0,
-      "uri": "record(2)",
+      "uri": "record(3)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -3267,15 +3861,33 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(3)",
+      "cid": "cids(5)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
@@ -3287,7 +3899,7 @@ Array [
       },
       "replyCount": 0,
       "repostCount": 0,
-      "uri": "record(3)",
+      "uri": "record(4)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -3298,15 +3910,33 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(4)",
+      "cid": "cids(6)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
@@ -3316,19 +3946,19 @@ Array [
         "createdAt": "1970-01-01T00:00:00.000Z",
         "reply": Object {
           "parent": Object {
-            "cid": "cids(6)",
-            "uri": "record(6)",
+            "cid": "cids(8)",
+            "uri": "record(7)",
           },
           "root": Object {
-            "cid": "cids(5)",
-            "uri": "record(5)",
+            "cid": "cids(7)",
+            "uri": "record(6)",
           },
         },
         "text": "thanks bob",
       },
       "replyCount": 0,
       "repostCount": 1,
-      "uri": "record(4)",
+      "uri": "record(5)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -3337,9 +3967,27 @@ Array [
     },
     "reply": Object {
       "grandparentAuthor": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
@@ -3348,44 +3996,44 @@ Array [
       "parent": Object {
         "$type": "app.bsky.feed.defs#postView",
         "author": Object {
-          "avatar": "https://bsky.public.url/img/avatar/plain/user(2)/cids(7)@jpeg",
+          "avatar": "https://bsky.public.url/img/avatar/plain/user(3)/cids(1)@jpeg",
           "createdAt": "1970-01-01T00:00:00.000Z",
-          "did": "user(1)",
+          "did": "user(2)",
           "displayName": "bobby",
           "handle": "bob.test",
           "labels": Array [],
           "viewer": Object {
             "blockedBy": false,
-            "followedBy": "record(8)",
-            "following": "record(7)",
+            "followedBy": "record(9)",
+            "following": "record(8)",
             "muted": false,
           },
         },
-        "cid": "cids(6)",
+        "cid": "cids(8)",
         "embed": Object {
           "$type": "app.bsky.embed.images#view",
           "images": Array [
             Object {
               "alt": "../dev-env/assets/key-landscape-small.jpg",
-              "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(2)/cids(8)@jpeg",
-              "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(2)/cids(8)@jpeg",
+              "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(3)/cids(9)@jpeg",
+              "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(3)/cids(9)@jpeg",
             },
           ],
         },
         "indexedAt": "1970-01-01T00:00:00.000Z",
         "labels": Array [
           Object {
-            "cid": "cids(6)",
+            "cid": "cids(8)",
             "cts": "1970-01-01T00:00:00.000Z",
             "src": "did:example:labeler",
-            "uri": "record(6)",
+            "uri": "record(7)",
             "val": "test-label",
           },
           Object {
-            "cid": "cids(6)",
+            "cid": "cids(8)",
             "cts": "1970-01-01T00:00:00.000Z",
             "src": "did:example:labeler",
-            "uri": "record(6)",
+            "uri": "record(7)",
             "val": "test-label-2",
           },
         ],
@@ -3403,7 +4051,7 @@ Array [
                   "$type": "blob",
                   "mimeType": "image/jpeg",
                   "ref": Object {
-                    "$link": "cids(8)",
+                    "$link": "cids(9)",
                   },
                   "size": 4114,
                 },
@@ -3412,19 +4060,19 @@ Array [
           },
           "reply": Object {
             "parent": Object {
-              "cid": "cids(5)",
-              "uri": "record(5)",
+              "cid": "cids(7)",
+              "uri": "record(6)",
             },
             "root": Object {
-              "cid": "cids(5)",
-              "uri": "record(5)",
+              "cid": "cids(7)",
+              "uri": "record(6)",
             },
           },
           "text": "hear that label_me label_me_2",
         },
         "replyCount": 1,
         "repostCount": 0,
-        "uri": "record(6)",
+        "uri": "record(7)",
         "viewer": Object {
           "embeddingDisabled": false,
           "threadMuted": false,
@@ -3433,15 +4081,33 @@ Array [
       "root": Object {
         "$type": "app.bsky.feed.defs#postView",
         "author": Object {
+          "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+          "createdAt": "1970-01-01T00:00:00.000Z",
           "did": "user(0)",
+          "displayName": "ali",
           "handle": "alice.test",
-          "labels": Array [],
+          "labels": Array [
+            Object {
+              "cid": "cids(2)",
+              "cts": "1970-01-01T00:00:00.000Z",
+              "src": "user(0)",
+              "uri": "record(1)",
+              "val": "self-label-a",
+            },
+            Object {
+              "cid": "cids(2)",
+              "cts": "1970-01-01T00:00:00.000Z",
+              "src": "user(0)",
+              "uri": "record(1)",
+              "val": "self-label-b",
+            },
+          ],
           "viewer": Object {
             "blockedBy": false,
             "muted": false,
           },
         },
-        "cid": "cids(5)",
+        "cid": "cids(7)",
         "indexedAt": "1970-01-01T00:00:00.000Z",
         "labels": Array [],
         "likeCount": 3,
@@ -3453,7 +4119,7 @@ Array [
         },
         "replyCount": 3,
         "repostCount": 1,
-        "uri": "record(5)",
+        "uri": "record(6)",
         "viewer": Object {
           "embeddingDisabled": false,
           "pinned": false,
@@ -3465,15 +4131,33 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(9)",
+      "cid": "cids(10)",
       "embed": Object {
         "$type": "app.bsky.embed.record#view",
         "record": Object {
@@ -3484,40 +4168,40 @@ Array [
                 "allowIncoming": "none",
               },
             },
-            "did": "user(3)",
+            "did": "user(4)",
             "handle": "dan.test",
             "labels": Array [],
             "viewer": Object {
               "blockedBy": false,
-              "following": "record(11)",
+              "following": "record(12)",
               "muted": false,
             },
           },
-          "cid": "cids(10)",
+          "cid": "cids(11)",
           "embeds": Array [
             Object {
               "$type": "app.bsky.embed.record#view",
               "record": Object {
                 "$type": "app.bsky.embed.record#viewRecord",
                 "author": Object {
-                  "did": "user(4)",
+                  "did": "user(5)",
                   "handle": "carol.test",
                   "labels": Array [],
                   "viewer": Object {
                     "blockedBy": false,
-                    "followedBy": "record(14)",
-                    "following": "record(13)",
+                    "followedBy": "record(15)",
+                    "following": "record(14)",
                     "muted": false,
                   },
                 },
-                "cid": "cids(11)",
+                "cid": "cids(12)",
                 "indexedAt": "1970-01-01T00:00:00.000Z",
                 "labels": Array [],
                 "likeCount": 2,
                 "quoteCount": 1,
                 "replyCount": 0,
                 "repostCount": 0,
-                "uri": "record(12)",
+                "uri": "record(13)",
                 "value": Object {
                   "$type": "app.bsky.feed.post",
                   "createdAt": "1970-01-01T00:00:00.000Z",
@@ -3532,7 +4216,7 @@ Array [
                             "$type": "blob",
                             "mimeType": "image/jpeg",
                             "ref": Object {
-                              "$link": "cids(8)",
+                              "$link": "cids(9)",
                             },
                             "size": 4114,
                           },
@@ -3543,7 +4227,7 @@ Array [
                             "$type": "blob",
                             "mimeType": "image/jpeg",
                             "ref": Object {
-                              "$link": "cids(12)",
+                              "$link": "cids(13)",
                             },
                             "size": 12736,
                           },
@@ -3552,8 +4236,8 @@ Array [
                     },
                     "record": Object {
                       "record": Object {
-                        "cid": "cids(13)",
-                        "uri": "record(15)",
+                        "cid": "cids(14)",
+                        "uri": "record(16)",
                       },
                     },
                   },
@@ -3568,15 +4252,15 @@ Array [
           "quoteCount": 1,
           "replyCount": 0,
           "repostCount": 1,
-          "uri": "record(10)",
+          "uri": "record(11)",
           "value": Object {
             "$type": "app.bsky.feed.post",
             "createdAt": "1970-01-01T00:00:00.000Z",
             "embed": Object {
               "$type": "app.bsky.embed.record",
               "record": Object {
-                "cid": "cids(11)",
-                "uri": "record(12)",
+                "cid": "cids(12)",
+                "uri": "record(13)",
               },
             },
             "facets": Array [
@@ -3600,10 +4284,10 @@ Array [
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [
         Object {
-          "cid": "cids(9)",
+          "cid": "cids(10)",
           "cts": "1970-01-01T00:00:00.000Z",
           "src": "did:example:labeler",
-          "uri": "record(9)",
+          "uri": "record(10)",
           "val": "test-label",
         },
       ],
@@ -3615,15 +4299,15 @@ Array [
         "embed": Object {
           "$type": "app.bsky.embed.record",
           "record": Object {
-            "cid": "cids(10)",
-            "uri": "record(10)",
+            "cid": "cids(11)",
+            "uri": "record(11)",
           },
         },
         "text": "yoohoo label_me",
       },
       "replyCount": 0,
       "repostCount": 0,
-      "uri": "record(9)",
+      "uri": "record(10)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -3634,15 +4318,33 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(5)",
+      "cid": "cids(7)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 3,
@@ -3654,7 +4356,7 @@ Array [
       },
       "replyCount": 3,
       "repostCount": 1,
-      "uri": "record(5)",
+      "uri": "record(6)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -3665,22 +4367,40 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(14)",
+      "cid": "cids(15)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [
         Object {
-          "cid": "cids(14)",
+          "cid": "cids(15)",
           "cts": "1970-01-01T00:00:00.000Z",
           "src": "user(0)",
-          "uri": "record(16)",
+          "uri": "record(17)",
           "val": "self-label",
         },
       ],
@@ -3701,7 +4421,7 @@ Array [
       },
       "replyCount": 0,
       "repostCount": 0,
-      "uri": "record(16)",
+      "uri": "record(17)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -3717,9 +4437,27 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
@@ -3751,15 +4489,33 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(1)",
+      "cid": "cids(3)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
@@ -3771,7 +4527,7 @@ Array [
       },
       "replyCount": 0,
       "repostCount": 0,
-      "uri": "record(1)",
+      "uri": "record(2)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -3782,15 +4538,33 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(2)",
+      "cid": "cids(4)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
@@ -3802,7 +4576,7 @@ Array [
       },
       "replyCount": 0,
       "repostCount": 0,
-      "uri": "record(2)",
+      "uri": "record(3)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -3813,15 +4587,33 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(3)",
+      "cid": "cids(5)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
@@ -3831,19 +4623,19 @@ Array [
         "createdAt": "1970-01-01T00:00:00.000Z",
         "reply": Object {
           "parent": Object {
-            "cid": "cids(5)",
-            "uri": "record(5)",
+            "cid": "cids(7)",
+            "uri": "record(6)",
           },
           "root": Object {
-            "cid": "cids(4)",
-            "uri": "record(4)",
+            "cid": "cids(6)",
+            "uri": "record(5)",
           },
         },
         "text": "thanks bob",
       },
       "replyCount": 0,
       "repostCount": 1,
-      "uri": "record(3)",
+      "uri": "record(4)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -3852,9 +4644,27 @@ Array [
     },
     "reply": Object {
       "grandparentAuthor": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
@@ -3863,44 +4673,44 @@ Array [
       "parent": Object {
         "$type": "app.bsky.feed.defs#postView",
         "author": Object {
-          "avatar": "https://bsky.public.url/img/avatar/plain/user(2)/cids(6)@jpeg",
+          "avatar": "https://bsky.public.url/img/avatar/plain/user(3)/cids(1)@jpeg",
           "createdAt": "1970-01-01T00:00:00.000Z",
-          "did": "user(1)",
+          "did": "user(2)",
           "displayName": "bobby",
           "handle": "bob.test",
           "labels": Array [],
           "viewer": Object {
             "blockedBy": false,
-            "followedBy": "record(7)",
-            "following": "record(6)",
+            "followedBy": "record(8)",
+            "following": "record(7)",
             "muted": false,
           },
         },
-        "cid": "cids(5)",
+        "cid": "cids(7)",
         "embed": Object {
           "$type": "app.bsky.embed.images#view",
           "images": Array [
             Object {
               "alt": "../dev-env/assets/key-landscape-small.jpg",
-              "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(2)/cids(7)@jpeg",
-              "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(2)/cids(7)@jpeg",
+              "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(3)/cids(8)@jpeg",
+              "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(3)/cids(8)@jpeg",
             },
           ],
         },
         "indexedAt": "1970-01-01T00:00:00.000Z",
         "labels": Array [
           Object {
-            "cid": "cids(5)",
+            "cid": "cids(7)",
             "cts": "1970-01-01T00:00:00.000Z",
             "src": "did:example:labeler",
-            "uri": "record(5)",
+            "uri": "record(6)",
             "val": "test-label",
           },
           Object {
-            "cid": "cids(5)",
+            "cid": "cids(7)",
             "cts": "1970-01-01T00:00:00.000Z",
             "src": "did:example:labeler",
-            "uri": "record(5)",
+            "uri": "record(6)",
             "val": "test-label-2",
           },
         ],
@@ -3918,7 +4728,7 @@ Array [
                   "$type": "blob",
                   "mimeType": "image/jpeg",
                   "ref": Object {
-                    "$link": "cids(7)",
+                    "$link": "cids(8)",
                   },
                   "size": 4114,
                 },
@@ -3927,19 +4737,19 @@ Array [
           },
           "reply": Object {
             "parent": Object {
-              "cid": "cids(4)",
-              "uri": "record(4)",
+              "cid": "cids(6)",
+              "uri": "record(5)",
             },
             "root": Object {
-              "cid": "cids(4)",
-              "uri": "record(4)",
+              "cid": "cids(6)",
+              "uri": "record(5)",
             },
           },
           "text": "hear that label_me label_me_2",
         },
         "replyCount": 1,
         "repostCount": 0,
-        "uri": "record(5)",
+        "uri": "record(6)",
         "viewer": Object {
           "embeddingDisabled": false,
           "threadMuted": false,
@@ -3948,15 +4758,33 @@ Array [
       "root": Object {
         "$type": "app.bsky.feed.defs#postView",
         "author": Object {
+          "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+          "createdAt": "1970-01-01T00:00:00.000Z",
           "did": "user(0)",
+          "displayName": "ali",
           "handle": "alice.test",
-          "labels": Array [],
+          "labels": Array [
+            Object {
+              "cid": "cids(2)",
+              "cts": "1970-01-01T00:00:00.000Z",
+              "src": "user(0)",
+              "uri": "record(1)",
+              "val": "self-label-a",
+            },
+            Object {
+              "cid": "cids(2)",
+              "cts": "1970-01-01T00:00:00.000Z",
+              "src": "user(0)",
+              "uri": "record(1)",
+              "val": "self-label-b",
+            },
+          ],
           "viewer": Object {
             "blockedBy": false,
             "muted": false,
           },
         },
-        "cid": "cids(4)",
+        "cid": "cids(6)",
         "indexedAt": "1970-01-01T00:00:00.000Z",
         "labels": Array [],
         "likeCount": 3,
@@ -3968,7 +4796,7 @@ Array [
         },
         "replyCount": 3,
         "repostCount": 1,
-        "uri": "record(4)",
+        "uri": "record(5)",
         "viewer": Object {
           "embeddingDisabled": false,
           "pinned": false,
@@ -3980,15 +4808,33 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(8)",
+      "cid": "cids(9)",
       "embed": Object {
         "$type": "app.bsky.embed.record#view",
         "record": Object {
@@ -3999,40 +4845,40 @@ Array [
                 "allowIncoming": "none",
               },
             },
-            "did": "user(3)",
+            "did": "user(4)",
             "handle": "dan.test",
             "labels": Array [],
             "viewer": Object {
               "blockedBy": false,
-              "following": "record(10)",
+              "following": "record(11)",
               "muted": false,
             },
           },
-          "cid": "cids(9)",
+          "cid": "cids(10)",
           "embeds": Array [
             Object {
               "$type": "app.bsky.embed.record#view",
               "record": Object {
                 "$type": "app.bsky.embed.record#viewRecord",
                 "author": Object {
-                  "did": "user(4)",
+                  "did": "user(5)",
                   "handle": "carol.test",
                   "labels": Array [],
                   "viewer": Object {
                     "blockedBy": false,
-                    "followedBy": "record(13)",
-                    "following": "record(12)",
+                    "followedBy": "record(14)",
+                    "following": "record(13)",
                     "muted": false,
                   },
                 },
-                "cid": "cids(10)",
+                "cid": "cids(11)",
                 "indexedAt": "1970-01-01T00:00:00.000Z",
                 "labels": Array [],
                 "likeCount": 2,
                 "quoteCount": 1,
                 "replyCount": 0,
                 "repostCount": 0,
-                "uri": "record(11)",
+                "uri": "record(12)",
                 "value": Object {
                   "$type": "app.bsky.feed.post",
                   "createdAt": "1970-01-01T00:00:00.000Z",
@@ -4047,7 +4893,7 @@ Array [
                             "$type": "blob",
                             "mimeType": "image/jpeg",
                             "ref": Object {
-                              "$link": "cids(7)",
+                              "$link": "cids(8)",
                             },
                             "size": 4114,
                           },
@@ -4058,7 +4904,7 @@ Array [
                             "$type": "blob",
                             "mimeType": "image/jpeg",
                             "ref": Object {
-                              "$link": "cids(11)",
+                              "$link": "cids(12)",
                             },
                             "size": 12736,
                           },
@@ -4067,8 +4913,8 @@ Array [
                     },
                     "record": Object {
                       "record": Object {
-                        "cid": "cids(12)",
-                        "uri": "record(14)",
+                        "cid": "cids(13)",
+                        "uri": "record(15)",
                       },
                     },
                   },
@@ -4083,15 +4929,15 @@ Array [
           "quoteCount": 1,
           "replyCount": 0,
           "repostCount": 1,
-          "uri": "record(9)",
+          "uri": "record(10)",
           "value": Object {
             "$type": "app.bsky.feed.post",
             "createdAt": "1970-01-01T00:00:00.000Z",
             "embed": Object {
               "$type": "app.bsky.embed.record",
               "record": Object {
-                "cid": "cids(10)",
-                "uri": "record(11)",
+                "cid": "cids(11)",
+                "uri": "record(12)",
               },
             },
             "facets": Array [
@@ -4115,10 +4961,10 @@ Array [
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [
         Object {
-          "cid": "cids(8)",
+          "cid": "cids(9)",
           "cts": "1970-01-01T00:00:00.000Z",
           "src": "did:example:labeler",
-          "uri": "record(8)",
+          "uri": "record(9)",
           "val": "test-label",
         },
       ],
@@ -4130,15 +4976,15 @@ Array [
         "embed": Object {
           "$type": "app.bsky.embed.record",
           "record": Object {
-            "cid": "cids(9)",
-            "uri": "record(9)",
+            "cid": "cids(10)",
+            "uri": "record(10)",
           },
         },
         "text": "yoohoo label_me",
       },
       "replyCount": 0,
       "repostCount": 0,
-      "uri": "record(8)",
+      "uri": "record(9)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -4149,15 +4995,33 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(4)",
+      "cid": "cids(6)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 3,
@@ -4169,7 +5033,7 @@ Array [
       },
       "replyCount": 3,
       "repostCount": 1,
-      "uri": "record(4)",
+      "uri": "record(5)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
@@ -4180,22 +5044,40 @@ Array [
   Object {
     "post": Object {
       "author": Object {
+        "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+        "createdAt": "1970-01-01T00:00:00.000Z",
         "did": "user(0)",
+        "displayName": "ali",
         "handle": "alice.test",
-        "labels": Array [],
+        "labels": Array [
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-a",
+          },
+          Object {
+            "cid": "cids(2)",
+            "cts": "1970-01-01T00:00:00.000Z",
+            "src": "user(0)",
+            "uri": "record(1)",
+            "val": "self-label-b",
+          },
+        ],
         "viewer": Object {
           "blockedBy": false,
           "muted": false,
         },
       },
-      "cid": "cids(13)",
+      "cid": "cids(14)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [
         Object {
-          "cid": "cids(13)",
+          "cid": "cids(14)",
           "cts": "1970-01-01T00:00:00.000Z",
           "src": "user(0)",
-          "uri": "record(15)",
+          "uri": "record(16)",
           "val": "self-label",
         },
       ],
@@ -4216,7 +5098,7 @@ Array [
       },
       "replyCount": 0,
       "repostCount": 0,
-      "uri": "record(15)",
+      "uri": "record(16)",
       "viewer": Object {
         "embeddingDisabled": false,
         "pinned": false,
diff --git a/packages/bsky/tests/views/author-feed.test.ts b/packages/bsky/tests/views/author-feed.test.ts
index 2e473d48a76..b1dbb225970 100644
--- a/packages/bsky/tests/views/author-feed.test.ts
+++ b/packages/bsky/tests/views/author-feed.test.ts
@@ -1,11 +1,24 @@
-import { AppBskyActorProfile, AppBskyFeedDefs, AtpAgent } from '@atproto/api'
+import assert from 'node:assert'
+import { AtpAgent } from '@atproto/api'
 import { SeedClient, TestNetwork, authorFeedSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
+import {
+  Record as Profile,
+  validateRecord as validatePostRecord,
+} from '../../src/lexicon/types/app/bsky/actor/profile'
 import { isView as isImageEmbed } from '../../src/lexicon/types/app/bsky/embed/images'
 import { isView as isEmbedRecordWithMedia } from '../../src/lexicon/types/app/bsky/embed/recordWithMedia'
 import { isView as isVideoEmbed } from '../../src/lexicon/types/app/bsky/embed/video'
-import { isPostView } from '../../src/lexicon/types/app/bsky/feed/defs'
-import { ReplyRef, isRecord } from '../../src/lexicon/types/app/bsky/feed/post'
+import {
+  isPostView,
+  isReasonPin,
+} from '../../src/lexicon/types/app/bsky/feed/defs'
+import {
+  ReplyRef,
+  isRecord,
+  validateReplyRef,
+} from '../../src/lexicon/types/app/bsky/feed/post'
+import { asPredicate } from '../../src/lexicon/util'
 import { uriToDid } from '../../src/util/uris'
 import { VideoEmbed } from '../../src/views/types'
 import {
@@ -15,6 +28,9 @@ import {
   stripViewerFromPost,
 } from '../_util'
 
+const isValidReplyRef = asPredicate(validateReplyRef)
+const isValidProfile = asPredicate(validatePostRecord)
+
 describe('pds author feed views', () => {
   let network: TestNetwork
   let agent: AtpAgent
@@ -181,8 +197,8 @@ describe('pds author feed views', () => {
         }
         if (item.reply) {
           result.reply = {
-            parent: stripViewerFromPost(item.reply.parent),
-            root: stripViewerFromPost(item.reply.root),
+            parent: stripViewerFromPost(item.reply.parent, true),
+            root: stripViewerFromPost(item.reply.root, true),
             grandparentAuthor:
               item.reply.grandparentAuthor &&
               stripViewer(item.reply.grandparentAuthor),
@@ -291,7 +307,7 @@ describe('pds author feed views', () => {
     })
 
     expect(carolFeed.feed.length).toBeGreaterThan(0)
-    expect(
+    assert(
       carolFeed.feed.every(({ post }) => {
         const isRecordWithActorMedia =
           isEmbedRecordWithMedia(post.embed) && isImageEmbed(post.embed?.media)
@@ -300,18 +316,18 @@ describe('pds author feed views', () => {
 
         return (isRecordWithActorMedia || isActorMedia) && isFromActor
       }),
-    ).toBeTruthy()
+    )
 
     const { data: bobFeed } = await agent.api.app.bsky.feed.getAuthorFeed({
       actor: bob,
       filter: 'posts_with_media',
     })
 
-    expect(
+    assert(
       bobFeed.feed.every(({ post }) => {
         return isImageEmbed(post.embed) && post.author.did === bob
       }),
-    ).toBeTruthy()
+    )
 
     const { data: danFeed } = await agent.api.app.bsky.feed.getAuthorFeed({
       actor: dan,
@@ -389,14 +405,14 @@ describe('pds author feed views', () => {
       filter: 'posts_no_replies',
     })
 
-    expect(
+    assert(
       carolFeed.feed.every(({ post }) => {
         return (
           (isRecord(post.record) && !post.record.reply) ||
           (isRecord(post.record) && post.record.reply)
         )
       }),
-    ).toBeTruthy()
+    )
 
     const { data: danFeed } = await agent.api.app.bsky.feed.getAuthorFeed({
       actor: dan,
@@ -430,7 +446,11 @@ describe('pds author feed views', () => {
     // does not include eve's replies to fred, even within her own thread.
     expect(
       eveFeed.feed.every(({ post, reply }) => {
-        if (!post || !isRecord(post.record) || !post.record.reply) {
+        if (
+          !post ||
+          !isRecord(post.record) ||
+          !isValidReplyRef(post.record.reply)
+        ) {
           return true // not a reply
         }
         const replyToEve = isReplyTo(post.record.reply, eve)
@@ -438,7 +458,7 @@ describe('pds author feed views', () => {
           reply &&
           isPostView(reply.parent) &&
           isRecord(reply.parent.record) &&
-          (!reply.parent.record.reply ||
+          (!isValidReplyRef(reply.parent.record.reply) ||
             isReplyTo(reply.parent.record.reply, eve))
         return replyToEve && replyToReplyByEve
       }),
@@ -464,12 +484,10 @@ describe('pds author feed views', () => {
         rkey: 'self',
       })
 
-      if (!AppBskyActorProfile.isRecord(profile.data.value)) {
-        throw new Error('')
-      }
+      assert(isValidProfile(profile.data.value))
 
-      const newProfile: AppBskyActorProfile.Record = {
-        ...profile,
+      const newProfile: Profile = {
+        ...profile.data.value,
         pinnedPost: {
           uri: post.ref.uriStr,
           cid: post.ref.cid.toString(),
@@ -505,8 +523,8 @@ describe('pds author feed views', () => {
 
       const pinnedPost = data.feed.at(0)
       expect(pinnedPost?.post?.uri).toEqual(post.ref.uriStr)
-      expect(pinnedPost?.post?.viewer?.pinned).toBeTruthy()
-      expect(AppBskyFeedDefs.isReasonPin(pinnedPost?.reason)).toBeTruthy()
+      assert(pinnedPost?.post?.viewer?.pinned)
+      assert(isReasonPin(pinnedPost?.reason))
 
       const notPinnedPost = data.feed.at(1)
       expect(notPinnedPost?.post?.viewer?.pinned).toBeFalsy()
@@ -533,8 +551,8 @@ describe('pds author feed views', () => {
         (item) => item.post.uri === post.ref.uriStr,
       )
       expect(pinnedPost?.post?.uri).toEqual(post.ref.uriStr)
-      expect(pinnedPost?.post?.viewer?.pinned).toBeTruthy()
-      expect(AppBskyFeedDefs.isReasonPin(pinnedPost?.reason)).toBeTruthy()
+      assert(pinnedPost?.post?.viewer?.pinned)
+      assert(isReasonPin(pinnedPost?.reason))
       expect(forSnapshot(page1.feed)).toMatchSnapshot()
 
       const { data: page2 } = await agent.api.app.bsky.feed.getAuthorFeed(
@@ -556,8 +574,8 @@ describe('pds author feed views', () => {
         (item) => item.post.uri === post.ref.uriStr,
       )
       expect(laterPinnedPost?.post?.uri).toEqual(post.ref.uriStr)
-      expect(laterPinnedPost?.post?.viewer?.pinned).toBeTruthy()
-      expect(AppBskyFeedDefs.isReasonPin(laterPinnedPost?.reason)).toBeFalsy()
+      assert(laterPinnedPost?.post?.viewer?.pinned)
+      expect(isReasonPin(laterPinnedPost?.reason)).toBeFalsy()
       expect(forSnapshot(page2.feed)).toMatchSnapshot()
     })
 
@@ -577,7 +595,7 @@ describe('pds author feed views', () => {
       const pinnedPost = data.feed.find(
         (item) => item.post.uri === post.ref.uriStr,
       )
-      expect(AppBskyFeedDefs.isReasonPin(pinnedPost?.reason)).toBeFalsy()
+      expect(isReasonPin(pinnedPost?.reason)).toBeFalsy()
       expect(forSnapshot(data.feed)).toMatchSnapshot()
     })
 
@@ -592,12 +610,10 @@ describe('pds author feed views', () => {
         rkey: 'self',
       })
 
-      if (!AppBskyActorProfile.isRecord(profile.data.value)) {
-        throw new Error('')
-      }
+      assert(isValidProfile(profile.data.value))
 
-      const newProfile: AppBskyActorProfile.Record = {
-        ...profile,
+      const newProfile: Profile = {
+        ...profile.data.value,
         pinnedPost: {
           uri: bobPost.ref.uriStr,
           cid: bobPost.ref.cid.toString(),
diff --git a/packages/bsky/tests/views/blocks.test.ts b/packages/bsky/tests/views/blocks.test.ts
index a0e5a599625..ac3e8028389 100644
--- a/packages/bsky/tests/views/blocks.test.ts
+++ b/packages/bsky/tests/views/blocks.test.ts
@@ -2,6 +2,8 @@ import assert from 'node:assert'
 import { AtUri, AtpAgent } from '@atproto/api'
 import { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
+import { isView as isRecordEmbedView } from '../../src/lexicon/types/app/bsky/embed/record'
+import { isPostView } from '../../src/lexicon/types/app/bsky/feed/defs'
 import { assertIsThreadViewPost, forSnapshot } from '../_util'
 
 describe('pds views with blocking', () => {
@@ -220,7 +222,8 @@ describe('pds views with blocking', () => {
       resCarol.data.feed.some(
         (post) =>
           post.post.author.did === dan ||
-          post.reply?.parent.author?.['did'] === dan ||
+          (isPostView(post.reply?.parent) &&
+            post.reply.parent.author.did === dan) ||
           post.reply?.grandparentAuthor?.did === dan,
       ),
     ).toBeFalsy()
@@ -235,7 +238,8 @@ describe('pds views with blocking', () => {
       resDan.data.feed.some(
         (post) =>
           post.post.author.did === carol ||
-          post.reply?.parent.author?.['did'] === carol ||
+          (isPostView(post.reply?.parent) &&
+            post.reply.parent.author.did === carol) ||
           post.reply?.grandparentAuthor?.did === carol,
       ),
     ).toBeFalsy()
@@ -658,7 +662,8 @@ describe('pds views with blocking', () => {
 
     assertIsThreadViewPost(embedThenBlock.thread)
 
-    expect(embedThenBlock.thread.post.embed?.record).toMatchObject({
+    assert(isRecordEmbedView(embedThenBlock.thread.post.embed))
+    expect(embedThenBlock.thread.post.embed.record).toMatchObject({
       $type: 'app.bsky.embed.record#viewBlocked',
     })
 
@@ -680,7 +685,8 @@ describe('pds views with blocking', () => {
 
     assertIsThreadViewPost(unblock.thread)
 
-    expect(unblock.thread.post?.embed?.record).toMatchObject({
+    assert(isRecordEmbedView(unblock.thread.post?.embed))
+    expect(unblock.thread.post?.embed.record).toMatchObject({
       $type: 'app.bsky.embed.record#viewRecord',
     })
 
@@ -709,8 +715,8 @@ describe('pds views with blocking', () => {
         },
       )
     assertIsThreadViewPost(blockThenEmbed.thread)
-
-    expect(blockThenEmbed.thread.post.embed?.record).toMatchObject({
+    assert(isRecordEmbedView(blockThenEmbed.thread.post.embed))
+    expect(blockThenEmbed.thread.post.embed.record).toMatchObject({
       $type: 'app.bsky.embed.record#viewBlocked',
     })
 
@@ -753,7 +759,8 @@ describe('pds views with blocking', () => {
       (item) => item.post.uri === embedBlockedUri,
     )
     assert(embedBlockedPost)
-    expect(embedBlockedPost.post.embed?.record).toMatchObject({
+    assert(isRecordEmbedView(embedBlockedPost.post.embed))
+    expect(embedBlockedPost.post.embed.record).toMatchObject({
       $type: 'app.bsky.embed.record#viewBlocked',
     })
   })
diff --git a/packages/bsky/tests/views/feed-view-post.test.ts b/packages/bsky/tests/views/feed-view-post.test.ts
index d9fd35da1d8..673fe790085 100644
--- a/packages/bsky/tests/views/feed-view-post.test.ts
+++ b/packages/bsky/tests/views/feed-view-post.test.ts
@@ -1,3 +1,4 @@
+import assert from 'node:assert'
 import { AppBskyFeedDefs, AtUri, AtpAgent } from '@atproto/api'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
@@ -87,8 +88,8 @@ describe('pds thread views', () => {
       throw new Error('sliceA or sliceB is undefined')
     }
 
-    expect(AppBskyFeedDefs.isBlockedPost(sliceB.reply?.parent)).toBe(true)
-    expect(AppBskyFeedDefs.isBlockedPost(sliceB.reply?.root)).toBe(true)
+    assert(AppBskyFeedDefs.isBlockedPost(sliceB.reply?.parent))
+    assert(AppBskyFeedDefs.isBlockedPost(sliceB.reply?.root))
 
     await pdsAgent.api.app.bsky.graph.block.delete(
       { repo: alice, rkey: new AtUri(block.uri).rkey },
@@ -129,10 +130,10 @@ describe('pds thread views', () => {
       throw new Error('sliceC is undefined')
     }
 
+    assert(AppBskyFeedDefs.isPostView(sliceC.reply.parent))
     expect(sliceC.reply.parent.uri).toEqual(B.ref.uriStr)
+    assert(AppBskyFeedDefs.isBlockedPost(sliceC.reply.root))
     expect(sliceC.reply.root.uri).toEqual(A.ref.uriStr)
-    expect(AppBskyFeedDefs.isPostView(sliceC.reply.parent)).toBe(true)
-    expect(AppBskyFeedDefs.isBlockedPost(sliceC.reply.root)).toBe(true)
 
     await pdsAgent.api.app.bsky.graph.block.delete(
       { repo: alice, rkey: new AtUri(block.uri).rkey },
@@ -249,10 +250,10 @@ describe('pds thread views', () => {
       throw new Error('sliceD is undefined')
     }
 
+    assert(AppBskyFeedDefs.isPostView(sliceD.reply.parent))
     expect(sliceD.reply.parent.uri).toEqual(C.ref.uriStr)
+    assert(AppBskyFeedDefs.isBlockedPost(sliceD.reply.root))
     expect(sliceD.reply.root.uri).toEqual(A.ref.uriStr)
-    expect(AppBskyFeedDefs.isPostView(sliceD.reply.parent)).toBe(true)
-    expect(AppBskyFeedDefs.isBlockedPost(sliceD.reply.root)).toBe(true)
 
     await pdsAgent.api.app.bsky.graph.block.delete(
       { repo: alice, rkey: new AtUri(block.uri).rkey },
@@ -292,10 +293,10 @@ describe('pds thread views', () => {
       throw new Error('sliceD is undefined')
     }
 
+    assert(AppBskyFeedDefs.isPostView(sliceD.reply.parent))
     expect(sliceD.reply.parent.uri).toEqual(C.ref.uriStr)
+    assert(AppBskyFeedDefs.isBlockedPost(sliceD.reply.root))
     expect(sliceD.reply.root.uri).toEqual(A.ref.uriStr)
-    expect(AppBskyFeedDefs.isPostView(sliceD.reply.parent)).toBe(true)
-    expect(AppBskyFeedDefs.isBlockedPost(sliceD.reply.root)).toBe(true)
 
     await pdsAgent.api.app.bsky.graph.block.delete(
       { repo: alice, rkey: new AtUri(block.uri).rkey },
@@ -338,13 +339,13 @@ describe('pds thread views', () => {
       throw new Error('sliceD is undefined')
     }
 
+    assert(AppBskyFeedDefs.isPostView(sliceD.reply.parent))
     expect(sliceD.reply.parent.uri).toEqual(C.ref.uriStr)
-    expect(sliceD.reply.root.uri).toEqual(A.ref.uriStr)
-    expect(AppBskyFeedDefs.isPostView(sliceD.reply.parent)).toBe(true)
     /*
      * We don't walk the reply ancestors past whats available in the ReplyRef
      */
-    expect(AppBskyFeedDefs.isPostView(sliceD.reply.root)).toBe(true)
+    assert(AppBskyFeedDefs.isPostView(sliceD.reply.root))
+    expect(sliceD.reply.root.uri).toEqual(A.ref.uriStr)
 
     await pdsAgent.api.app.bsky.graph.block.delete(
       { repo: alice, rkey: new AtUri(block.uri).rkey },
@@ -384,13 +385,14 @@ describe('pds thread views', () => {
       throw new Error('sliceD is undefined')
     }
 
+    assert(AppBskyFeedDefs.isPostView(sliceD.reply.parent))
     expect(sliceD.reply.parent.uri).toEqual(C.ref.uriStr)
-    expect(sliceD.reply.root.uri).toEqual(A.ref.uriStr)
-    expect(AppBskyFeedDefs.isPostView(sliceD.reply.parent)).toBe(true)
+
     /*
      * We don't walk the reply ancestors past whats available in the ReplyRef
      */
-    expect(AppBskyFeedDefs.isPostView(sliceD.reply.root)).toBe(true)
+    assert(AppBskyFeedDefs.isPostView(sliceD.reply.root))
+    expect(sliceD.reply.root.uri).toEqual(A.ref.uriStr)
 
     await pdsAgent.api.app.bsky.graph.block.delete(
       { repo: bob, rkey: new AtUri(block.uri).rkey },
@@ -434,9 +436,9 @@ describe('pds thread views', () => {
       throw new Error('sliceD or sliceC is undefined')
     }
 
-    expect(AppBskyFeedDefs.isBlockedPost(sliceD.reply?.root)).toBe(true)
-    expect(AppBskyFeedDefs.isPostView(sliceC.reply?.parent)).toBe(true)
-    expect(AppBskyFeedDefs.isPostView(sliceC.reply?.root)).toBe(true)
+    assert(AppBskyFeedDefs.isBlockedPost(sliceD.reply?.root))
+    assert(AppBskyFeedDefs.isPostView(sliceC.reply?.parent))
+    assert(AppBskyFeedDefs.isPostView(sliceC.reply?.root))
 
     await pdsAgent.api.app.bsky.graph.block.delete(
       { repo: alice, rkey: new AtUri(block.uri).rkey },
@@ -488,10 +490,10 @@ describe('pds thread views', () => {
       throw new Error('sliceD is undefined')
     }
 
+    assert(AppBskyFeedDefs.isPostView(sliceD.reply.parent))
     expect(sliceD.reply.parent.uri).toEqual(C.ref.uriStr)
+    assert(AppBskyFeedDefs.isBlockedPost(sliceD.reply.root))
     expect(sliceD.reply.root.uri).toEqual(A.ref.uriStr)
-    expect(AppBskyFeedDefs.isPostView(sliceD.reply.parent)).toBe(true)
-    expect(AppBskyFeedDefs.isBlockedPost(sliceD.reply.root)).toBe(true)
 
     await pdsAgent.api.app.bsky.graph.block.delete(
       { repo: alice, rkey: new AtUri(block.uri).rkey },
diff --git a/packages/bsky/tests/views/labeler-service.test.ts b/packages/bsky/tests/views/labeler-service.test.ts
index e78517f0fff..d3a03be3dc3 100644
--- a/packages/bsky/tests/views/labeler-service.test.ts
+++ b/packages/bsky/tests/views/labeler-service.test.ts
@@ -1,6 +1,8 @@
+import assert from 'node:assert'
 import { AtpAgent } from '@atproto/api'
 import { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
+import { isView as isRecordEmbedView } from '../../src/lexicon/types/app/bsky/embed/record'
 import { forSnapshot, stripViewerFromLabeler } from '../_util'
 
 describe('labeler service views', () => {
@@ -150,7 +152,8 @@ describe('labeler service views', () => {
     const serviceViews = await agent.api.app.bsky.labeler.getServices({
       dids: [alice],
     })
-    expect(postViews.data.posts[0].embed?.record).toMatchObject(
+    assert(isRecordEmbedView(postViews.data.posts[0].embed))
+    expect(postViews.data.posts[0].embed.record).toMatchObject(
       serviceViews.data.views[0],
     )
   })
diff --git a/packages/bsky/tests/views/labels-takedown.test.ts b/packages/bsky/tests/views/labels-takedown.test.ts
index 98b59810268..0cb2bbbbbac 100644
--- a/packages/bsky/tests/views/labels-takedown.test.ts
+++ b/packages/bsky/tests/views/labels-takedown.test.ts
@@ -1,4 +1,5 @@
-import { AtpAgent } from '@atproto/api'
+import assert from 'node:assert'
+import { AppBskyLabelerDefs, AtpAgent } from '@atproto/api'
 import { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
 
@@ -232,7 +233,8 @@ describe('bsky takedown labels', () => {
       dids: [sc.dids.labeler1, sc.dids.labeler2],
     })
     expect(res.data.views.length).toBe(1)
-    expect(res.data.views[0].creator?.['did']).toBe(sc.dids.labeler2)
+    assert(AppBskyLabelerDefs.isLabelerView(res.data.views[0]))
+    expect(res.data.views[0].creator.did).toBe(sc.dids.labeler2)
   })
 
   it('only applies if the relevant labeler is configured', async () => {
diff --git a/packages/bsky/tests/views/list-feed.test.ts b/packages/bsky/tests/views/list-feed.test.ts
index f869119f634..19bcc6d43d8 100644
--- a/packages/bsky/tests/views/list-feed.test.ts
+++ b/packages/bsky/tests/views/list-feed.test.ts
@@ -118,11 +118,14 @@ describe('list feed views', () => {
         }
         if (item.reply) {
           result.reply = {
-            parent: stripViewerFromPost(item.reply.parent),
-            root: stripViewerFromPost(item.reply.root),
-            grandparentAuthor:
-              item.reply.grandparentAuthor &&
-              stripViewer(item.reply.grandparentAuthor),
+            parent: stripViewerFromPost(item.reply.parent, true),
+            root: stripViewerFromPost(item.reply.root, true),
+          }
+
+          if (item.reply.grandparentAuthor) {
+            result.reply.grandparentAuthor = stripViewer(
+              item.reply.grandparentAuthor,
+            )
           }
         }
         return result
diff --git a/packages/bsky/tests/views/posts.test.ts b/packages/bsky/tests/views/posts.test.ts
index 56f89832f73..1f90937e1dc 100644
--- a/packages/bsky/tests/views/posts.test.ts
+++ b/packages/bsky/tests/views/posts.test.ts
@@ -1,4 +1,4 @@
-import { AppBskyFeedPost, AtpAgent } from '@atproto/api'
+import { AppBskyFeedPost, AtpAgent, Un$Typed } from '@atproto/api'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { RecordWithMedia } from '../../dist/views/types'
 import { ids } from '../../src/lexicon/lexicons'
@@ -96,7 +96,7 @@ describe('pds posts views', () => {
   })
 
   it('allows for creating posts with tags', async () => {
-    const post: AppBskyFeedPost.Record = {
+    const post: Un$Typed<AppBskyFeedPost.Record> = {
       text: 'hello world',
       tags: ['javascript', 'hehe'],
       createdAt: new Date().toISOString(),
diff --git a/packages/bsky/tests/views/starter-packs.test.ts b/packages/bsky/tests/views/starter-packs.test.ts
index 5751c948884..218a65fd801 100644
--- a/packages/bsky/tests/views/starter-packs.test.ts
+++ b/packages/bsky/tests/views/starter-packs.test.ts
@@ -1,10 +1,12 @@
 import assert from 'node:assert'
-import { AtpAgent } from '@atproto/api'
+import { AtpAgent, asPredicate } from '@atproto/api'
 import { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
-import { isRecord as isProfile } from '../../src/lexicon/types/app/bsky/actor/profile'
+import { validateRecord as validateProfileRecord } from '../../src/lexicon/types/app/bsky/actor/profile'
 import { forSnapshot } from '../_util'
 
+const isValidProfile = asPredicate(validateProfileRecord)
+
 describe('starter packs', () => {
   let network: TestNetwork
   let agent: AtpAgent
@@ -147,7 +149,7 @@ describe('starter packs', () => {
       expect(notif.reason).toBe('starterpack-joined')
       expect(notif.reasonSubject).toBe(sp1.uriStr)
       expect(notif.uri).toMatch(/\/app\.bsky\.actor\.profile\/self$/)
-      assert(isProfile(notif.record), 'record is not profile')
+      assert(isValidProfile(notif.record), 'record is not profile')
       expect(notif.record.joinedViaStarterPack?.uri).toBe(sp1.uriStr)
     })
     expect(forSnapshot(notifications)).toMatchSnapshot()
diff --git a/packages/bsky/tests/views/thread.test.ts b/packages/bsky/tests/views/thread.test.ts
index 4b46f06b4fd..4c3bf849053 100644
--- a/packages/bsky/tests/views/thread.test.ts
+++ b/packages/bsky/tests/views/thread.test.ts
@@ -1,6 +1,8 @@
+import assert from 'node:assert'
 import { AppBskyFeedGetPostThread, AtpAgent } from '@atproto/api'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
+import { isThreadViewPost } from '../../src/lexicon/types/app/bsky/feed/defs'
 import {
   assertIsThreadViewPost,
   forSnapshot,
@@ -404,7 +406,10 @@ describe('pds thread views', () => {
         },
       )
 
-      const parent = threadPreTakedown.data.thread.parent?.['post']
+      assert(isThreadViewPost(threadPreTakedown.data.thread))
+      assert(isThreadViewPost(threadPreTakedown.data.thread.parent))
+
+      const parent = threadPreTakedown.data.thread.parent.post
 
       await network.bsky.ctx.dataplane.takedownRecord({
         recordUri: parent.uri,
@@ -439,8 +444,18 @@ describe('pds thread views', () => {
           ),
         },
       )
+
+      assert(isThreadViewPost(threadPreTakedown.data.thread))
+      assert(isThreadViewPost(threadPreTakedown.data.thread.replies?.[0]))
+      assert(isThreadViewPost(threadPreTakedown.data.thread.replies?.[1]))
+      assert(
+        isThreadViewPost(
+          threadPreTakedown.data.thread.replies?.[1].replies?.[0],
+        ),
+      )
+
       const post1 = threadPreTakedown.data.thread.replies?.[0].post
-      const post2 = threadPreTakedown.data.thread.replies?.[1].replies[0].post
+      const post2 = threadPreTakedown.data.thread.replies?.[1].replies?.[0].post
 
       await Promise.all(
         [post1, post2].map((post) =>
diff --git a/packages/bsync/jest.config.js b/packages/bsync/jest.config.js
index 4ac7794c9ed..bfe0b1c78eb 100644
--- a/packages/bsync/jest.config.js
+++ b/packages/bsync/jest.config.js
@@ -3,4 +3,5 @@ module.exports = {
   displayName: 'Bsync',
   transform: { '^.+\\.(t|j)s$': '@swc/jest' },
   setupFiles: ['<rootDir>/../../jest.setup.ts'],
+  moduleNameMapper: { '^(\\.\\.?\\/.+)\\.js$': ['$1.ts', '$1.js'] },
 }
diff --git a/packages/common-web/jest.config.js b/packages/common-web/jest.config.js
index 85f61f37aac..f6cd5ced5e4 100644
--- a/packages/common-web/jest.config.js
+++ b/packages/common-web/jest.config.js
@@ -3,4 +3,5 @@ module.exports = {
   displayName: 'Common Web',
   transform: { '^.+\\.(t|j)s$': '@swc/jest' },
   setupFiles: ['<rootDir>/../../jest.setup.ts'],
+  moduleNameMapper: { '^(\\.\\.?\\/.+)\\.js$': ['$1.ts', '$1.js'] },
 }
diff --git a/packages/common/jest.config.js b/packages/common/jest.config.js
index 18e79db079e..0f0bacbe579 100644
--- a/packages/common/jest.config.js
+++ b/packages/common/jest.config.js
@@ -3,4 +3,5 @@ module.exports = {
   displayName: 'Common',
   transform: { '^.+\\.(t|j)s$': '@swc/jest' },
   setupFiles: ['<rootDir>/../../jest.setup.ts'],
+  moduleNameMapper: { '^(\\.\\.?\\/.+)\\.js$': ['$1.ts', '$1.js'] },
 }
diff --git a/packages/crypto/jest.config.js b/packages/crypto/jest.config.js
index d5f37b722f9..d33e6809759 100644
--- a/packages/crypto/jest.config.js
+++ b/packages/crypto/jest.config.js
@@ -3,4 +3,5 @@ module.exports = {
   displayName: 'Crypto',
   transform: { '^.+\\.(t|j)s$': '@swc/jest' },
   setupFiles: ['<rootDir>/../../jest.setup.ts'],
+  moduleNameMapper: { '^(\\.\\.?\\/.+)\\.js$': ['$1.ts', '$1.js'] },
 }
diff --git a/packages/dev-env/src/moderator-client.ts b/packages/dev-env/src/moderator-client.ts
index eb9212fb913..603eef4fb3e 100644
--- a/packages/dev-env/src/moderator-client.ts
+++ b/packages/dev-env/src/moderator-client.ts
@@ -62,7 +62,7 @@ export class ModeratorClient {
       subjectBlobCids?: TakeActionInput['subjectBlobCids']
       reason?: string
       createdBy?: string
-      meta?: TakeActionInput['meta']
+      meta?: unknown
     },
     role?: ModLevel,
   ) {
@@ -74,7 +74,14 @@ export class ModeratorClient {
       createdBy = 'did:example:admin',
     } = opts
     const result = await this.agent.tools.ozone.moderation.emitEvent(
-      { event, subject, subjectBlobCids, createdBy, reason },
+      {
+        event,
+        subject,
+        subjectBlobCids,
+        createdBy,
+        // @ts-expect-error this a valid input property
+        reason,
+      },
       {
         encoding: 'application/json',
         headers: await this.ozone.modHeaders(
diff --git a/packages/dev-env/src/seed/client.ts b/packages/dev-env/src/seed/client.ts
index 61babc4dd23..d160f657d6a 100644
--- a/packages/dev-env/src/seed/client.ts
+++ b/packages/dev-env/src/seed/client.ts
@@ -4,6 +4,7 @@ import { CID } from 'multiformats/cid'
 import {
   AppBskyFeedLike,
   AppBskyFeedPost,
+  AppBskyGraphBlock,
   AppBskyGraphFollow,
   AppBskyGraphList,
   AppBskyRichtextFacet,
@@ -264,7 +265,7 @@ export class SeedClient<
   async block(
     from: string,
     to: string,
-    overrides?: Partial<AppBskyGraphFollow.Record>,
+    overrides?: Partial<AppBskyGraphBlock.Record>,
   ) {
     const res = await this.agent.app.bsky.graph.block.create(
       { repo: from },
diff --git a/packages/identity/jest.config.js b/packages/identity/jest.config.js
index c8ff8355630..a4ee2111387 100644
--- a/packages/identity/jest.config.js
+++ b/packages/identity/jest.config.js
@@ -4,4 +4,5 @@ module.exports = {
   transform: { '^.+\\.(t|j)s$': '@swc/jest' },
   transformIgnorePatterns: ['/node_modules/.pnpm/(?!(get-port)@)'],
   setupFiles: ['<rootDir>/../../jest.setup.ts'],
+  moduleNameMapper: { '^(\\.\\.?\\/.+)\\.js$': ['$1.ts', '$1.js'] },
 }
diff --git a/packages/lex-cli/src/codegen/client.ts b/packages/lex-cli/src/codegen/client.ts
index 1ec1d6fa836..aca8e0dd9c4 100644
--- a/packages/lex-cli/src/codegen/client.ts
+++ b/packages/lex-cli/src/codegen/client.ts
@@ -9,9 +9,9 @@ import { NSID } from '@atproto/syntax'
 import { GeneratedAPI } from '../types'
 import { gen, lexiconsTs, utilTs } from './common'
 import {
+  genCommonImports,
   genImports,
-  genObjHelpers,
-  genObject,
+  genRecord,
   genUserType,
   genXrpcInput,
   genXrpcOutput,
@@ -70,9 +70,9 @@ const indexTs = (
       { name: 'FetchHandler' },
       { name: 'FetchHandlerOptions' },
     ])
-    //= import {schemas} from './lexicons'
+    //= import {schemas} from './lexicons.js'
     file
-      .addImportDeclaration({ moduleSpecifier: './lexicons' })
+      .addImportDeclaration({ moduleSpecifier: './lexicons.js' })
       .addNamedImports([{ name: 'schemas' }])
     //= import {CID} from 'multiformats/cid'
     file
@@ -81,9 +81,14 @@ const indexTs = (
       })
       .addNamedImports([{ name: 'CID' }])
 
+    //= import {OmitKey} from './util.js'
+    file
+      .addImportDeclaration({ moduleSpecifier: `./util.js` })
+      .addNamedImports([{ name: 'OmitKey' }, { name: 'Un$Typed' }])
+
     // generate type imports and re-exports
     for (const lexicon of lexiconDocs) {
-      const moduleSpecifier = `./types/${lexicon.id.split('.').join('/')}`
+      const moduleSpecifier = `./types/${lexicon.id.split('.').join('/')}.js`
       file
         .addImportDeclaration({ moduleSpecifier })
         .setNamespaceImport(toTitleCase(lexicon.id))
@@ -312,7 +317,7 @@ function genRecordCls(file: SourceFile, nsid: string, lexRecord: LexRecord) {
     })
     method.addParameter({
       name: 'params',
-      type: `Omit<${toTitleCase(ATP_METHODS.list)}.QueryParams, "collection">`,
+      type: `OmitKey<${toTitleCase(ATP_METHODS.list)}.QueryParams, "collection">`,
     })
     method.setBodyText(
       [
@@ -330,7 +335,7 @@ function genRecordCls(file: SourceFile, nsid: string, lexRecord: LexRecord) {
     })
     method.addParameter({
       name: 'params',
-      type: `Omit<${toTitleCase(ATP_METHODS.get)}.QueryParams, "collection">`,
+      type: `OmitKey<${toTitleCase(ATP_METHODS.get)}.QueryParams, "collection">`,
     })
     method.setBodyText(
       [
@@ -348,13 +353,13 @@ function genRecordCls(file: SourceFile, nsid: string, lexRecord: LexRecord) {
     })
     method.addParameter({
       name: 'params',
-      type: `Omit<${toTitleCase(
+      type: `OmitKey<${toTitleCase(
         ATP_METHODS.create,
       )}.InputSchema, "collection" | "record">`,
     })
     method.addParameter({
       name: 'record',
-      type: `${typeModule}.Record`,
+      type: `Un$Typed<${typeModule}.Record>`,
     })
     method.addParameter({
       name: 'headers?',
@@ -365,8 +370,8 @@ function genRecordCls(file: SourceFile, nsid: string, lexRecord: LexRecord) {
       : ''
     method.setBodyText(
       [
-        `record.$type = '${nsid}'`,
-        `const res = await this._client.call('${ATP_METHODS.create}', undefined, { collection: '${nsid}', ${maybeRkeyPart}...params, record }, {encoding: 'application/json', headers })`,
+        `const collection = '${nsid}'`,
+        `const res = await this._client.call('${ATP_METHODS.create}', undefined, { collection, ${maybeRkeyPart}...params, record: { ...record, $type: collection} }, {encoding: 'application/json', headers })`,
         `return res.data`,
       ].join('\n'),
     )
@@ -380,7 +385,7 @@ function genRecordCls(file: SourceFile, nsid: string, lexRecord: LexRecord) {
   //   })
   //   method.addParameter({
   //     name: 'params',
-  //     type: `Omit<${toTitleCase(ATP_METHODS.put)}.InputSchema, "collection" | "record">`,
+  //     type: `OmitKey<${toTitleCase(ATP_METHODS.put)}.InputSchema, "collection" | "record">`,
   //   })
   //   method.addParameter({
   //     name: 'record',
@@ -407,7 +412,7 @@ function genRecordCls(file: SourceFile, nsid: string, lexRecord: LexRecord) {
     })
     method.addParameter({
       name: 'params',
-      type: `Omit<${toTitleCase(
+      type: `OmitKey<${toTitleCase(
         ATP_METHODS.delete,
       )}.InputSchema, "collection">`,
     })
@@ -429,8 +434,6 @@ const lexiconTs = (project, lexicons: Lexicons, lexiconDoc: LexiconDoc) =>
     project,
     `/types/${lexiconDoc.id.split('.').join('/')}.ts`,
     async (file) => {
-      const imports: Set<string> = new Set()
-
       const main = lexiconDoc.defs.main
       if (
         main?.type === 'query' ||
@@ -446,37 +449,10 @@ const lexiconTs = (project, lexicons: Lexicons, lexiconDoc: LexiconDoc) =>
           { name: 'XRPCError' },
         ])
       }
-      //= import {ValidationResult, BlobRef} from '@atproto/lexicon'
-      file
-        .addImportDeclaration({
-          moduleSpecifier: '@atproto/lexicon',
-        })
-        .addNamedImports([{ name: 'ValidationResult' }, { name: 'BlobRef' }])
-      //= import {isObj, hasProp} from '../../util.ts'
-      file
-        .addImportDeclaration({
-          moduleSpecifier: `${lexiconDoc.id
-            .split('.')
-            .map((_str) => '..')
-            .join('/')}/util`,
-        })
-        .addNamedImports([{ name: 'isObj' }, { name: 'hasProp' }])
-      //= import {lexicons} from '../../lexicons.ts'
-      file
-        .addImportDeclaration({
-          moduleSpecifier: `${lexiconDoc.id
-            .split('.')
-            .map((_str) => '..')
-            .join('/')}/lexicons`,
-        })
-        .addNamedImports([{ name: 'lexicons' }])
-      //= import {CID} from 'multiformats/cid'
-      file
-        .addImportDeclaration({
-          moduleSpecifier: 'multiformats/cid',
-        })
-        .addNamedImports([{ name: 'CID' }])
 
+      genCommonImports(file, lexiconDoc.id)
+
+      const imports: Set<string> = new Set()
       for (const defId in lexiconDoc.defs) {
         const def = lexiconDoc.defs[defId]
         const lexUri = `${lexiconDoc.id}#${defId}`
@@ -489,7 +465,7 @@ const lexiconTs = (project, lexicons: Lexicons, lexiconDoc: LexiconDoc) =>
           } else if (def.type === 'subscription') {
             continue
           } else if (def.type === 'record') {
-            genClientRecord(file, imports, lexicons, lexUri)
+            genRecord(file, imports, lexicons, lexUri)
           } else {
             genUserType(file, imports, lexicons, lexUri)
           }
@@ -586,17 +562,3 @@ function genClientXrpcCommon(
       : ['return e'],
   })
 }
-
-function genClientRecord(
-  file: SourceFile,
-  imports: Set<string>,
-  lexicons: Lexicons,
-  lexUri: string,
-) {
-  const def = lexicons.getDefOrThrow(lexUri, ['record'])
-
-  //= export interface Record {...}
-  genObject(file, imports, lexUri, def.record, 'Record')
-  //= export function isRecord(v: unknown): v is Record {...}
-  genObjHelpers(file, lexUri, 'Record')
-}
diff --git a/packages/lex-cli/src/codegen/common.ts b/packages/lex-cli/src/codegen/common.ts
index 4ebaf748040..95205b92551 100644
--- a/packages/lex-cli/src/codegen/common.ts
+++ b/packages/lex-cli/src/codegen/common.ts
@@ -1,28 +1,133 @@
-import { format } from 'prettier'
+import { Options as PrettierOptions, format } from 'prettier'
 import { Project, SourceFile, VariableDeclarationKind } from 'ts-morph'
 import { LexiconDoc } from '@atproto/lexicon'
 import { GeneratedFile } from '../types'
 
-const PRETTIER_OPTS = {
+const PRETTIER_OPTS: PrettierOptions = {
   parser: 'typescript',
   tabWidth: 2,
   semi: false,
   singleQuote: true,
-  trailingComma: 'all' as const,
+  trailingComma: 'all',
 }
 
 export const utilTs = (project) =>
   gen(project, '/util.ts', async (file) => {
     file.replaceWithText(`
-export function isObj(v: unknown): v is Record<string, unknown> {
-  return typeof v === 'object' && v !== null
+import { 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)
+}
+${
+  /**
+   * The construct below allows to properly distinguish open unions. Consider
+   * the following example:
+   *
+   * ```ts
+   * type Foo = { $type?: $Type<'foo', 'main'>; foo: string }
+   * type Bar = { $type?: $Type<'bar', 'main'>; bar: string }
+   * type OpenFooBarUnion = $Typed<Foo> | $Typed<Bar> | { $type: string }
+   * ```
+   *
+   * In the context of lexicons, when there is a open union as shown above, the
+   * if `$type` if either `foo` or `bar`, then the object IS of type `Foo` or
+   * `Bar`.
+   *
+   * ```ts
+   * declare const obj1: OpenFooBarUnion
+   * if (is$typed(obj1, 'foo', 'main')) {
+   *   obj1.$type // $Type<'foo', 'main'>
+   *   obj1.foo // string
+   * }
+   * ```
+   *
+   * Similarly, if an object is of type `unknown`, then the `is$typed` function
+   * should only return assurance about the `$type` property, which is what it
+   * actually checks:
+   *
+   * ```ts
+   * declare const obj2: unknown
+   * if (is$typed(obj2, 'foo', 'main')) {
+   *  obj2.$type // $Type<'foo', 'main'>
+   *  // @ts-expect-error
+   *  obj2.foo
+   * }
+   * ```
+   *
+   * The construct bellow is what makes these two scenarios possible.
+   */
+  ''
 }
+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
 
-export function hasProp<K extends PropertyKey>(
-  data: object,
-  prop: K,
-): data is Record<K, unknown> {
-  return prop in data
+/**
+ * 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
+  }
 }
 `)
   })
@@ -41,7 +146,23 @@ export const lexiconsTs = (project, lexicons: LexiconDoc[]) =>
       .addImportDeclaration({
         moduleSpecifier: '@atproto/lexicon',
       })
-      .addNamedImports([{ name: 'LexiconDoc' }, { name: 'Lexicons' }])
+      .addNamedImports([
+        { name: 'LexiconDoc' },
+        { name: 'Lexicons' },
+        { name: 'ValidationError' },
+        { name: 'ValidationResult' },
+      ])
+
+    //= import {is$typed, maybe$typed, $Typed} from './util'
+    file
+      .addImportDeclaration({
+        moduleSpecifier: './util.js',
+      })
+      .addNamedImports([
+        { name: '$Typed' },
+        { name: 'is$typed' },
+        { name: 'maybe$typed' },
+      ])
 
     //= export const schemaDict = {...} as const satisfies Record<string, LexiconDoc>
     file.addVariableStatement({
@@ -66,14 +187,14 @@ export const lexiconsTs = (project, lexicons: LexiconDoc[]) =>
       ],
     })
 
-    //= export const schemas = Object.values(schemaDict)
+    //= export const schemas = Object.values(schemaDict) satisfies LexiconDoc[]
     file.addVariableStatement({
       isExported: true,
       declarationKind: VariableDeclarationKind.Const,
       declarations: [
         {
           name: 'schemas',
-          initializer: 'Object.values(schemaDict)',
+          initializer: 'Object.values(schemaDict) satisfies LexiconDoc[]',
         },
       ],
     })
@@ -91,6 +212,44 @@ export const lexiconsTs = (project, lexicons: LexiconDoc[]) =>
       ],
     })
 
+    file.addFunction({
+      isExported: true,
+      name: 'validate',
+      overloads: [
+        {
+          typeParameters: ['T extends { $type: string }'],
+          parameters: [
+            { name: 'v', type: 'unknown' },
+            { name: 'id', type: 'string' },
+            { name: 'hash', type: 'string' },
+            { name: 'requiredType', type: 'true' },
+          ],
+          returnType: 'ValidationResult<T>',
+        },
+        {
+          typeParameters: ['T extends { $type?: string }'],
+          parameters: [
+            { name: 'v', type: 'unknown' },
+            { name: 'id', type: 'string' },
+            { name: 'hash', type: 'string' },
+            { name: 'requiredType', type: 'false', hasQuestionToken: true },
+          ],
+          returnType: 'ValidationResult<T>',
+        },
+      ],
+      parameters: [
+        { name: 'v', type: 'unknown' },
+        { name: 'id', type: 'string' },
+        { name: 'hash', type: 'string' },
+        { name: 'requiredType', type: 'boolean', hasQuestionToken: true },
+      ],
+      statements: [
+        // If $type is present, make sure it is valid before validating the rest of the object
+        '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`) }',
+      ],
+      returnType: 'ValidationResult',
+    })
+
     //= export const ids = {...}
     file.addVariableStatement({
       isExported: true,
@@ -98,14 +257,11 @@ export const lexiconsTs = (project, lexicons: LexiconDoc[]) =>
       declarations: [
         {
           name: 'ids',
-          initializer: JSON.stringify(
-            lexicons.reduce((acc, cur) => {
-              return {
-                ...acc,
-                [nsidToEnum(cur.id)]: cur.id,
-              }
-            }, {}),
-          ),
+          initializer: `{${lexicons
+            .map(
+              (lex) => `\n  ${nsidToEnum(lex.id)}: ${JSON.stringify(lex.id)},`,
+            )
+            .join('')}\n} as const`,
         },
       ],
     })
@@ -118,12 +274,11 @@ export async function gen(
 ): Promise<GeneratedFile> {
   const file = project.createSourceFile(path)
   await gen(file)
-  file.saveSync()
-  const src = project.getFileSystem().readFileSync(path)
-  return {
-    path: path,
-    content: `${banner()}${await format(src, PRETTIER_OPTS)}`,
-  }
+  await file.save() // Save in the "in memory" file system
+  const src = `${banner()}${file.getFullText()}`
+  const content = await format(src, PRETTIER_OPTS)
+
+  return { path, content }
 }
 
 function banner() {
diff --git a/packages/lex-cli/src/codegen/lex-gen.ts b/packages/lex-cli/src/codegen/lex-gen.ts
index ebc04fedbd7..271e212a4ba 100644
--- a/packages/lex-cli/src/codegen/lex-gen.ts
+++ b/packages/lex-cli/src/codegen/lex-gen.ts
@@ -27,6 +27,67 @@ export function genComment<T>(
   return commentable as T
 }
 
+export function genCommonImports(file: SourceFile, baseNsid: string) {
+  //= import {ValidationResult, BlobRef} from '@atproto/lexicon'
+  file
+    .addImportDeclaration({
+      moduleSpecifier: '@atproto/lexicon',
+    })
+    .addNamedImports([{ name: 'ValidationResult' }, { name: 'BlobRef' }])
+
+  //= import {CID} from 'multiformats/cid'
+  file
+    .addImportDeclaration({
+      moduleSpecifier: 'multiformats/cid',
+    })
+    .addNamedImports([{ name: 'CID' }])
+
+  //= import { validate as _validate } from '../../lexicons.ts'
+  file
+    .addImportDeclaration({
+      moduleSpecifier: `${baseNsid
+        .split('.')
+        .map((_str) => '..')
+        .join('/')}/lexicons`,
+    })
+    .addNamedImports([{ name: 'validate', alias: '_validate' }])
+
+  //= import { $Typed, is$typed as _is$typed, OmitKey } from '../[...]/util.ts'
+  file
+    .addImportDeclaration({
+      moduleSpecifier: `${baseNsid
+        .split('.')
+        .map((_str) => '..')
+        .join('/')}/util`,
+    })
+    .addNamedImports([
+      { name: '$Typed' },
+      { name: 'is$typed', alias: '_is$typed' },
+      { name: 'OmitKey' },
+    ])
+
+  // tsc adds protection against circular imports, which hurts bundle size.
+  // Since we know that lexicon.ts and util.ts do not depend on the file being
+  // generated, we can safely bypass this protection.
+  // Note that we are not using `import * as util from '../../util'` because
+  // typescript will emit is own helpers for the import, which we want to avoid.
+  file.addVariableStatement({
+    isExported: false,
+    declarationKind: VariableDeclarationKind.Const,
+    declarations: [
+      { name: 'is$typed', initializer: '_is$typed' },
+      { name: 'validate', initializer: '_validate' },
+    ],
+  })
+
+  //= const id = "{baseNsid}"
+  file.addVariableStatement({
+    isExported: false, // Do not export to allow tree-shaking
+    declarationKind: VariableDeclarationKind.Const,
+    declarations: [{ name: 'id', initializer: JSON.stringify(baseNsid) }],
+  })
+}
+
 export function genImports(
   file: SourceFile,
   imports: Set<string>,
@@ -35,12 +96,13 @@ export function genImports(
   const startPath = '/' + baseNsid.split('.').slice(0, -1).join('/')
 
   for (const nsid of imports) {
-    const targetPath = '/' + nsid.split('.').join('/')
+    const targetPath = '/' + nsid.split('.').join('/') + '.js'
     let resolvedPath = getRelativePath(startPath, targetPath)
     if (!resolvedPath.startsWith('.')) {
       resolvedPath = `./${resolvedPath}`
     }
     file.addImportDeclaration({
+      isTypeOnly: true,
       moduleSpecifier: resolvedPath,
       namespaceImport: toTitleCase(nsid),
     })
@@ -61,10 +123,16 @@ export function genUserType(
     case 'token':
       genToken(file, lexUri, def)
       break
-    case 'object':
-      genObject(file, imports, lexUri, def)
-      genObjHelpers(file, lexUri)
+    case 'object': {
+      const ifaceName: string = toTitleCase(getHash(lexUri))
+      genObject(file, imports, lexUri, def, ifaceName, {
+        typeProperty: true,
+      })
+      genObjHelpers(file, lexUri, ifaceName, {
+        requireTypeProperty: false,
+      })
       break
+    }
 
     case 'blob':
     case 'bytes':
@@ -83,19 +151,44 @@ export function genUserType(
   }
 }
 
-export function genObject(
+function genObject(
   file: SourceFile,
   imports: Set<string>,
   lexUri: string,
   def: LexObject,
-  ifaceName?: string,
-  defaultsArePresent = true,
+  ifaceName: string,
+  {
+    defaultsArePresent = true,
+    allowUnknownProperties = false,
+    typeProperty = false,
+  }: {
+    defaultsArePresent?: boolean
+    allowUnknownProperties?: boolean
+    typeProperty?: boolean | 'required'
+  } = {},
 ) {
   const iface = file.addInterface({
-    name: ifaceName || toTitleCase(getHash(lexUri)),
+    name: ifaceName,
     isExported: true,
   })
   genComment(iface, def)
+
+  if (typeProperty) {
+    const hash = getHash(lexUri)
+    const baseNsid = stripScheme(stripHash(lexUri))
+
+    //= $type?: <uri>
+    iface.addProperty({
+      name: typeProperty === 'required' ? `$type` : `$type?`,
+      type:
+        // Not using $Type here because it is less readable than a plain string
+        // `$Type<${JSON.stringify(baseNsid)}, ${JSON.stringify(hash)}>`
+        hash === 'main'
+          ? JSON.stringify(`${baseNsid}`)
+          : JSON.stringify(`${baseNsid}#${hash}`),
+    })
+  }
+
   const nullableProps = new Set(def.nullable)
   if (def.properties) {
     for (const propKey in def.properties) {
@@ -108,12 +201,12 @@ export function genObject(
           propDef.default !== undefined)
       if (propDef.type === 'ref' || propDef.type === 'union') {
         //= propName: External|External
-        const refs = propDef.type === 'union' ? propDef.refs : [propDef.ref]
-        const types = refs.map((ref) =>
-          refToType(ref, stripScheme(stripHash(lexUri)), imports),
-        )
+        const types =
+          propDef.type === 'union'
+            ? propDef.refs.map((ref) => refToUnionType(ref, lexUri, imports))
+            : [refToType(propDef.ref, stripScheme(stripHash(lexUri)), imports)]
         if (propDef.type === 'union' && !propDef.closed) {
-          types.push('{$type: string; [k: string]: unknown}')
+          types.push('{ $type: string }')
         }
         iface.addProperty({
           name: `${propKey}${req ? '' : '?'}`,
@@ -141,10 +234,10 @@ export function genObject(
             })
           } else if (propDef.items.type === 'union') {
             const types = propDef.items.refs.map((ref) =>
-              refToType(ref, stripScheme(stripHash(lexUri)), imports),
+              refToUnionType(ref, lexUri, imports),
             )
             if (!propDef.items.closed) {
-              types.push('{$type: string; [k: string]: unknown}')
+              types.push('{ $type: string }')
             }
             propAst = iface.addProperty({
               name: `${propKey}${req ? '' : '?'}`,
@@ -177,16 +270,21 @@ export function genObject(
         }
       }
     }
-    //= [k: string]: unknown
-    iface.addIndexSignature({
-      keyName: 'k',
-      keyType: 'string',
-      returnType: 'unknown',
-    })
+
+    if (allowUnknownProperties) {
+      //= [k: string]: unknown
+      iface.addIndexSignature({
+        keyName: 'k',
+        keyType: 'string',
+        returnType: 'unknown',
+      })
+    }
   }
 }
 
 export function genToken(file: SourceFile, lexUri: string, def: LexToken) {
+  //= /** <comment> */
+  //= export const <TOKEN> = `${id}#<token>`
   genComment(
     file.addVariableStatement({
       isExported: true,
@@ -194,7 +292,7 @@ export function genToken(file: SourceFile, lexUri: string, def: LexToken) {
       declarations: [
         {
           name: toScreamingSnakeCase(getHash(lexUri)),
-          initializer: `"${stripScheme(lexUri)}"`,
+          initializer: `\`\${id}#${getHash(lexUri)}\``,
         },
       ],
     }),
@@ -220,10 +318,10 @@ export function genArray(
     })
   } else if (def.items.type === 'union') {
     const types = def.items.refs.map((ref) =>
-      refToType(ref, stripScheme(stripHash(lexUri)), imports),
+      refToUnionType(ref, lexUri, imports),
     )
     if (!def.items.closed) {
-      types.push('{$type: string; [k: string]: unknown}')
+      types.push('{ $type: string }')
     }
     file.addTypeAlias({
       name: toTitleCase(getHash(lexUri)),
@@ -308,15 +406,22 @@ export function genXrpcInput(
   if (def.type === 'procedure' && def.input?.schema) {
     if (def.input.schema.type === 'ref' || def.input.schema.type === 'union') {
       //= export type InputSchema = ...
-      const refs =
+
+      const types =
         def.input.schema.type === 'union'
-          ? def.input.schema.refs
-          : [def.input.schema.ref]
-      const types = refs.map((ref) =>
-        refToType(ref, stripScheme(stripHash(lexUri)), imports),
-      )
+          ? def.input.schema.refs.map((ref) =>
+              refToUnionType(ref, lexUri, imports),
+            )
+          : [
+              refToType(
+                def.input.schema.ref,
+                stripScheme(stripHash(lexUri)),
+                imports,
+              ),
+            ]
+
       if (def.input.schema.type === 'union' && !def.input.schema.closed) {
-        types.push('{$type: string; [k: string]: unknown}')
+        types.push('{ $type: string }')
       }
       file.addTypeAlias({
         name: 'InputSchema',
@@ -325,14 +430,9 @@ export function genXrpcInput(
       })
     } else {
       //= export interface InputSchema {...}
-      genObject(
-        file,
-        imports,
-        lexUri,
-        def.input.schema,
-        `InputSchema`,
+      genObject(file, imports, lexUri, def.input.schema, `InputSchema`, {
         defaultsArePresent,
-      )
+      })
     }
   } else if (def.type === 'procedure' && def.input?.encoding) {
     //= export type InputSchema = string | Uint8Array | Blob
@@ -369,12 +469,12 @@ export function genXrpcOutput(
   if (schema) {
     if (schema.type === 'ref' || schema.type === 'union') {
       //= export type OutputSchema = ...
-      const refs = schema.type === 'union' ? schema.refs : [schema.ref]
-      const types = refs.map((ref) =>
-        refToType(ref, stripScheme(stripHash(lexUri)), imports),
-      )
+      const types =
+        schema.type === 'union'
+          ? schema.refs.map((ref) => refToUnionType(ref, lexUri, imports))
+          : [refToType(schema.ref, stripScheme(stripHash(lexUri)), imports)]
       if (schema.type === 'union' && !schema.closed) {
-        types.push('{$type: string; [k: string]: unknown}')
+        types.push('{ $type: string }')
       }
       file.addTypeAlias({
         name: 'OutputSchema',
@@ -383,50 +483,79 @@ export function genXrpcOutput(
       })
     } else {
       //= export interface OutputSchema {...}
-      genObject(
-        file,
-        imports,
-        lexUri,
-        schema,
-        `OutputSchema`,
+      genObject(file, imports, lexUri, schema, `OutputSchema`, {
         defaultsArePresent,
-      )
+      })
     }
   }
 }
 
-export function genObjHelpers(
+export function genRecord(
+  file: SourceFile,
+  imports: Set<string>,
+  lexicons: Lexicons,
+  lexUri: string,
+) {
+  const def = lexicons.getDefOrThrow(lexUri, ['record'])
+
+  //= export interface Record {...}
+  genObject(file, imports, lexUri, def.record, 'Record', {
+    defaultsArePresent: true,
+    allowUnknownProperties: true,
+    typeProperty: 'required',
+  })
+
+  //= export function isRecord(v: unknown): v is Record {...}
+  genObjHelpers(file, lexUri, 'Record', {
+    requireTypeProperty: true,
+  })
+}
+
+function genObjHelpers(
   file: SourceFile,
   lexUri: string,
-  ifaceName?: string,
+  ifaceName: string,
+  {
+    requireTypeProperty,
+  }: {
+    requireTypeProperty: boolean
+  },
 ) {
   const hash = getHash(lexUri)
 
-  //= export function is{X}(v: unknown): v is X {...}
+  const hashVar = `hash${ifaceName}`
+
+  file.addVariableStatement({
+    isExported: false,
+    declarationKind: VariableDeclarationKind.Const,
+    declarations: [{ name: hashVar, initializer: JSON.stringify(hash) }],
+  })
+
+  const isX = toCamelCase(`is-${ifaceName}`)
+
+  //= export function is{X}<V>(v: V) {...}
   file
     .addFunction({
-      name: toCamelCase(`is-${ifaceName || hash}`),
-      parameters: [{ name: `v`, type: `unknown` }],
-      returnType: `v is ${ifaceName || toTitleCase(hash)}`,
+      name: isX,
+      typeParameters: [{ name: `V` }],
+      parameters: [{ name: `v`, type: `V` }],
       isExported: true,
     })
-    .setBodyText(
-      hash === 'main'
-        ? `return isObj(v) && hasProp(v, '$type') && (v.$type === "${lexUri}" || v.$type === "${stripHash(
-            lexUri,
-          )}")`
-        : `return isObj(v) && hasProp(v, '$type') && v.$type === "${lexUri}"`,
-    )
+    .setBodyText(`return is$typed(v, id, ${hashVar})`)
+
+  const validateX = toCamelCase(`validate-${ifaceName}`)
 
-  //= export function validate{X}(v: unknown): ValidationResult {...}
+  //= export function validate{X}(v: unknown) {...}
   file
     .addFunction({
-      name: toCamelCase(`validate-${ifaceName || hash}`),
-      parameters: [{ name: `v`, type: `unknown` }],
-      returnType: `ValidationResult`,
+      name: validateX,
+      typeParameters: [{ name: `V` }],
+      parameters: [{ name: `v`, type: `V` }],
       isExported: true,
     })
-    .setBodyText(`return lexicons.validate("${lexUri}", v)`)
+    .setBodyText(
+      `return validate<${ifaceName} & V>(v, id, ${hashVar}${requireTypeProperty ? ', true' : ''})`,
+    )
 }
 
 export function stripScheme(uri: string): string {
@@ -449,7 +578,16 @@ export function ipldToType(def: LexCidLink | LexBytes) {
   return 'CID'
 }
 
-export function refToType(
+function refToUnionType(
+  ref: string,
+  lexUri: string,
+  imports: Set<string>,
+): string {
+  const baseNsid = stripScheme(stripHash(lexUri))
+  return `$Typed<${refToType(ref, baseNsid, imports)}>`
+}
+
+function refToType(
   ref: string,
   baseNsid: string,
   imports: Set<string>,
@@ -510,7 +648,10 @@ export function primitiveToType(def: LexPrimitive): string {
       }
       return 'boolean'
     case 'unknown':
-      return '{}'
+      // @TODO Should we use "object" here ?
+      // the "Record" identifier from typescript get overwritten by the Record
+      // interface created by lex-cli.
+      return '{ [_ in string]: unknown }' // Record<string, unknown>
     default:
       throw new Error(`Unexpected primitive type: ${JSON.stringify(def)}`)
   }
diff --git a/packages/lex-cli/src/codegen/server.ts b/packages/lex-cli/src/codegen/server.ts
index 110e8a0b13e..91fa1a6c906 100644
--- a/packages/lex-cli/src/codegen/server.ts
+++ b/packages/lex-cli/src/codegen/server.ts
@@ -9,9 +9,9 @@ import { NSID } from '@atproto/syntax'
 import { GeneratedAPI } from '../types'
 import { gen, lexiconsTs, utilTs } from './common'
 import {
+  genCommonImports,
   genImports,
-  genObjHelpers,
-  genObject,
+  genRecord,
   genUserType,
   genXrpcInput,
   genXrpcOutput,
@@ -73,10 +73,10 @@ const indexTs = (
         { name: 'StreamAuthVerifier' },
       ],
     })
-    //= import {schemas} from './lexicons'
+    //= import {schemas} from './lexicons.js'
     file
       .addImportDeclaration({
-        moduleSpecifier: './lexicons',
+        moduleSpecifier: './lexicons.js',
       })
       .addNamedImport({
         name: 'schemas',
@@ -93,7 +93,7 @@ const indexTs = (
       }
       file
         .addImportDeclaration({
-          moduleSpecifier: `./types/${lexiconDoc.id.split('.').join('/')}`,
+          moduleSpecifier: `./types/${lexiconDoc.id.split('.').join('/')}.js`,
         })
         .setNamespaceImport(toTitleCase(lexiconDoc.id))
     }
@@ -319,8 +319,6 @@ const lexiconTs = (project, lexicons: Lexicons, lexiconDoc: LexiconDoc) =>
     project,
     `/types/${lexiconDoc.id.split('.').join('/')}.ts`,
     async (file) => {
-      const imports: Set<string> = new Set()
-
       const main = lexiconDoc.defs.main
       if (main?.type === 'query' || main?.type === 'procedure') {
         //= import express from 'express'
@@ -335,44 +333,17 @@ const lexiconTs = (project, lexicons: Lexicons, lexiconDoc: LexiconDoc) =>
           !main.input.schema
         const streamingOutput = main.output?.encoding && !main.output.schema
         if (streamingInput || streamingOutput) {
-          //= import stream from 'stream'
+          //= import stream from 'node:stream'
           file.addImportDeclaration({
-            moduleSpecifier: 'stream',
+            moduleSpecifier: 'node:stream',
             defaultImport: 'stream',
           })
         }
       }
-      //= import {ValidationResult, BlobRef} from '@atproto/lexicon'
-      file
-        .addImportDeclaration({
-          moduleSpecifier: '@atproto/lexicon',
-        })
-        .addNamedImports([{ name: 'ValidationResult' }, { name: 'BlobRef' }])
-      //= import {lexicons} from '../../lexicons.ts'
-      file
-        .addImportDeclaration({
-          moduleSpecifier: `${lexiconDoc.id
-            .split('.')
-            .map((_str) => '..')
-            .join('/')}/lexicons`,
-        })
-        .addNamedImports([{ name: 'lexicons' }])
-      //= import {isObj, hasProp} from '../../util.ts'
-      file
-        .addImportDeclaration({
-          moduleSpecifier: `${lexiconDoc.id
-            .split('.')
-            .map((_str) => '..')
-            .join('/')}/util`,
-        })
-        .addNamedImports([{ name: 'isObj' }, { name: 'hasProp' }])
-      //= import {CID} from 'multiformats/cid'
-      file
-        .addImportDeclaration({
-          moduleSpecifier: 'multiformats/cid',
-        })
-        .addNamedImports([{ name: 'CID' }])
 
+      genCommonImports(file, lexiconDoc.id)
+
+      const imports: Set<string> = new Set()
       for (const defId in lexiconDoc.defs) {
         const def = lexiconDoc.defs[defId]
         const lexUri = `${lexiconDoc.id}#${defId}`
@@ -387,7 +358,7 @@ const lexiconTs = (project, lexicons: Lexicons, lexiconDoc: LexiconDoc) =>
             genXrpcOutput(file, imports, lexicons, lexUri, false)
             genServerXrpcStreaming(file, lexicons, lexUri)
           } else if (def.type === 'record') {
-            genServerRecord(file, imports, lexicons, lexUri)
+            genRecord(file, imports, lexicons, lexUri)
           } else {
             genUserType(file, imports, lexicons, lexUri)
           }
@@ -547,7 +518,7 @@ function genServerXrpcStreaming(
   })
 
   file.addImportDeclaration({
-    moduleSpecifier: 'http',
+    moduleSpecifier: 'node:http',
     namedImports: [{ name: 'IncomingMessage' }],
   })
 
@@ -589,20 +560,6 @@ function genServerXrpcStreaming(
   })
 }
 
-function genServerRecord(
-  file: SourceFile,
-  imports: Set<string>,
-  lexicons: Lexicons,
-  lexUri: string,
-) {
-  const def = lexicons.getDefOrThrow(lexUri, ['record'])
-
-  //= export interface Record {...}
-  genObject(file, imports, lexUri, def.record, 'Record')
-  //= export function isRecord(v: unknown): v is Record {...}
-  genObjHelpers(file, lexUri, 'Record')
-}
-
 function arrayToUnion(arr?: string[]) {
   if (!arr?.length) {
     return 'never'
diff --git a/packages/lexicon/jest.config.js b/packages/lexicon/jest.config.js
index 2aa5609eff2..93d0498b10c 100644
--- a/packages/lexicon/jest.config.js
+++ b/packages/lexicon/jest.config.js
@@ -3,4 +3,5 @@ module.exports = {
   displayName: 'Lexicon',
   transform: { '^.+\\.ts$': '@swc/jest' },
   setupFiles: ['<rootDir>/../../jest.setup.ts'],
+  moduleNameMapper: { '^(\\.\\.?\\/.+)\\.js$': ['$1.ts', '$1.js'] },
 }
diff --git a/packages/lexicon/src/lexicons.ts b/packages/lexicon/src/lexicons.ts
index cdd12b88fcd..37f9c42488c 100644
--- a/packages/lexicon/src/lexicons.ts
+++ b/packages/lexicon/src/lexicons.ts
@@ -6,7 +6,6 @@ import {
   LexiconDoc,
   ValidationError,
   ValidationResult,
-  hasProp,
   isObj,
 } from './types'
 import { toLexUri } from './util'
@@ -17,7 +16,7 @@ import {
   assertValidXrpcOutput,
   assertValidXrpcParams,
 } from './validation'
-import * as ComplexValidators from './validators/complex'
+import { object as validateObject } from './validators/complex'
 
 /**
  * A collection of compiled lexicons.
@@ -127,15 +126,17 @@ export class Lexicons implements Iterable<LexiconDoc> {
    * Validate a record or object.
    */
   validate(lexUri: string, value: unknown): ValidationResult {
-    lexUri = toLexUri(lexUri)
-    const def = this.getDefOrThrow(lexUri, ['record', 'object'])
     if (!isObj(value)) {
       throw new ValidationError(`Value must be an object`)
     }
+
+    const lexUriNormalized = toLexUri(lexUri)
+    const def = this.getDefOrThrow(lexUriNormalized, ['record', 'object'])
+
     if (def.type === 'record') {
-      return ComplexValidators.object(this, 'Record', def.record, value)
+      return validateObject(this, 'Record', def.record, value)
     } else if (def.type === 'object') {
-      return ComplexValidators.object(this, 'Object', def, value)
+      return validateObject(this, 'Object', def, value)
     } else {
       // shouldn't happen
       throw new InvalidLexiconError('Definition must be a record or object')
@@ -146,20 +147,25 @@ export class Lexicons implements Iterable<LexiconDoc> {
    * Validate a record and throw on any error.
    */
   assertValidRecord(lexUri: string, value: unknown) {
-    lexUri = toLexUri(lexUri)
-    const def = this.getDefOrThrow(lexUri, ['record'])
     if (!isObj(value)) {
       throw new ValidationError(`Record must be an object`)
     }
-    if (!hasProp(value, '$type') || typeof value.$type !== 'string') {
+    if (!('$type' in value)) {
       throw new ValidationError(`Record/$type must be a string`)
     }
-    const $type = (value as Record<string, string>).$type || ''
-    if (toLexUri($type) !== lexUri) {
+    const { $type } = value
+    if (typeof $type !== 'string') {
+      throw new ValidationError(`Record/$type must be a string`)
+    }
+
+    const lexUriNormalized = toLexUri(lexUri)
+    if (toLexUri($type) !== lexUriNormalized) {
       throw new ValidationError(
-        `Invalid $type: must be ${lexUri}, got ${$type}`,
+        `Invalid $type: must be ${lexUriNormalized}, got ${$type}`,
       )
     }
+
+    const def = this.getDefOrThrow(lexUriNormalized, ['record'])
     return assertValidRecord(this, def as LexRecord, value)
   }
 
diff --git a/packages/lexicon/src/types.ts b/packages/lexicon/src/types.ts
index 6b9b5f9e5c8..a686826a9ac 100644
--- a/packages/lexicon/src/types.ts
+++ b/packages/lexicon/src/types.ts
@@ -447,23 +447,13 @@ export function isValidLexiconDoc(v: unknown): v is LexiconDoc {
   return lexiconDoc.safeParse(v).success
 }
 
-export function isObj(obj: unknown): obj is Record<string, unknown> {
-  return obj !== null && typeof obj === 'object'
+export function isObj<V>(v: V): v is V & object {
+  return v != null && typeof v === 'object'
 }
 
-export function hasProp<K extends PropertyKey>(
-  data: object,
-  prop: K,
-): data is Record<K, unknown> {
-  return prop in data
-}
-
-export const discriminatedObject = z.object({ $type: z.string() })
-export type DiscriminatedObject = z.infer<typeof discriminatedObject>
-export function isDiscriminatedObject(
-  value: unknown,
-): value is DiscriminatedObject {
-  return discriminatedObject.safeParse(value).success
+export type DiscriminatedObject = { $type: string }
+export function isDiscriminatedObject(v: unknown): v is DiscriminatedObject {
+  return isObj(v) && '$type' in v && typeof v.$type === 'string'
 }
 
 export function parseLexiconDoc(v: unknown): LexiconDoc {
@@ -471,10 +461,10 @@ export function parseLexiconDoc(v: unknown): LexiconDoc {
   return v as LexiconDoc
 }
 
-export type ValidationResult =
+export type ValidationResult<V = unknown> =
   | {
       success: true
-      value: unknown
+      value: V
     }
   | {
       success: false
diff --git a/packages/lexicon/src/util.ts b/packages/lexicon/src/util.ts
index beae2922d59..5a1c4d49c4b 100644
--- a/packages/lexicon/src/util.ts
+++ b/packages/lexicon/src/util.ts
@@ -1,6 +1,4 @@
 import { z } from 'zod'
-import { Lexicons } from './lexicons'
-import { LexRefVariant, LexUserType } from './types'
 
 export function toLexUri(str: string, baseUri?: string): string {
   if (str.split('#').length > 2) {
@@ -19,19 +17,6 @@ export function toLexUri(str: string, baseUri?: string): string {
   return `lex:${str}`
 }
 
-export function toConcreteTypes(
-  lexicons: Lexicons,
-  def: LexRefVariant | LexUserType,
-): LexUserType[] {
-  if (def.type === 'ref') {
-    return [lexicons.getDefOrThrow(def.ref)]
-  } else if (def.type === 'union') {
-    return def.refs.map((ref) => lexicons.getDefOrThrow(ref)).flat()
-  } else {
-    return [def]
-  }
-}
-
 export function requiredPropertiesRefinement<
   ObjectType extends {
     required?: string[]
diff --git a/packages/lexicon/src/validators/complex.ts b/packages/lexicon/src/validators/complex.ts
index 6f066071883..c7358692b2d 100644
--- a/packages/lexicon/src/validators/complex.ts
+++ b/packages/lexicon/src/validators/complex.ts
@@ -1,16 +1,16 @@
 import { Lexicons } from '../lexicons'
 import {
   LexArray,
-  LexObject,
   LexRefVariant,
   LexUserType,
   ValidationError,
   ValidationResult,
   isDiscriminatedObject,
+  isObj,
 } from '../types'
-import { toConcreteTypes, toLexUri } from '../util'
+import { toLexUri } from '../util'
 import { blob } from './blob'
-import { boolean, bytes, cidLink, integer, string, unknown } from './primitives'
+import { validate as validatePrimitive } from './primitives'
 
 export function validate(
   lexicons: Lexicons,
@@ -19,18 +19,6 @@ export function validate(
   value: unknown,
 ): ValidationResult {
   switch (def.type) {
-    case 'boolean':
-      return boolean(lexicons, path, def, value)
-    case 'integer':
-      return integer(lexicons, path, def, value)
-    case 'string':
-      return string(lexicons, path, def, value)
-    case 'bytes':
-      return bytes(lexicons, path, def, value)
-    case 'cid-link':
-      return cidLink(lexicons, path, def, value)
-    case 'unknown':
-      return unknown(lexicons, path, def, value)
     case 'object':
       return object(lexicons, path, def, value)
     case 'array':
@@ -38,10 +26,7 @@ export function validate(
     case 'blob':
       return blob(lexicons, path, def, value)
     default:
-      return {
-        success: false,
-        error: new ValidationError(`Unexpected lexicon type: ${def.type}`),
-      }
+      return validatePrimitive(lexicons, path, def, value)
   }
 }
 
@@ -103,35 +88,31 @@ export function object(
   def: LexUserType,
   value: unknown,
 ): ValidationResult {
-  def = def as LexObject
-
   // type
-  if (!value || typeof value !== 'object') {
+  if (!isObj(value)) {
     return {
       success: false,
       error: new ValidationError(`${path} must be an object`),
     }
   }
 
-  const requiredProps = new Set(def.required)
-  const nullableProps = new Set(def.nullable)
-
   // properties
   let resultValue = value
-  if (typeof def.properties === 'object') {
+  if ('properties' in def && def.properties != null) {
     for (const key in def.properties) {
-      if (value[key] === null && nullableProps.has(key)) {
+      const keyValue = value[key]
+      if (keyValue === null && def.nullable?.includes(key)) {
         continue
       }
       const propDef = def.properties[key]
-      if (typeof value[key] === 'undefined' && !requiredProps.has(key)) {
+      if (keyValue === undefined && !def.required?.includes(key)) {
         // Fast path for non-required undefined props.
         if (
           propDef.type === 'integer' ||
           propDef.type === 'boolean' ||
           propDef.type === 'string'
         ) {
-          if (typeof propDef.default === 'undefined') {
+          if (propDef.default === undefined) {
             continue
           }
         } else {
@@ -140,20 +121,27 @@ export function object(
         }
       }
       const propPath = `${path}/${key}`
-      const validated = validateOneOf(lexicons, propPath, propDef, value[key])
-      const propValue = validated.success ? validated.value : value[key]
-      const propIsUndefined = typeof propValue === 'undefined'
+      const validated = validateOneOf(lexicons, propPath, propDef, keyValue)
+      const propValue = validated.success ? validated.value : keyValue
+
       // Return error for bad validation, giving required rule precedence
-      if (propIsUndefined && requiredProps.has(key)) {
-        return {
-          success: false,
-          error: new ValidationError(`${path} must have the property "${key}"`),
+      if (propValue === undefined) {
+        if (def.required?.includes(key)) {
+          return {
+            success: false,
+            error: new ValidationError(
+              `${path} must have the property "${key}"`,
+            ),
+          }
+        }
+      } else {
+        if (!validated.success) {
+          return validated
         }
-      } else if (!propIsUndefined && !validated.success) {
-        return validated
       }
+
       // Adjust value based on e.g. applied defaults, cloning shallowly if there was a changed value
-      if (propValue !== value[key]) {
+      if (propValue !== keyValue) {
         if (resultValue === value) {
           // Lazy shallow clone
           resultValue = { ...value }
@@ -173,9 +161,8 @@ export function validateOneOf(
   value: unknown,
   mustBeObj = false, // this is the only type constraint we need currently (used by xrpc body schema validators)
 ): ValidationResult {
-  let error
+  let concreteDef: LexUserType
 
-  let concreteDefs
   if (def.type === 'union') {
     if (!isDiscriminatedObject(value)) {
       return {
@@ -196,33 +183,17 @@ export function validateOneOf(
       }
       return { success: true, value }
     } else {
-      concreteDefs = toConcreteTypes(lexicons, {
-        type: 'ref',
-        ref: value.$type,
-      })
+      concreteDef = lexicons.getDefOrThrow(value.$type)
     }
+  } else if (def.type === 'ref') {
+    concreteDef = lexicons.getDefOrThrow(def.ref)
   } else {
-    concreteDefs = toConcreteTypes(lexicons, def)
+    concreteDef = def
   }
 
-  for (const concreteDef of concreteDefs) {
-    const result = mustBeObj
-      ? object(lexicons, path, concreteDef, value)
-      : validate(lexicons, path, concreteDef, value)
-    if (result.success) {
-      return result
-    }
-    error ??= result.error
-  }
-  if (concreteDefs.length > 1) {
-    return {
-      success: false,
-      error: new ValidationError(
-        `${path} did not match any of the expected definitions`,
-      ),
-    }
-  }
-  return { success: false, error }
+  return mustBeObj
+    ? object(lexicons, path, concreteDef, value)
+    : validate(lexicons, path, concreteDef, value)
 }
 
 // to avoid bugs like #0189 this needs to handle both
@@ -234,8 +205,8 @@ const refsContainType = (refs: string[], type: string) => {
   }
 
   if (lexUri.endsWith('#main')) {
-    return refs.includes(lexUri.replace('#main', ''))
+    return refs.includes(lexUri.slice(0, -5))
   } else {
-    return refs.includes(lexUri + '#main')
+    return !lexUri.includes('#') && refs.includes(`${lexUri}#main`)
   }
 }
diff --git a/packages/lexicon/src/validators/formats.ts b/packages/lexicon/src/validators/formats.ts
index 36a037ebfff..e9700f14265 100644
--- a/packages/lexicon/src/validators/formats.ts
+++ b/packages/lexicon/src/validators/formats.ts
@@ -7,7 +7,7 @@ import {
   ensureValidHandle,
   ensureValidNsid,
   ensureValidRecordKey,
-  ensureValidTid,
+  isValidTid,
 } from '@atproto/syntax'
 import { ValidationError, ValidationResult } from '../types'
 
@@ -131,17 +131,14 @@ export function language(path: string, value: string): ValidationResult {
 }
 
 export function tid(path: string, value: string): ValidationResult {
-  try {
-    ensureValidTid(value)
-  } catch {
-    return {
-      success: false,
-      error: new ValidationError(
-        `${path} must be a valid TID (timestamp identifier)`,
-      ),
-    }
+  if (isValidTid(value)) {
+    return { success: true, value }
+  }
+
+  return {
+    success: false,
+    error: new ValidationError(`${path} must be a valid TID`),
   }
-  return { success: true, value }
 }
 
 export function recordKey(path: string, value: string): ValidationResult {
diff --git a/packages/lexicon/src/validators/primitives.ts b/packages/lexicon/src/validators/primitives.ts
index 919173fe697..7837cb0246d 100644
--- a/packages/lexicon/src/validators/primitives.ts
+++ b/packages/lexicon/src/validators/primitives.ts
@@ -39,7 +39,7 @@ export function validate(
   }
 }
 
-export function boolean(
+function boolean(
   lexicons: Lexicons,
   path: string,
   def: LexUserType,
@@ -77,7 +77,7 @@ export function boolean(
   return { success: true, value }
 }
 
-export function integer(
+function integer(
   lexicons: Lexicons,
   path: string,
   def: LexUserType,
@@ -151,7 +151,7 @@ export function integer(
   return { success: true, value }
 }
 
-export function string(
+function string(
   lexicons: Lexicons,
   path: string,
   def: LexUserType,
@@ -340,7 +340,7 @@ export function string(
   return { success: true, value }
 }
 
-export function bytes(
+function bytes(
   lexicons: Lexicons,
   path: string,
   def: LexUserType,
@@ -382,7 +382,7 @@ export function bytes(
   return { success: true, value }
 }
 
-export function cidLink(
+function cidLink(
   lexicons: Lexicons,
   path: string,
   def: LexUserType,
@@ -398,7 +398,7 @@ export function cidLink(
   return { success: true, value }
 }
 
-export function unknown(
+function unknown(
   lexicons: Lexicons,
   path: string,
   def: LexUserType,
diff --git a/packages/ozone/jest.config.js b/packages/ozone/jest.config.js
index 8ee383876a5..760cfb77297 100644
--- a/packages/ozone/jest.config.js
+++ b/packages/ozone/jest.config.js
@@ -7,4 +7,5 @@ module.exports = {
   ],
   testTimeout: 60000,
   setupFiles: ['<rootDir>/../../jest.setup.ts'],
+  moduleNameMapper: { '^(\\.\\.?\\/.+)\\.js$': ['$1.ts', '$1.js'] },
 }
diff --git a/packages/ozone/src/api/moderation/emitEvent.ts b/packages/ozone/src/api/moderation/emitEvent.ts
index 85a5fe3d3e1..d978cde3ac1 100644
--- a/packages/ozone/src/api/moderation/emitEvent.ts
+++ b/packages/ozone/src/api/moderation/emitEvent.ts
@@ -5,7 +5,6 @@ import { Server } from '../../lexicon'
 import {
   ModEventTag,
   isModEventAcknowledge,
-  isModEventDivert,
   isModEventEmail,
   isModEventLabel,
   isModEventMuteReporter,
@@ -14,8 +13,10 @@ import {
   isModEventTag,
   isModEventTakedown,
   isModEventUnmuteReporter,
+  validateModEventDivert,
 } from '../../lexicon/types/tools/ozone/moderation/defs'
 import { HandlerInput } from '../../lexicon/types/tools/ozone/moderation/emitEvent'
+import { asPredicate } from '../../lexicon/util'
 import { subjectFromInput } from '../../mod-service/subject'
 import { ProtectedTagSettingKey } from '../../setting/constants'
 import { SettingService } from '../../setting/service'
@@ -24,6 +25,8 @@ import { TagService } from '../../tag-service'
 import { getTagForReport } from '../../tag-service/util'
 import { retryHttp } from '../../util'
 
+const isValidModEventDivert = asPredicate(validateModEventDivert)
+
 const handleModerationEvent = async ({
   ctx,
   input,
@@ -127,7 +130,7 @@ const handleModerationEvent = async ({
     )
   }
 
-  if (isModEventDivert(event) && subject.isRecord()) {
+  if (isValidModEventDivert(event) && subject.isRecord()) {
     if (!ctx.blobDiverter) {
       throw new InvalidRequestError(
         'BlobDiverter not configured for this service',
@@ -228,7 +231,7 @@ export default function (server: Server, ctx: AppContext) {
       })
 
       // On divert events, we need to automatically take down the blobs
-      if (isModEventDivert(input.body.event)) {
+      if (isValidModEventDivert(input.body.event)) {
         await handleModerationEvent({
           auth,
           ctx,
diff --git a/packages/ozone/src/api/moderation/getRepos.ts b/packages/ozone/src/api/moderation/getRepos.ts
index eb1fe9487ec..affe89291b3 100644
--- a/packages/ozone/src/api/moderation/getRepos.ts
+++ b/packages/ozone/src/api/moderation/getRepos.ts
@@ -23,12 +23,12 @@ export default function (server: Server, ctx: AppContext) {
           }
         }
         return {
-          $type: 'tools.ozone.moderation.defs#repoViewDetail',
           ...addAccountInfoToRepoViewDetail(
             partialRepo,
             accountInfo.get(did) || null,
             auth.credentials.isModerator,
           ),
+          $type: 'tools.ozone.moderation.defs#repoViewDetail',
         }
       })
 
diff --git a/packages/ozone/src/api/util.ts b/packages/ozone/src/api/util.ts
index 089ed3838eb..c9cd5a4a96b 100644
--- a/packages/ozone/src/api/util.ts
+++ b/packages/ozone/src/api/util.ts
@@ -13,6 +13,7 @@ import {
   REASONSEXUAL,
   REASONSPAM,
   REASONVIOLATION,
+  ReasonType,
 } from '../lexicon/types/com/atproto/moderation/defs'
 import {
   REVIEWCLOSED,
@@ -51,12 +52,26 @@ export const getPdsAccountInfos = async (
   }
 }
 
+function un$type<T extends object>(obj: T): Omit<T, '$type'> {
+  if ('$type' in obj) {
+    const { $type: _, ...rest } = obj
+    return rest
+  }
+  return obj
+}
+
 export const addAccountInfoToRepoViewDetail = (
-  repoView: RepoViewDetail,
+  repoView: RepoView | RepoViewDetail,
   accountInfo: AccountView | null,
   includeEmail = false,
 ): RepoViewDetail => {
-  if (!accountInfo) return repoView
+  if (!accountInfo) {
+    return un$type({
+      ...repoView,
+      moderation: un$type(repoView.moderation),
+    })
+  }
+
   const {
     email,
     deactivatedAt,
@@ -67,6 +82,7 @@ export const addAccountInfoToRepoViewDetail = (
     invitesDisabled,
     threatSignatures,
     // pick some duplicate/unwanted details out
+    $type: _accountType,
     did: _did,
     handle: _handle,
     indexedAt: _indexedAt,
@@ -75,7 +91,8 @@ export const addAccountInfoToRepoViewDetail = (
   } = accountInfo
   return {
     ...otherAccountInfo,
-    ...repoView,
+    ...un$type(repoView),
+    moderation: un$type(repoView.moderation),
     email: includeEmail ? email : undefined,
     invitedBy,
     invitesDisabled,
@@ -106,7 +123,7 @@ export const addAccountInfoToRepoView = (
 
 export const getReasonType = (reasonType: ReportInput['reasonType']) => {
   if (reasonTypes.has(reasonType)) {
-    return reasonType as NonNullable<ModerationEvent['meta']>['reportType']
+    return reasonType
   }
   throw new InvalidRequestError('Invalid reason type')
 }
@@ -128,7 +145,7 @@ export const getReviewState = (reviewState?: string) => {
 
 const reviewStates = new Set([REVIEWCLOSED, REVIEWESCALATED, REVIEWOPEN])
 
-const reasonTypes = new Set([
+const reasonTypes = new Set<ReasonType>([
   REASONOTHER,
   REASONSPAM,
   REASONMISLEADING,
diff --git a/packages/ozone/src/lexicon/index.ts b/packages/ozone/src/lexicon/index.ts
index dc68082677f..972f1a14a3f 100644
--- a/packages/ozone/src/lexicon/index.ts
+++ b/packages/ozone/src/lexicon/index.ts
@@ -8,192 +8,192 @@ import {
   AuthVerifier,
   StreamAuthVerifier,
 } from '@atproto/xrpc-server'
-import { schemas } from './lexicons'
-import * as ComAtprotoAdminDeleteAccount from './types/com/atproto/admin/deleteAccount'
-import * as ComAtprotoAdminDisableAccountInvites from './types/com/atproto/admin/disableAccountInvites'
-import * as ComAtprotoAdminDisableInviteCodes from './types/com/atproto/admin/disableInviteCodes'
-import * as ComAtprotoAdminEnableAccountInvites from './types/com/atproto/admin/enableAccountInvites'
-import * as ComAtprotoAdminGetAccountInfo from './types/com/atproto/admin/getAccountInfo'
-import * as ComAtprotoAdminGetAccountInfos from './types/com/atproto/admin/getAccountInfos'
-import * as ComAtprotoAdminGetInviteCodes from './types/com/atproto/admin/getInviteCodes'
-import * as ComAtprotoAdminGetSubjectStatus from './types/com/atproto/admin/getSubjectStatus'
-import * as ComAtprotoAdminSearchAccounts from './types/com/atproto/admin/searchAccounts'
-import * as ComAtprotoAdminSendEmail from './types/com/atproto/admin/sendEmail'
-import * as ComAtprotoAdminUpdateAccountEmail from './types/com/atproto/admin/updateAccountEmail'
-import * as ComAtprotoAdminUpdateAccountHandle from './types/com/atproto/admin/updateAccountHandle'
-import * as ComAtprotoAdminUpdateAccountPassword from './types/com/atproto/admin/updateAccountPassword'
-import * as ComAtprotoAdminUpdateSubjectStatus from './types/com/atproto/admin/updateSubjectStatus'
-import * as ComAtprotoIdentityGetRecommendedDidCredentials from './types/com/atproto/identity/getRecommendedDidCredentials'
-import * as ComAtprotoIdentityRequestPlcOperationSignature from './types/com/atproto/identity/requestPlcOperationSignature'
-import * as ComAtprotoIdentityResolveHandle from './types/com/atproto/identity/resolveHandle'
-import * as ComAtprotoIdentitySignPlcOperation from './types/com/atproto/identity/signPlcOperation'
-import * as ComAtprotoIdentitySubmitPlcOperation from './types/com/atproto/identity/submitPlcOperation'
-import * as ComAtprotoIdentityUpdateHandle from './types/com/atproto/identity/updateHandle'
-import * as ComAtprotoLabelQueryLabels from './types/com/atproto/label/queryLabels'
-import * as ComAtprotoLabelSubscribeLabels from './types/com/atproto/label/subscribeLabels'
-import * as ComAtprotoModerationCreateReport from './types/com/atproto/moderation/createReport'
-import * as ComAtprotoRepoApplyWrites from './types/com/atproto/repo/applyWrites'
-import * as ComAtprotoRepoCreateRecord from './types/com/atproto/repo/createRecord'
-import * as ComAtprotoRepoDeleteRecord from './types/com/atproto/repo/deleteRecord'
-import * as ComAtprotoRepoDescribeRepo from './types/com/atproto/repo/describeRepo'
-import * as ComAtprotoRepoGetRecord from './types/com/atproto/repo/getRecord'
-import * as ComAtprotoRepoImportRepo from './types/com/atproto/repo/importRepo'
-import * as ComAtprotoRepoListMissingBlobs from './types/com/atproto/repo/listMissingBlobs'
-import * as ComAtprotoRepoListRecords from './types/com/atproto/repo/listRecords'
-import * as ComAtprotoRepoPutRecord from './types/com/atproto/repo/putRecord'
-import * as ComAtprotoRepoUploadBlob from './types/com/atproto/repo/uploadBlob'
-import * as ComAtprotoServerActivateAccount from './types/com/atproto/server/activateAccount'
-import * as ComAtprotoServerCheckAccountStatus from './types/com/atproto/server/checkAccountStatus'
-import * as ComAtprotoServerConfirmEmail from './types/com/atproto/server/confirmEmail'
-import * as ComAtprotoServerCreateAccount from './types/com/atproto/server/createAccount'
-import * as ComAtprotoServerCreateAppPassword from './types/com/atproto/server/createAppPassword'
-import * as ComAtprotoServerCreateInviteCode from './types/com/atproto/server/createInviteCode'
-import * as ComAtprotoServerCreateInviteCodes from './types/com/atproto/server/createInviteCodes'
-import * as ComAtprotoServerCreateSession from './types/com/atproto/server/createSession'
-import * as ComAtprotoServerDeactivateAccount from './types/com/atproto/server/deactivateAccount'
-import * as ComAtprotoServerDeleteAccount from './types/com/atproto/server/deleteAccount'
-import * as ComAtprotoServerDeleteSession from './types/com/atproto/server/deleteSession'
-import * as ComAtprotoServerDescribeServer from './types/com/atproto/server/describeServer'
-import * as ComAtprotoServerGetAccountInviteCodes from './types/com/atproto/server/getAccountInviteCodes'
-import * as ComAtprotoServerGetServiceAuth from './types/com/atproto/server/getServiceAuth'
-import * as ComAtprotoServerGetSession from './types/com/atproto/server/getSession'
-import * as ComAtprotoServerListAppPasswords from './types/com/atproto/server/listAppPasswords'
-import * as ComAtprotoServerRefreshSession from './types/com/atproto/server/refreshSession'
-import * as ComAtprotoServerRequestAccountDelete from './types/com/atproto/server/requestAccountDelete'
-import * as ComAtprotoServerRequestEmailConfirmation from './types/com/atproto/server/requestEmailConfirmation'
-import * as ComAtprotoServerRequestEmailUpdate from './types/com/atproto/server/requestEmailUpdate'
-import * as ComAtprotoServerRequestPasswordReset from './types/com/atproto/server/requestPasswordReset'
-import * as ComAtprotoServerReserveSigningKey from './types/com/atproto/server/reserveSigningKey'
-import * as ComAtprotoServerResetPassword from './types/com/atproto/server/resetPassword'
-import * as ComAtprotoServerRevokeAppPassword from './types/com/atproto/server/revokeAppPassword'
-import * as ComAtprotoServerUpdateEmail from './types/com/atproto/server/updateEmail'
-import * as ComAtprotoSyncGetBlob from './types/com/atproto/sync/getBlob'
-import * as ComAtprotoSyncGetBlocks from './types/com/atproto/sync/getBlocks'
-import * as ComAtprotoSyncGetCheckout from './types/com/atproto/sync/getCheckout'
-import * as ComAtprotoSyncGetHead from './types/com/atproto/sync/getHead'
-import * as ComAtprotoSyncGetLatestCommit from './types/com/atproto/sync/getLatestCommit'
-import * as ComAtprotoSyncGetRecord from './types/com/atproto/sync/getRecord'
-import * as ComAtprotoSyncGetRepo from './types/com/atproto/sync/getRepo'
-import * as ComAtprotoSyncGetRepoStatus from './types/com/atproto/sync/getRepoStatus'
-import * as ComAtprotoSyncListBlobs from './types/com/atproto/sync/listBlobs'
-import * as ComAtprotoSyncListRepos from './types/com/atproto/sync/listRepos'
-import * as ComAtprotoSyncNotifyOfUpdate from './types/com/atproto/sync/notifyOfUpdate'
-import * as ComAtprotoSyncRequestCrawl from './types/com/atproto/sync/requestCrawl'
-import * as ComAtprotoSyncSubscribeRepos from './types/com/atproto/sync/subscribeRepos'
-import * as ComAtprotoTempAddReservedHandle from './types/com/atproto/temp/addReservedHandle'
-import * as ComAtprotoTempCheckSignupQueue from './types/com/atproto/temp/checkSignupQueue'
-import * as ComAtprotoTempFetchLabels from './types/com/atproto/temp/fetchLabels'
-import * as ComAtprotoTempRequestPhoneVerification from './types/com/atproto/temp/requestPhoneVerification'
-import * as AppBskyActorGetPreferences from './types/app/bsky/actor/getPreferences'
-import * as AppBskyActorGetProfile from './types/app/bsky/actor/getProfile'
-import * as AppBskyActorGetProfiles from './types/app/bsky/actor/getProfiles'
-import * as AppBskyActorGetSuggestions from './types/app/bsky/actor/getSuggestions'
-import * as AppBskyActorPutPreferences from './types/app/bsky/actor/putPreferences'
-import * as AppBskyActorSearchActors from './types/app/bsky/actor/searchActors'
-import * as AppBskyActorSearchActorsTypeahead from './types/app/bsky/actor/searchActorsTypeahead'
-import * as AppBskyFeedDescribeFeedGenerator from './types/app/bsky/feed/describeFeedGenerator'
-import * as AppBskyFeedGetActorFeeds from './types/app/bsky/feed/getActorFeeds'
-import * as AppBskyFeedGetActorLikes from './types/app/bsky/feed/getActorLikes'
-import * as AppBskyFeedGetAuthorFeed from './types/app/bsky/feed/getAuthorFeed'
-import * as AppBskyFeedGetFeed from './types/app/bsky/feed/getFeed'
-import * as AppBskyFeedGetFeedGenerator from './types/app/bsky/feed/getFeedGenerator'
-import * as AppBskyFeedGetFeedGenerators from './types/app/bsky/feed/getFeedGenerators'
-import * as AppBskyFeedGetFeedSkeleton from './types/app/bsky/feed/getFeedSkeleton'
-import * as AppBskyFeedGetLikes from './types/app/bsky/feed/getLikes'
-import * as AppBskyFeedGetListFeed from './types/app/bsky/feed/getListFeed'
-import * as AppBskyFeedGetPostThread from './types/app/bsky/feed/getPostThread'
-import * as AppBskyFeedGetPosts from './types/app/bsky/feed/getPosts'
-import * as AppBskyFeedGetQuotes from './types/app/bsky/feed/getQuotes'
-import * as AppBskyFeedGetRepostedBy from './types/app/bsky/feed/getRepostedBy'
-import * as AppBskyFeedGetSuggestedFeeds from './types/app/bsky/feed/getSuggestedFeeds'
-import * as AppBskyFeedGetTimeline from './types/app/bsky/feed/getTimeline'
-import * as AppBskyFeedSearchPosts from './types/app/bsky/feed/searchPosts'
-import * as AppBskyFeedSendInteractions from './types/app/bsky/feed/sendInteractions'
-import * as AppBskyGraphGetActorStarterPacks from './types/app/bsky/graph/getActorStarterPacks'
-import * as AppBskyGraphGetBlocks from './types/app/bsky/graph/getBlocks'
-import * as AppBskyGraphGetFollowers from './types/app/bsky/graph/getFollowers'
-import * as AppBskyGraphGetFollows from './types/app/bsky/graph/getFollows'
-import * as AppBskyGraphGetKnownFollowers from './types/app/bsky/graph/getKnownFollowers'
-import * as AppBskyGraphGetList from './types/app/bsky/graph/getList'
-import * as AppBskyGraphGetListBlocks from './types/app/bsky/graph/getListBlocks'
-import * as AppBskyGraphGetListMutes from './types/app/bsky/graph/getListMutes'
-import * as AppBskyGraphGetLists from './types/app/bsky/graph/getLists'
-import * as AppBskyGraphGetMutes from './types/app/bsky/graph/getMutes'
-import * as AppBskyGraphGetRelationships from './types/app/bsky/graph/getRelationships'
-import * as AppBskyGraphGetStarterPack from './types/app/bsky/graph/getStarterPack'
-import * as AppBskyGraphGetStarterPacks from './types/app/bsky/graph/getStarterPacks'
-import * as AppBskyGraphGetSuggestedFollowsByActor from './types/app/bsky/graph/getSuggestedFollowsByActor'
-import * as AppBskyGraphMuteActor from './types/app/bsky/graph/muteActor'
-import * as AppBskyGraphMuteActorList from './types/app/bsky/graph/muteActorList'
-import * as AppBskyGraphMuteThread from './types/app/bsky/graph/muteThread'
-import * as AppBskyGraphSearchStarterPacks from './types/app/bsky/graph/searchStarterPacks'
-import * as AppBskyGraphUnmuteActor from './types/app/bsky/graph/unmuteActor'
-import * as AppBskyGraphUnmuteActorList from './types/app/bsky/graph/unmuteActorList'
-import * as AppBskyGraphUnmuteThread from './types/app/bsky/graph/unmuteThread'
-import * as AppBskyLabelerGetServices from './types/app/bsky/labeler/getServices'
-import * as AppBskyNotificationGetUnreadCount from './types/app/bsky/notification/getUnreadCount'
-import * as AppBskyNotificationListNotifications from './types/app/bsky/notification/listNotifications'
-import * as AppBskyNotificationPutPreferences from './types/app/bsky/notification/putPreferences'
-import * as AppBskyNotificationRegisterPush from './types/app/bsky/notification/registerPush'
-import * as AppBskyNotificationUpdateSeen from './types/app/bsky/notification/updateSeen'
-import * as AppBskyUnspeccedGetConfig from './types/app/bsky/unspecced/getConfig'
-import * as AppBskyUnspeccedGetPopularFeedGenerators from './types/app/bsky/unspecced/getPopularFeedGenerators'
-import * as AppBskyUnspeccedGetSuggestionsSkeleton from './types/app/bsky/unspecced/getSuggestionsSkeleton'
-import * as AppBskyUnspeccedGetTaggedSuggestions from './types/app/bsky/unspecced/getTaggedSuggestions'
-import * as AppBskyUnspeccedGetTrendingTopics from './types/app/bsky/unspecced/getTrendingTopics'
-import * as AppBskyUnspeccedSearchActorsSkeleton from './types/app/bsky/unspecced/searchActorsSkeleton'
-import * as AppBskyUnspeccedSearchPostsSkeleton from './types/app/bsky/unspecced/searchPostsSkeleton'
-import * as AppBskyUnspeccedSearchStarterPacksSkeleton from './types/app/bsky/unspecced/searchStarterPacksSkeleton'
-import * as AppBskyVideoGetJobStatus from './types/app/bsky/video/getJobStatus'
-import * as AppBskyVideoGetUploadLimits from './types/app/bsky/video/getUploadLimits'
-import * as AppBskyVideoUploadVideo from './types/app/bsky/video/uploadVideo'
-import * as ChatBskyActorDeleteAccount from './types/chat/bsky/actor/deleteAccount'
-import * as ChatBskyActorExportAccountData from './types/chat/bsky/actor/exportAccountData'
-import * as ChatBskyConvoDeleteMessageForSelf from './types/chat/bsky/convo/deleteMessageForSelf'
-import * as ChatBskyConvoGetConvo from './types/chat/bsky/convo/getConvo'
-import * as ChatBskyConvoGetConvoForMembers from './types/chat/bsky/convo/getConvoForMembers'
-import * as ChatBskyConvoGetLog from './types/chat/bsky/convo/getLog'
-import * as ChatBskyConvoGetMessages from './types/chat/bsky/convo/getMessages'
-import * as ChatBskyConvoLeaveConvo from './types/chat/bsky/convo/leaveConvo'
-import * as ChatBskyConvoListConvos from './types/chat/bsky/convo/listConvos'
-import * as ChatBskyConvoMuteConvo from './types/chat/bsky/convo/muteConvo'
-import * as ChatBskyConvoSendMessage from './types/chat/bsky/convo/sendMessage'
-import * as ChatBskyConvoSendMessageBatch from './types/chat/bsky/convo/sendMessageBatch'
-import * as ChatBskyConvoUnmuteConvo from './types/chat/bsky/convo/unmuteConvo'
-import * as ChatBskyConvoUpdateRead from './types/chat/bsky/convo/updateRead'
-import * as ChatBskyModerationGetActorMetadata from './types/chat/bsky/moderation/getActorMetadata'
-import * as ChatBskyModerationGetMessageContext from './types/chat/bsky/moderation/getMessageContext'
-import * as ChatBskyModerationUpdateActorAccess from './types/chat/bsky/moderation/updateActorAccess'
-import * as ToolsOzoneCommunicationCreateTemplate from './types/tools/ozone/communication/createTemplate'
-import * as ToolsOzoneCommunicationDeleteTemplate from './types/tools/ozone/communication/deleteTemplate'
-import * as ToolsOzoneCommunicationListTemplates from './types/tools/ozone/communication/listTemplates'
-import * as ToolsOzoneCommunicationUpdateTemplate from './types/tools/ozone/communication/updateTemplate'
-import * as ToolsOzoneModerationEmitEvent from './types/tools/ozone/moderation/emitEvent'
-import * as ToolsOzoneModerationGetEvent from './types/tools/ozone/moderation/getEvent'
-import * as ToolsOzoneModerationGetRecord from './types/tools/ozone/moderation/getRecord'
-import * as ToolsOzoneModerationGetRecords from './types/tools/ozone/moderation/getRecords'
-import * as ToolsOzoneModerationGetRepo from './types/tools/ozone/moderation/getRepo'
-import * as ToolsOzoneModerationGetRepos from './types/tools/ozone/moderation/getRepos'
-import * as ToolsOzoneModerationQueryEvents from './types/tools/ozone/moderation/queryEvents'
-import * as ToolsOzoneModerationQueryStatuses from './types/tools/ozone/moderation/queryStatuses'
-import * as ToolsOzoneModerationSearchRepos from './types/tools/ozone/moderation/searchRepos'
-import * as ToolsOzoneServerGetConfig from './types/tools/ozone/server/getConfig'
-import * as ToolsOzoneSetAddValues from './types/tools/ozone/set/addValues'
-import * as ToolsOzoneSetDeleteSet from './types/tools/ozone/set/deleteSet'
-import * as ToolsOzoneSetDeleteValues from './types/tools/ozone/set/deleteValues'
-import * as ToolsOzoneSetGetValues from './types/tools/ozone/set/getValues'
-import * as ToolsOzoneSetQuerySets from './types/tools/ozone/set/querySets'
-import * as ToolsOzoneSetUpsertSet from './types/tools/ozone/set/upsertSet'
-import * as ToolsOzoneSettingListOptions from './types/tools/ozone/setting/listOptions'
-import * as ToolsOzoneSettingRemoveOptions from './types/tools/ozone/setting/removeOptions'
-import * as ToolsOzoneSettingUpsertOption from './types/tools/ozone/setting/upsertOption'
-import * as ToolsOzoneSignatureFindCorrelation from './types/tools/ozone/signature/findCorrelation'
-import * as ToolsOzoneSignatureFindRelatedAccounts from './types/tools/ozone/signature/findRelatedAccounts'
-import * as ToolsOzoneSignatureSearchAccounts from './types/tools/ozone/signature/searchAccounts'
-import * as ToolsOzoneTeamAddMember from './types/tools/ozone/team/addMember'
-import * as ToolsOzoneTeamDeleteMember from './types/tools/ozone/team/deleteMember'
-import * as ToolsOzoneTeamListMembers from './types/tools/ozone/team/listMembers'
-import * as ToolsOzoneTeamUpdateMember from './types/tools/ozone/team/updateMember'
+import { schemas } from './lexicons.js'
+import * as ComAtprotoAdminDeleteAccount from './types/com/atproto/admin/deleteAccount.js'
+import * as ComAtprotoAdminDisableAccountInvites from './types/com/atproto/admin/disableAccountInvites.js'
+import * as ComAtprotoAdminDisableInviteCodes from './types/com/atproto/admin/disableInviteCodes.js'
+import * as ComAtprotoAdminEnableAccountInvites from './types/com/atproto/admin/enableAccountInvites.js'
+import * as ComAtprotoAdminGetAccountInfo from './types/com/atproto/admin/getAccountInfo.js'
+import * as ComAtprotoAdminGetAccountInfos from './types/com/atproto/admin/getAccountInfos.js'
+import * as ComAtprotoAdminGetInviteCodes from './types/com/atproto/admin/getInviteCodes.js'
+import * as ComAtprotoAdminGetSubjectStatus from './types/com/atproto/admin/getSubjectStatus.js'
+import * as ComAtprotoAdminSearchAccounts from './types/com/atproto/admin/searchAccounts.js'
+import * as ComAtprotoAdminSendEmail from './types/com/atproto/admin/sendEmail.js'
+import * as ComAtprotoAdminUpdateAccountEmail from './types/com/atproto/admin/updateAccountEmail.js'
+import * as ComAtprotoAdminUpdateAccountHandle from './types/com/atproto/admin/updateAccountHandle.js'
+import * as ComAtprotoAdminUpdateAccountPassword from './types/com/atproto/admin/updateAccountPassword.js'
+import * as ComAtprotoAdminUpdateSubjectStatus from './types/com/atproto/admin/updateSubjectStatus.js'
+import * as ComAtprotoIdentityGetRecommendedDidCredentials from './types/com/atproto/identity/getRecommendedDidCredentials.js'
+import * as ComAtprotoIdentityRequestPlcOperationSignature from './types/com/atproto/identity/requestPlcOperationSignature.js'
+import * as ComAtprotoIdentityResolveHandle from './types/com/atproto/identity/resolveHandle.js'
+import * as ComAtprotoIdentitySignPlcOperation from './types/com/atproto/identity/signPlcOperation.js'
+import * as ComAtprotoIdentitySubmitPlcOperation from './types/com/atproto/identity/submitPlcOperation.js'
+import * as ComAtprotoIdentityUpdateHandle from './types/com/atproto/identity/updateHandle.js'
+import * as ComAtprotoLabelQueryLabels from './types/com/atproto/label/queryLabels.js'
+import * as ComAtprotoLabelSubscribeLabels from './types/com/atproto/label/subscribeLabels.js'
+import * as ComAtprotoModerationCreateReport from './types/com/atproto/moderation/createReport.js'
+import * as ComAtprotoRepoApplyWrites from './types/com/atproto/repo/applyWrites.js'
+import * as ComAtprotoRepoCreateRecord from './types/com/atproto/repo/createRecord.js'
+import * as ComAtprotoRepoDeleteRecord from './types/com/atproto/repo/deleteRecord.js'
+import * as ComAtprotoRepoDescribeRepo from './types/com/atproto/repo/describeRepo.js'
+import * as ComAtprotoRepoGetRecord from './types/com/atproto/repo/getRecord.js'
+import * as ComAtprotoRepoImportRepo from './types/com/atproto/repo/importRepo.js'
+import * as ComAtprotoRepoListMissingBlobs from './types/com/atproto/repo/listMissingBlobs.js'
+import * as ComAtprotoRepoListRecords from './types/com/atproto/repo/listRecords.js'
+import * as ComAtprotoRepoPutRecord from './types/com/atproto/repo/putRecord.js'
+import * as ComAtprotoRepoUploadBlob from './types/com/atproto/repo/uploadBlob.js'
+import * as ComAtprotoServerActivateAccount from './types/com/atproto/server/activateAccount.js'
+import * as ComAtprotoServerCheckAccountStatus from './types/com/atproto/server/checkAccountStatus.js'
+import * as ComAtprotoServerConfirmEmail from './types/com/atproto/server/confirmEmail.js'
+import * as ComAtprotoServerCreateAccount from './types/com/atproto/server/createAccount.js'
+import * as ComAtprotoServerCreateAppPassword from './types/com/atproto/server/createAppPassword.js'
+import * as ComAtprotoServerCreateInviteCode from './types/com/atproto/server/createInviteCode.js'
+import * as ComAtprotoServerCreateInviteCodes from './types/com/atproto/server/createInviteCodes.js'
+import * as ComAtprotoServerCreateSession from './types/com/atproto/server/createSession.js'
+import * as ComAtprotoServerDeactivateAccount from './types/com/atproto/server/deactivateAccount.js'
+import * as ComAtprotoServerDeleteAccount from './types/com/atproto/server/deleteAccount.js'
+import * as ComAtprotoServerDeleteSession from './types/com/atproto/server/deleteSession.js'
+import * as ComAtprotoServerDescribeServer from './types/com/atproto/server/describeServer.js'
+import * as ComAtprotoServerGetAccountInviteCodes from './types/com/atproto/server/getAccountInviteCodes.js'
+import * as ComAtprotoServerGetServiceAuth from './types/com/atproto/server/getServiceAuth.js'
+import * as ComAtprotoServerGetSession from './types/com/atproto/server/getSession.js'
+import * as ComAtprotoServerListAppPasswords from './types/com/atproto/server/listAppPasswords.js'
+import * as ComAtprotoServerRefreshSession from './types/com/atproto/server/refreshSession.js'
+import * as ComAtprotoServerRequestAccountDelete from './types/com/atproto/server/requestAccountDelete.js'
+import * as ComAtprotoServerRequestEmailConfirmation from './types/com/atproto/server/requestEmailConfirmation.js'
+import * as ComAtprotoServerRequestEmailUpdate from './types/com/atproto/server/requestEmailUpdate.js'
+import * as ComAtprotoServerRequestPasswordReset from './types/com/atproto/server/requestPasswordReset.js'
+import * as ComAtprotoServerReserveSigningKey from './types/com/atproto/server/reserveSigningKey.js'
+import * as ComAtprotoServerResetPassword from './types/com/atproto/server/resetPassword.js'
+import * as ComAtprotoServerRevokeAppPassword from './types/com/atproto/server/revokeAppPassword.js'
+import * as ComAtprotoServerUpdateEmail from './types/com/atproto/server/updateEmail.js'
+import * as ComAtprotoSyncGetBlob from './types/com/atproto/sync/getBlob.js'
+import * as ComAtprotoSyncGetBlocks from './types/com/atproto/sync/getBlocks.js'
+import * as ComAtprotoSyncGetCheckout from './types/com/atproto/sync/getCheckout.js'
+import * as ComAtprotoSyncGetHead from './types/com/atproto/sync/getHead.js'
+import * as ComAtprotoSyncGetLatestCommit from './types/com/atproto/sync/getLatestCommit.js'
+import * as ComAtprotoSyncGetRecord from './types/com/atproto/sync/getRecord.js'
+import * as ComAtprotoSyncGetRepo from './types/com/atproto/sync/getRepo.js'
+import * as ComAtprotoSyncGetRepoStatus from './types/com/atproto/sync/getRepoStatus.js'
+import * as ComAtprotoSyncListBlobs from './types/com/atproto/sync/listBlobs.js'
+import * as ComAtprotoSyncListRepos from './types/com/atproto/sync/listRepos.js'
+import * as ComAtprotoSyncNotifyOfUpdate from './types/com/atproto/sync/notifyOfUpdate.js'
+import * as ComAtprotoSyncRequestCrawl from './types/com/atproto/sync/requestCrawl.js'
+import * as ComAtprotoSyncSubscribeRepos from './types/com/atproto/sync/subscribeRepos.js'
+import * as ComAtprotoTempAddReservedHandle from './types/com/atproto/temp/addReservedHandle.js'
+import * as ComAtprotoTempCheckSignupQueue from './types/com/atproto/temp/checkSignupQueue.js'
+import * as ComAtprotoTempFetchLabels from './types/com/atproto/temp/fetchLabels.js'
+import * as ComAtprotoTempRequestPhoneVerification from './types/com/atproto/temp/requestPhoneVerification.js'
+import * as AppBskyActorGetPreferences from './types/app/bsky/actor/getPreferences.js'
+import * as AppBskyActorGetProfile from './types/app/bsky/actor/getProfile.js'
+import * as AppBskyActorGetProfiles from './types/app/bsky/actor/getProfiles.js'
+import * as AppBskyActorGetSuggestions from './types/app/bsky/actor/getSuggestions.js'
+import * as AppBskyActorPutPreferences from './types/app/bsky/actor/putPreferences.js'
+import * as AppBskyActorSearchActors from './types/app/bsky/actor/searchActors.js'
+import * as AppBskyActorSearchActorsTypeahead from './types/app/bsky/actor/searchActorsTypeahead.js'
+import * as AppBskyFeedDescribeFeedGenerator from './types/app/bsky/feed/describeFeedGenerator.js'
+import * as AppBskyFeedGetActorFeeds from './types/app/bsky/feed/getActorFeeds.js'
+import * as AppBskyFeedGetActorLikes from './types/app/bsky/feed/getActorLikes.js'
+import * as AppBskyFeedGetAuthorFeed from './types/app/bsky/feed/getAuthorFeed.js'
+import * as AppBskyFeedGetFeed from './types/app/bsky/feed/getFeed.js'
+import * as AppBskyFeedGetFeedGenerator from './types/app/bsky/feed/getFeedGenerator.js'
+import * as AppBskyFeedGetFeedGenerators from './types/app/bsky/feed/getFeedGenerators.js'
+import * as AppBskyFeedGetFeedSkeleton from './types/app/bsky/feed/getFeedSkeleton.js'
+import * as AppBskyFeedGetLikes from './types/app/bsky/feed/getLikes.js'
+import * as AppBskyFeedGetListFeed from './types/app/bsky/feed/getListFeed.js'
+import * as AppBskyFeedGetPostThread from './types/app/bsky/feed/getPostThread.js'
+import * as AppBskyFeedGetPosts from './types/app/bsky/feed/getPosts.js'
+import * as AppBskyFeedGetQuotes from './types/app/bsky/feed/getQuotes.js'
+import * as AppBskyFeedGetRepostedBy from './types/app/bsky/feed/getRepostedBy.js'
+import * as AppBskyFeedGetSuggestedFeeds from './types/app/bsky/feed/getSuggestedFeeds.js'
+import * as AppBskyFeedGetTimeline from './types/app/bsky/feed/getTimeline.js'
+import * as AppBskyFeedSearchPosts from './types/app/bsky/feed/searchPosts.js'
+import * as AppBskyFeedSendInteractions from './types/app/bsky/feed/sendInteractions.js'
+import * as AppBskyGraphGetActorStarterPacks from './types/app/bsky/graph/getActorStarterPacks.js'
+import * as AppBskyGraphGetBlocks from './types/app/bsky/graph/getBlocks.js'
+import * as AppBskyGraphGetFollowers from './types/app/bsky/graph/getFollowers.js'
+import * as AppBskyGraphGetFollows from './types/app/bsky/graph/getFollows.js'
+import * as AppBskyGraphGetKnownFollowers from './types/app/bsky/graph/getKnownFollowers.js'
+import * as AppBskyGraphGetList from './types/app/bsky/graph/getList.js'
+import * as AppBskyGraphGetListBlocks from './types/app/bsky/graph/getListBlocks.js'
+import * as AppBskyGraphGetListMutes from './types/app/bsky/graph/getListMutes.js'
+import * as AppBskyGraphGetLists from './types/app/bsky/graph/getLists.js'
+import * as AppBskyGraphGetMutes from './types/app/bsky/graph/getMutes.js'
+import * as AppBskyGraphGetRelationships from './types/app/bsky/graph/getRelationships.js'
+import * as AppBskyGraphGetStarterPack from './types/app/bsky/graph/getStarterPack.js'
+import * as AppBskyGraphGetStarterPacks from './types/app/bsky/graph/getStarterPacks.js'
+import * as AppBskyGraphGetSuggestedFollowsByActor from './types/app/bsky/graph/getSuggestedFollowsByActor.js'
+import * as AppBskyGraphMuteActor from './types/app/bsky/graph/muteActor.js'
+import * as AppBskyGraphMuteActorList from './types/app/bsky/graph/muteActorList.js'
+import * as AppBskyGraphMuteThread from './types/app/bsky/graph/muteThread.js'
+import * as AppBskyGraphSearchStarterPacks from './types/app/bsky/graph/searchStarterPacks.js'
+import * as AppBskyGraphUnmuteActor from './types/app/bsky/graph/unmuteActor.js'
+import * as AppBskyGraphUnmuteActorList from './types/app/bsky/graph/unmuteActorList.js'
+import * as AppBskyGraphUnmuteThread from './types/app/bsky/graph/unmuteThread.js'
+import * as AppBskyLabelerGetServices from './types/app/bsky/labeler/getServices.js'
+import * as AppBskyNotificationGetUnreadCount from './types/app/bsky/notification/getUnreadCount.js'
+import * as AppBskyNotificationListNotifications from './types/app/bsky/notification/listNotifications.js'
+import * as AppBskyNotificationPutPreferences from './types/app/bsky/notification/putPreferences.js'
+import * as AppBskyNotificationRegisterPush from './types/app/bsky/notification/registerPush.js'
+import * as AppBskyNotificationUpdateSeen from './types/app/bsky/notification/updateSeen.js'
+import * as AppBskyUnspeccedGetConfig from './types/app/bsky/unspecced/getConfig.js'
+import * as AppBskyUnspeccedGetPopularFeedGenerators from './types/app/bsky/unspecced/getPopularFeedGenerators.js'
+import * as AppBskyUnspeccedGetSuggestionsSkeleton from './types/app/bsky/unspecced/getSuggestionsSkeleton.js'
+import * as AppBskyUnspeccedGetTaggedSuggestions from './types/app/bsky/unspecced/getTaggedSuggestions.js'
+import * as AppBskyUnspeccedGetTrendingTopics from './types/app/bsky/unspecced/getTrendingTopics.js'
+import * as AppBskyUnspeccedSearchActorsSkeleton from './types/app/bsky/unspecced/searchActorsSkeleton.js'
+import * as AppBskyUnspeccedSearchPostsSkeleton from './types/app/bsky/unspecced/searchPostsSkeleton.js'
+import * as AppBskyUnspeccedSearchStarterPacksSkeleton from './types/app/bsky/unspecced/searchStarterPacksSkeleton.js'
+import * as AppBskyVideoGetJobStatus from './types/app/bsky/video/getJobStatus.js'
+import * as AppBskyVideoGetUploadLimits from './types/app/bsky/video/getUploadLimits.js'
+import * as AppBskyVideoUploadVideo from './types/app/bsky/video/uploadVideo.js'
+import * as ChatBskyActorDeleteAccount from './types/chat/bsky/actor/deleteAccount.js'
+import * as ChatBskyActorExportAccountData from './types/chat/bsky/actor/exportAccountData.js'
+import * as ChatBskyConvoDeleteMessageForSelf from './types/chat/bsky/convo/deleteMessageForSelf.js'
+import * as ChatBskyConvoGetConvo from './types/chat/bsky/convo/getConvo.js'
+import * as ChatBskyConvoGetConvoForMembers from './types/chat/bsky/convo/getConvoForMembers.js'
+import * as ChatBskyConvoGetLog from './types/chat/bsky/convo/getLog.js'
+import * as ChatBskyConvoGetMessages from './types/chat/bsky/convo/getMessages.js'
+import * as ChatBskyConvoLeaveConvo from './types/chat/bsky/convo/leaveConvo.js'
+import * as ChatBskyConvoListConvos from './types/chat/bsky/convo/listConvos.js'
+import * as ChatBskyConvoMuteConvo from './types/chat/bsky/convo/muteConvo.js'
+import * as ChatBskyConvoSendMessage from './types/chat/bsky/convo/sendMessage.js'
+import * as ChatBskyConvoSendMessageBatch from './types/chat/bsky/convo/sendMessageBatch.js'
+import * as ChatBskyConvoUnmuteConvo from './types/chat/bsky/convo/unmuteConvo.js'
+import * as ChatBskyConvoUpdateRead from './types/chat/bsky/convo/updateRead.js'
+import * as ChatBskyModerationGetActorMetadata from './types/chat/bsky/moderation/getActorMetadata.js'
+import * as ChatBskyModerationGetMessageContext from './types/chat/bsky/moderation/getMessageContext.js'
+import * as ChatBskyModerationUpdateActorAccess from './types/chat/bsky/moderation/updateActorAccess.js'
+import * as ToolsOzoneCommunicationCreateTemplate from './types/tools/ozone/communication/createTemplate.js'
+import * as ToolsOzoneCommunicationDeleteTemplate from './types/tools/ozone/communication/deleteTemplate.js'
+import * as ToolsOzoneCommunicationListTemplates from './types/tools/ozone/communication/listTemplates.js'
+import * as ToolsOzoneCommunicationUpdateTemplate from './types/tools/ozone/communication/updateTemplate.js'
+import * as ToolsOzoneModerationEmitEvent from './types/tools/ozone/moderation/emitEvent.js'
+import * as ToolsOzoneModerationGetEvent from './types/tools/ozone/moderation/getEvent.js'
+import * as ToolsOzoneModerationGetRecord from './types/tools/ozone/moderation/getRecord.js'
+import * as ToolsOzoneModerationGetRecords from './types/tools/ozone/moderation/getRecords.js'
+import * as ToolsOzoneModerationGetRepo from './types/tools/ozone/moderation/getRepo.js'
+import * as ToolsOzoneModerationGetRepos from './types/tools/ozone/moderation/getRepos.js'
+import * as ToolsOzoneModerationQueryEvents from './types/tools/ozone/moderation/queryEvents.js'
+import * as ToolsOzoneModerationQueryStatuses from './types/tools/ozone/moderation/queryStatuses.js'
+import * as ToolsOzoneModerationSearchRepos from './types/tools/ozone/moderation/searchRepos.js'
+import * as ToolsOzoneServerGetConfig from './types/tools/ozone/server/getConfig.js'
+import * as ToolsOzoneSetAddValues from './types/tools/ozone/set/addValues.js'
+import * as ToolsOzoneSetDeleteSet from './types/tools/ozone/set/deleteSet.js'
+import * as ToolsOzoneSetDeleteValues from './types/tools/ozone/set/deleteValues.js'
+import * as ToolsOzoneSetGetValues from './types/tools/ozone/set/getValues.js'
+import * as ToolsOzoneSetQuerySets from './types/tools/ozone/set/querySets.js'
+import * as ToolsOzoneSetUpsertSet from './types/tools/ozone/set/upsertSet.js'
+import * as ToolsOzoneSettingListOptions from './types/tools/ozone/setting/listOptions.js'
+import * as ToolsOzoneSettingRemoveOptions from './types/tools/ozone/setting/removeOptions.js'
+import * as ToolsOzoneSettingUpsertOption from './types/tools/ozone/setting/upsertOption.js'
+import * as ToolsOzoneSignatureFindCorrelation from './types/tools/ozone/signature/findCorrelation.js'
+import * as ToolsOzoneSignatureFindRelatedAccounts from './types/tools/ozone/signature/findRelatedAccounts.js'
+import * as ToolsOzoneSignatureSearchAccounts from './types/tools/ozone/signature/searchAccounts.js'
+import * as ToolsOzoneTeamAddMember from './types/tools/ozone/team/addMember.js'
+import * as ToolsOzoneTeamDeleteMember from './types/tools/ozone/team/deleteMember.js'
+import * as ToolsOzoneTeamListMembers from './types/tools/ozone/team/listMembers.js'
+import * as ToolsOzoneTeamUpdateMember from './types/tools/ozone/team/updateMember.js'
 
 export const COM_ATPROTO_MODERATION = {
   DefsReasonSpam: 'com.atproto.moderation.defs#reasonSpam',
diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
index 6e709774761..c2bfa933c42 100644
--- a/packages/ozone/src/lexicon/lexicons.ts
+++ b/packages/ozone/src/lexicon/lexicons.ts
@@ -1,7 +1,13 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
-import { LexiconDoc, Lexicons } from '@atproto/lexicon'
+import {
+  LexiconDoc,
+  Lexicons,
+  ValidationError,
+  ValidationResult,
+} from '@atproto/lexicon'
+import { $Typed, is$typed, maybe$typed } from './util.js'
 
 export const schemaDict = {
   ComAtprotoAdminDefs: {
@@ -13871,8 +13877,37 @@ export const schemaDict = {
   },
 } as const satisfies Record<string, LexiconDoc>
 
-export const schemas = Object.values(schemaDict)
+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 = {
   ComAtprotoAdminDefs: 'com.atproto.admin.defs',
   ComAtprotoAdminDeleteAccount: 'com.atproto.admin.deleteAccount',
@@ -14124,4 +14159,4 @@ export const ids = {
   ToolsOzoneTeamDeleteMember: 'tools.ozone.team.deleteMember',
   ToolsOzoneTeamListMembers: 'tools.ozone.team.listMembers',
   ToolsOzoneTeamUpdateMember: 'tools.ozone.team.updateMember',
-}
+} as const
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/defs.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/defs.ts
index 730b979dcea..d905d955114 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/defs.ts
@@ -2,16 +2,21 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as AppBskyGraphDefs from '../graph/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
-import * as AppBskyFeedThreadgate from '../feed/threadgate'
-import * as AppBskyFeedPostgate from '../feed/postgate'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as AppBskyGraphDefs from '../graph/defs.js'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
+import type * as AppBskyFeedThreadgate from '../feed/threadgate.js'
+import type * as AppBskyFeedPostgate from '../feed/postgate.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.defs'
 
 export interface ProfileViewBasic {
+  $type?: 'app.bsky.actor.defs#profileViewBasic'
   did: string
   handle: string
   displayName?: string
@@ -20,22 +25,20 @@ export interface ProfileViewBasic {
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
   createdAt?: string
-  [k: string]: unknown
 }
 
-export function isProfileViewBasic(v: unknown): v is ProfileViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileViewBasic'
-  )
+const hashProfileViewBasic = 'profileViewBasic'
+
+export function isProfileViewBasic<V>(v: V) {
+  return is$typed(v, id, hashProfileViewBasic)
 }
 
-export function validateProfileViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileViewBasic', v)
+export function validateProfileViewBasic<V>(v: V) {
+  return validate<ProfileViewBasic & V>(v, id, hashProfileViewBasic)
 }
 
 export interface ProfileView {
+  $type?: 'app.bsky.actor.defs#profileView'
   did: string
   handle: string
   displayName?: string
@@ -46,22 +49,20 @@ export interface ProfileView {
   createdAt?: string
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isProfileView(v: unknown): v is ProfileView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileView'
-  )
+const hashProfileView = 'profileView'
+
+export function isProfileView<V>(v: V) {
+  return is$typed(v, id, hashProfileView)
 }
 
-export function validateProfileView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileView', v)
+export function validateProfileView<V>(v: V) {
+  return validate<ProfileView & V>(v, id, hashProfileView)
 }
 
 export interface ProfileViewDetailed {
+  $type?: 'app.bsky.actor.defs#profileViewDetailed'
   did: string
   handle: string
   displayName?: string
@@ -78,63 +79,55 @@ export interface ProfileViewDetailed {
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
   pinnedPost?: ComAtprotoRepoStrongRef.Main
-  [k: string]: unknown
 }
 
-export function isProfileViewDetailed(v: unknown): v is ProfileViewDetailed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileViewDetailed'
-  )
+const hashProfileViewDetailed = 'profileViewDetailed'
+
+export function isProfileViewDetailed<V>(v: V) {
+  return is$typed(v, id, hashProfileViewDetailed)
 }
 
-export function validateProfileViewDetailed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileViewDetailed', v)
+export function validateProfileViewDetailed<V>(v: V) {
+  return validate<ProfileViewDetailed & V>(v, id, hashProfileViewDetailed)
 }
 
 export interface ProfileAssociated {
+  $type?: 'app.bsky.actor.defs#profileAssociated'
   lists?: number
   feedgens?: number
   starterPacks?: number
   labeler?: boolean
   chat?: ProfileAssociatedChat
-  [k: string]: unknown
 }
 
-export function isProfileAssociated(v: unknown): v is ProfileAssociated {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileAssociated'
-  )
+const hashProfileAssociated = 'profileAssociated'
+
+export function isProfileAssociated<V>(v: V) {
+  return is$typed(v, id, hashProfileAssociated)
 }
 
-export function validateProfileAssociated(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileAssociated', v)
+export function validateProfileAssociated<V>(v: V) {
+  return validate<ProfileAssociated & V>(v, id, hashProfileAssociated)
 }
 
 export interface ProfileAssociatedChat {
+  $type?: 'app.bsky.actor.defs#profileAssociatedChat'
   allowIncoming: 'all' | 'none' | 'following' | (string & {})
-  [k: string]: unknown
 }
 
-export function isProfileAssociatedChat(
-  v: unknown,
-): v is ProfileAssociatedChat {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileAssociatedChat'
-  )
+const hashProfileAssociatedChat = 'profileAssociatedChat'
+
+export function isProfileAssociatedChat<V>(v: V) {
+  return is$typed(v, id, hashProfileAssociatedChat)
 }
 
-export function validateProfileAssociatedChat(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileAssociatedChat', v)
+export function validateProfileAssociatedChat<V>(v: V) {
+  return validate<ProfileAssociatedChat & V>(v, id, hashProfileAssociatedChat)
 }
 
 /** Metadata about the requesting account's relationship with the subject account. Only has meaningful content for authed requests. */
 export interface ViewerState {
+  $type?: 'app.bsky.actor.defs#viewerState'
   muted?: boolean
   mutedByList?: AppBskyGraphDefs.ListViewBasic
   blockedBy?: boolean
@@ -143,169 +136,153 @@ export interface ViewerState {
   following?: string
   followedBy?: string
   knownFollowers?: KnownFollowers
-  [k: string]: unknown
 }
 
-export function isViewerState(v: unknown): v is ViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#viewerState'
-  )
+const hashViewerState = 'viewerState'
+
+export function isViewerState<V>(v: V) {
+  return is$typed(v, id, hashViewerState)
 }
 
-export function validateViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#viewerState', v)
+export function validateViewerState<V>(v: V) {
+  return validate<ViewerState & V>(v, id, hashViewerState)
 }
 
 /** The subject's followers whom you also follow */
 export interface KnownFollowers {
+  $type?: 'app.bsky.actor.defs#knownFollowers'
   count: number
   followers: ProfileViewBasic[]
-  [k: string]: unknown
 }
 
-export function isKnownFollowers(v: unknown): v is KnownFollowers {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#knownFollowers'
-  )
+const hashKnownFollowers = 'knownFollowers'
+
+export function isKnownFollowers<V>(v: V) {
+  return is$typed(v, id, hashKnownFollowers)
 }
 
-export function validateKnownFollowers(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#knownFollowers', v)
+export function validateKnownFollowers<V>(v: V) {
+  return validate<KnownFollowers & V>(v, id, hashKnownFollowers)
 }
 
 export type Preferences = (
-  | AdultContentPref
-  | ContentLabelPref
-  | SavedFeedsPref
-  | SavedFeedsPrefV2
-  | PersonalDetailsPref
-  | FeedViewPref
-  | ThreadViewPref
-  | InterestsPref
-  | MutedWordsPref
-  | HiddenPostsPref
-  | BskyAppStatePref
-  | LabelersPref
-  | PostInteractionSettingsPref
-  | { $type: string; [k: string]: unknown }
+  | $Typed<AdultContentPref>
+  | $Typed<ContentLabelPref>
+  | $Typed<SavedFeedsPref>
+  | $Typed<SavedFeedsPrefV2>
+  | $Typed<PersonalDetailsPref>
+  | $Typed<FeedViewPref>
+  | $Typed<ThreadViewPref>
+  | $Typed<InterestsPref>
+  | $Typed<MutedWordsPref>
+  | $Typed<HiddenPostsPref>
+  | $Typed<BskyAppStatePref>
+  | $Typed<LabelersPref>
+  | $Typed<PostInteractionSettingsPref>
+  | { $type: string }
 )[]
 
 export interface AdultContentPref {
+  $type?: 'app.bsky.actor.defs#adultContentPref'
   enabled: boolean
-  [k: string]: unknown
 }
 
-export function isAdultContentPref(v: unknown): v is AdultContentPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#adultContentPref'
-  )
+const hashAdultContentPref = 'adultContentPref'
+
+export function isAdultContentPref<V>(v: V) {
+  return is$typed(v, id, hashAdultContentPref)
 }
 
-export function validateAdultContentPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#adultContentPref', v)
+export function validateAdultContentPref<V>(v: V) {
+  return validate<AdultContentPref & V>(v, id, hashAdultContentPref)
 }
 
 export interface ContentLabelPref {
+  $type?: 'app.bsky.actor.defs#contentLabelPref'
   /** Which labeler does this preference apply to? If undefined, applies globally. */
   labelerDid?: string
   label: string
   visibility: 'ignore' | 'show' | 'warn' | 'hide' | (string & {})
-  [k: string]: unknown
 }
 
-export function isContentLabelPref(v: unknown): v is ContentLabelPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#contentLabelPref'
-  )
+const hashContentLabelPref = 'contentLabelPref'
+
+export function isContentLabelPref<V>(v: V) {
+  return is$typed(v, id, hashContentLabelPref)
 }
 
-export function validateContentLabelPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#contentLabelPref', v)
+export function validateContentLabelPref<V>(v: V) {
+  return validate<ContentLabelPref & V>(v, id, hashContentLabelPref)
 }
 
 export interface SavedFeed {
+  $type?: 'app.bsky.actor.defs#savedFeed'
   id: string
   type: 'feed' | 'list' | 'timeline' | (string & {})
   value: string
   pinned: boolean
-  [k: string]: unknown
 }
 
-export function isSavedFeed(v: unknown): v is SavedFeed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeed'
-  )
+const hashSavedFeed = 'savedFeed'
+
+export function isSavedFeed<V>(v: V) {
+  return is$typed(v, id, hashSavedFeed)
 }
 
-export function validateSavedFeed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeed', v)
+export function validateSavedFeed<V>(v: V) {
+  return validate<SavedFeed & V>(v, id, hashSavedFeed)
 }
 
 export interface SavedFeedsPrefV2 {
+  $type?: 'app.bsky.actor.defs#savedFeedsPrefV2'
   items: SavedFeed[]
-  [k: string]: unknown
 }
 
-export function isSavedFeedsPrefV2(v: unknown): v is SavedFeedsPrefV2 {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeedsPrefV2'
-  )
+const hashSavedFeedsPrefV2 = 'savedFeedsPrefV2'
+
+export function isSavedFeedsPrefV2<V>(v: V) {
+  return is$typed(v, id, hashSavedFeedsPrefV2)
 }
 
-export function validateSavedFeedsPrefV2(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeedsPrefV2', v)
+export function validateSavedFeedsPrefV2<V>(v: V) {
+  return validate<SavedFeedsPrefV2 & V>(v, id, hashSavedFeedsPrefV2)
 }
 
 export interface SavedFeedsPref {
+  $type?: 'app.bsky.actor.defs#savedFeedsPref'
   pinned: string[]
   saved: string[]
   timelineIndex?: number
-  [k: string]: unknown
 }
 
-export function isSavedFeedsPref(v: unknown): v is SavedFeedsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeedsPref'
-  )
+const hashSavedFeedsPref = 'savedFeedsPref'
+
+export function isSavedFeedsPref<V>(v: V) {
+  return is$typed(v, id, hashSavedFeedsPref)
 }
 
-export function validateSavedFeedsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeedsPref', v)
+export function validateSavedFeedsPref<V>(v: V) {
+  return validate<SavedFeedsPref & V>(v, id, hashSavedFeedsPref)
 }
 
 export interface PersonalDetailsPref {
+  $type?: 'app.bsky.actor.defs#personalDetailsPref'
   /** The birth date of account owner. */
   birthDate?: string
-  [k: string]: unknown
 }
 
-export function isPersonalDetailsPref(v: unknown): v is PersonalDetailsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#personalDetailsPref'
-  )
+const hashPersonalDetailsPref = 'personalDetailsPref'
+
+export function isPersonalDetailsPref<V>(v: V) {
+  return is$typed(v, id, hashPersonalDetailsPref)
 }
 
-export function validatePersonalDetailsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#personalDetailsPref', v)
+export function validatePersonalDetailsPref<V>(v: V) {
+  return validate<PersonalDetailsPref & V>(v, id, hashPersonalDetailsPref)
 }
 
 export interface FeedViewPref {
+  $type?: 'app.bsky.actor.defs#feedViewPref'
   /** The URI of the feed, or an identifier which describes the feed. */
   feed: string
   /** Hide replies in the feed. */
@@ -318,22 +295,20 @@ export interface FeedViewPref {
   hideReposts?: boolean
   /** Hide quote posts in the feed. */
   hideQuotePosts?: boolean
-  [k: string]: unknown
 }
 
-export function isFeedViewPref(v: unknown): v is FeedViewPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#feedViewPref'
-  )
+const hashFeedViewPref = 'feedViewPref'
+
+export function isFeedViewPref<V>(v: V) {
+  return is$typed(v, id, hashFeedViewPref)
 }
 
-export function validateFeedViewPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#feedViewPref', v)
+export function validateFeedViewPref<V>(v: V) {
+  return validate<FeedViewPref & V>(v, id, hashFeedViewPref)
 }
 
 export interface ThreadViewPref {
+  $type?: 'app.bsky.actor.defs#threadViewPref'
   /** Sorting mode for threads. */
   sort?:
     | 'oldest'
@@ -344,43 +319,39 @@ export interface ThreadViewPref {
     | (string & {})
   /** Show followed users at the top of all replies. */
   prioritizeFollowedUsers?: boolean
-  [k: string]: unknown
 }
 
-export function isThreadViewPref(v: unknown): v is ThreadViewPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#threadViewPref'
-  )
+const hashThreadViewPref = 'threadViewPref'
+
+export function isThreadViewPref<V>(v: V) {
+  return is$typed(v, id, hashThreadViewPref)
 }
 
-export function validateThreadViewPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#threadViewPref', v)
+export function validateThreadViewPref<V>(v: V) {
+  return validate<ThreadViewPref & V>(v, id, hashThreadViewPref)
 }
 
 export interface InterestsPref {
+  $type?: 'app.bsky.actor.defs#interestsPref'
   /** A list of tags which describe the account owner's interests gathered during onboarding. */
   tags: string[]
-  [k: string]: unknown
 }
 
-export function isInterestsPref(v: unknown): v is InterestsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#interestsPref'
-  )
+const hashInterestsPref = 'interestsPref'
+
+export function isInterestsPref<V>(v: V) {
+  return is$typed(v, id, hashInterestsPref)
 }
 
-export function validateInterestsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#interestsPref', v)
+export function validateInterestsPref<V>(v: V) {
+  return validate<InterestsPref & V>(v, id, hashInterestsPref)
 }
 
 export type MutedWordTarget = 'content' | 'tag' | (string & {})
 
 /** A word that the account owner has muted. */
 export interface MutedWord {
+  $type?: 'app.bsky.actor.defs#mutedWord'
   id?: string
   /** The muted word itself. */
   value: string
@@ -390,182 +361,165 @@ export interface MutedWord {
   actorTarget: 'all' | 'exclude-following' | (string & {})
   /** The date and time at which the muted word will expire and no longer be applied. */
   expiresAt?: string
-  [k: string]: unknown
 }
 
-export function isMutedWord(v: unknown): v is MutedWord {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#mutedWord'
-  )
+const hashMutedWord = 'mutedWord'
+
+export function isMutedWord<V>(v: V) {
+  return is$typed(v, id, hashMutedWord)
 }
 
-export function validateMutedWord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#mutedWord', v)
+export function validateMutedWord<V>(v: V) {
+  return validate<MutedWord & V>(v, id, hashMutedWord)
 }
 
 export interface MutedWordsPref {
+  $type?: 'app.bsky.actor.defs#mutedWordsPref'
   /** A list of words the account owner has muted. */
   items: MutedWord[]
-  [k: string]: unknown
 }
 
-export function isMutedWordsPref(v: unknown): v is MutedWordsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#mutedWordsPref'
-  )
+const hashMutedWordsPref = 'mutedWordsPref'
+
+export function isMutedWordsPref<V>(v: V) {
+  return is$typed(v, id, hashMutedWordsPref)
 }
 
-export function validateMutedWordsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#mutedWordsPref', v)
+export function validateMutedWordsPref<V>(v: V) {
+  return validate<MutedWordsPref & V>(v, id, hashMutedWordsPref)
 }
 
 export interface HiddenPostsPref {
+  $type?: 'app.bsky.actor.defs#hiddenPostsPref'
   /** A list of URIs of posts the account owner has hidden. */
   items: string[]
-  [k: string]: unknown
 }
 
-export function isHiddenPostsPref(v: unknown): v is HiddenPostsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#hiddenPostsPref'
-  )
+const hashHiddenPostsPref = 'hiddenPostsPref'
+
+export function isHiddenPostsPref<V>(v: V) {
+  return is$typed(v, id, hashHiddenPostsPref)
 }
 
-export function validateHiddenPostsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#hiddenPostsPref', v)
+export function validateHiddenPostsPref<V>(v: V) {
+  return validate<HiddenPostsPref & V>(v, id, hashHiddenPostsPref)
 }
 
 export interface LabelersPref {
+  $type?: 'app.bsky.actor.defs#labelersPref'
   labelers: LabelerPrefItem[]
-  [k: string]: unknown
 }
 
-export function isLabelersPref(v: unknown): v is LabelersPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#labelersPref'
-  )
+const hashLabelersPref = 'labelersPref'
+
+export function isLabelersPref<V>(v: V) {
+  return is$typed(v, id, hashLabelersPref)
 }
 
-export function validateLabelersPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#labelersPref', v)
+export function validateLabelersPref<V>(v: V) {
+  return validate<LabelersPref & V>(v, id, hashLabelersPref)
 }
 
 export interface LabelerPrefItem {
+  $type?: 'app.bsky.actor.defs#labelerPrefItem'
   did: string
-  [k: string]: unknown
 }
 
-export function isLabelerPrefItem(v: unknown): v is LabelerPrefItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#labelerPrefItem'
-  )
+const hashLabelerPrefItem = 'labelerPrefItem'
+
+export function isLabelerPrefItem<V>(v: V) {
+  return is$typed(v, id, hashLabelerPrefItem)
 }
 
-export function validateLabelerPrefItem(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#labelerPrefItem', v)
+export function validateLabelerPrefItem<V>(v: V) {
+  return validate<LabelerPrefItem & V>(v, id, hashLabelerPrefItem)
 }
 
 /** A grab bag of state that's specific to the bsky.app program. Third-party apps shouldn't use this. */
 export interface BskyAppStatePref {
+  $type?: 'app.bsky.actor.defs#bskyAppStatePref'
   activeProgressGuide?: BskyAppProgressGuide
   /** An array of tokens which identify nudges (modals, popups, tours, highlight dots) that should be shown to the user. */
   queuedNudges?: string[]
   /** Storage for NUXs the user has encountered. */
   nuxs?: Nux[]
-  [k: string]: unknown
 }
 
-export function isBskyAppStatePref(v: unknown): v is BskyAppStatePref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#bskyAppStatePref'
-  )
+const hashBskyAppStatePref = 'bskyAppStatePref'
+
+export function isBskyAppStatePref<V>(v: V) {
+  return is$typed(v, id, hashBskyAppStatePref)
 }
 
-export function validateBskyAppStatePref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#bskyAppStatePref', v)
+export function validateBskyAppStatePref<V>(v: V) {
+  return validate<BskyAppStatePref & V>(v, id, hashBskyAppStatePref)
 }
 
 /** If set, an active progress guide. Once completed, can be set to undefined. Should have unspecced fields tracking progress. */
 export interface BskyAppProgressGuide {
+  $type?: 'app.bsky.actor.defs#bskyAppProgressGuide'
   guide: string
-  [k: string]: unknown
 }
 
-export function isBskyAppProgressGuide(v: unknown): v is BskyAppProgressGuide {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#bskyAppProgressGuide'
-  )
+const hashBskyAppProgressGuide = 'bskyAppProgressGuide'
+
+export function isBskyAppProgressGuide<V>(v: V) {
+  return is$typed(v, id, hashBskyAppProgressGuide)
 }
 
-export function validateBskyAppProgressGuide(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#bskyAppProgressGuide', v)
+export function validateBskyAppProgressGuide<V>(v: V) {
+  return validate<BskyAppProgressGuide & V>(v, id, hashBskyAppProgressGuide)
 }
 
 /** A new user experiences (NUX) storage object */
 export interface Nux {
+  $type?: 'app.bsky.actor.defs#nux'
   id: string
   completed: boolean
   /** Arbitrary data for the NUX. The structure is defined by the NUX itself. Limited to 300 characters. */
   data?: string
   /** The date and time at which the NUX will expire and should be considered completed. */
   expiresAt?: string
-  [k: string]: unknown
 }
 
-export function isNux(v: unknown): v is Nux {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.actor.defs#nux'
-  )
+const hashNux = 'nux'
+
+export function isNux<V>(v: V) {
+  return is$typed(v, id, hashNux)
 }
 
-export function validateNux(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#nux', v)
+export function validateNux<V>(v: V) {
+  return validate<Nux & V>(v, id, hashNux)
 }
 
 /** Default post interaction settings for the account. These values should be applied as default values when creating new posts. These refs should mirror the threadgate and postgate records exactly. */
 export interface PostInteractionSettingsPref {
+  $type?: 'app.bsky.actor.defs#postInteractionSettingsPref'
   /** Matches threadgate record. List of rules defining who can reply to this users posts. If value is an empty array, no one can reply. If value is undefined, anyone can reply. */
   threadgateAllowRules?: (
-    | AppBskyFeedThreadgate.MentionRule
-    | AppBskyFeedThreadgate.FollowerRule
-    | AppBskyFeedThreadgate.FollowingRule
-    | AppBskyFeedThreadgate.ListRule
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyFeedThreadgate.MentionRule>
+    | $Typed<AppBskyFeedThreadgate.FollowerRule>
+    | $Typed<AppBskyFeedThreadgate.FollowingRule>
+    | $Typed<AppBskyFeedThreadgate.ListRule>
+    | { $type: string }
   )[]
   /** Matches postgate record. List of rules defining who can embed this users posts. If value is an empty array or is undefined, no particular rules apply and anyone can embed. */
   postgateEmbeddingRules?: (
-    | AppBskyFeedPostgate.DisableRule
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyFeedPostgate.DisableRule>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
-export function isPostInteractionSettingsPref(
-  v: unknown,
-): v is PostInteractionSettingsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#postInteractionSettingsPref'
-  )
+const hashPostInteractionSettingsPref = 'postInteractionSettingsPref'
+
+export function isPostInteractionSettingsPref<V>(v: V) {
+  return is$typed(v, id, hashPostInteractionSettingsPref)
 }
 
-export function validatePostInteractionSettingsPref(
-  v: unknown,
-): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#postInteractionSettingsPref', v)
+export function validatePostInteractionSettingsPref<V>(v: V) {
+  return validate<PostInteractionSettingsPref & V>(
+    v,
+    id,
+    hashPostInteractionSettingsPref,
+  )
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/getPreferences.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/getPreferences.ts
index f839ece0a4d..f81e927ac0d 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/getPreferences.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/getPreferences.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.getPreferences'
 
 export interface QueryParams {}
 
@@ -15,7 +19,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   preferences: AppBskyActorDefs.Preferences
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/getProfile.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/getProfile.ts
index f9163fcf168..4c83033afa4 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/getProfile.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/getProfile.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.getProfile'
 
 export interface QueryParams {
   /** Handle or DID of account to fetch profile of. */
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/getProfiles.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/getProfiles.ts
index 5c2ffb1f2cc..a520bb53a93 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/getProfiles.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/getProfiles.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.getProfiles'
 
 export interface QueryParams {
   actors: string[]
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   profiles: AppBskyActorDefs.ProfileViewDetailed[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/getSuggestions.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/getSuggestions.ts
index c7e254261a1..9001835fa2d 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/getSuggestions.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/getSuggestions.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.getSuggestions'
 
 export interface QueryParams {
   limit: number
@@ -21,7 +25,6 @@ export interface OutputSchema {
   actors: AppBskyActorDefs.ProfileView[]
   /** Snowflake for this recommendation, use when submitting recommendation events. */
   recId?: number
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/profile.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/profile.ts
index 617bdf2cd73..e5bb9da321b 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/profile.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/profile.ts
@@ -2,13 +2,18 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.profile'
 
 export interface Record {
+  $type: 'app.bsky.actor.profile'
   displayName?: string
   /** Free-form profile description text. */
   description?: string
@@ -16,24 +21,19 @@ export interface Record {
   avatar?: BlobRef
   /** Larger horizontal image to display behind profile view. */
   banner?: BlobRef
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   joinedViaStarterPack?: ComAtprotoRepoStrongRef.Main
   pinnedPost?: ComAtprotoRepoStrongRef.Main
   createdAt?: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.actor.profile#main' ||
-      v.$type === 'app.bsky.actor.profile')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.profile#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/putPreferences.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/putPreferences.ts
index 59aea81c2da..922fc9b2fdf 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/putPreferences.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/putPreferences.ts
@@ -3,17 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.putPreferences'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   preferences: AppBskyActorDefs.Preferences
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/searchActors.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/searchActors.ts
index ebd81ececc5..74a1fbb6d97 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/searchActors.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/searchActors.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.searchActors'
 
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead. */
@@ -23,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   actors: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
index b7e9831b21d..09e307aa2df 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.searchActorsTypeahead'
 
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead. */
@@ -21,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   actors: AppBskyActorDefs.ProfileViewBasic[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/embed/defs.ts b/packages/ozone/src/lexicon/types/app/bsky/embed/defs.ts
index cc253f9e610..adf61115464 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/embed/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/embed/defs.ts
@@ -2,25 +2,27 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.embed.defs'
 
 /** width:height represents an aspect ratio. It may be approximate, and may not correspond to absolute dimensions in any given unit. */
 export interface AspectRatio {
+  $type?: 'app.bsky.embed.defs#aspectRatio'
   width: number
   height: number
-  [k: string]: unknown
 }
 
-export function isAspectRatio(v: unknown): v is AspectRatio {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.defs#aspectRatio'
-  )
+const hashAspectRatio = 'aspectRatio'
+
+export function isAspectRatio<V>(v: V) {
+  return is$typed(v, id, hashAspectRatio)
 }
 
-export function validateAspectRatio(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.defs#aspectRatio', v)
+export function validateAspectRatio<V>(v: V) {
+  return validate<AspectRatio & V>(v, id, hashAspectRatio)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/embed/external.ts b/packages/ozone/src/lexicon/types/app/bsky/embed/external.ts
index b137ee4b6f5..5a38d1e3846 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/embed/external.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/embed/external.ts
@@ -2,82 +2,77 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.embed.external'
 
 /** A representation of some externally linked content (eg, a URL and 'card'), embedded in a Bluesky record (eg, a post). */
 export interface Main {
+  $type?: 'app.bsky.embed.external'
   external: External
-  [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.external#main' ||
-      v.$type === 'app.bsky.embed.external')
-  )
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#main', v)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
 export interface External {
+  $type?: 'app.bsky.embed.external#external'
   uri: string
   title: string
   description: string
   thumb?: BlobRef
-  [k: string]: unknown
 }
 
-export function isExternal(v: unknown): v is External {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#external'
-  )
+const hashExternal = 'external'
+
+export function isExternal<V>(v: V) {
+  return is$typed(v, id, hashExternal)
 }
 
-export function validateExternal(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#external', v)
+export function validateExternal<V>(v: V) {
+  return validate<External & V>(v, id, hashExternal)
 }
 
 export interface View {
+  $type?: 'app.bsky.embed.external#view'
   external: ViewExternal
-  [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#view'
-  )
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#view', v)
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
 
 export interface ViewExternal {
+  $type?: 'app.bsky.embed.external#viewExternal'
   uri: string
   title: string
   description: string
   thumb?: string
-  [k: string]: unknown
 }
 
-export function isViewExternal(v: unknown): v is ViewExternal {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#viewExternal'
-  )
+const hashViewExternal = 'viewExternal'
+
+export function isViewExternal<V>(v: V) {
+  return is$typed(v, id, hashViewExternal)
 }
 
-export function validateViewExternal(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#viewExternal', v)
+export function validateViewExternal<V>(v: V) {
+  return validate<ViewExternal & V>(v, id, hashViewExternal)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/embed/images.ts b/packages/ozone/src/lexicon/types/app/bsky/embed/images.ts
index 1fddf42f8eb..26b6d965235 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/embed/images.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/embed/images.ts
@@ -2,63 +2,65 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyEmbedDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyEmbedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.embed.images'
 
 export interface Main {
+  $type?: 'app.bsky.embed.images'
   images: Image[]
-  [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.images#main' ||
-      v.$type === 'app.bsky.embed.images')
-  )
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#main', v)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
 export interface Image {
+  $type?: 'app.bsky.embed.images#image'
   image: BlobRef
   /** Alt text description of the image, for accessibility. */
   alt: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isImage(v: unknown): v is Image {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.images#image'
-  )
+const hashImage = 'image'
+
+export function isImage<V>(v: V) {
+  return is$typed(v, id, hashImage)
 }
 
-export function validateImage(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#image', v)
+export function validateImage<V>(v: V) {
+  return validate<Image & V>(v, id, hashImage)
 }
 
 export interface View {
+  $type?: 'app.bsky.embed.images#view'
   images: ViewImage[]
-  [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.images#view'
-  )
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#view', v)
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
 
 export interface ViewImage {
+  $type?: 'app.bsky.embed.images#viewImage'
   /** Fully-qualified URL where a thumbnail of the image can be fetched. For example, CDN location provided by the App View. */
   thumb: string
   /** Fully-qualified URL where a large version of the image can be fetched. May or may not be the exact original blob. For example, CDN location provided by the App View. */
@@ -66,17 +68,14 @@ export interface ViewImage {
   /** Alt text description of the image, for accessibility. */
   alt: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isViewImage(v: unknown): v is ViewImage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.images#viewImage'
-  )
+const hashViewImage = 'viewImage'
+
+export function isViewImage<V>(v: V) {
+  return is$typed(v, id, hashViewImage)
 }
 
-export function validateViewImage(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#viewImage', v)
+export function validateViewImage<V>(v: V) {
+  return validate<ViewImage & V>(v, id, hashViewImage)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/embed/record.ts b/packages/ozone/src/lexicon/types/app/bsky/embed/record.ts
index 452c8fb7f71..9fd1aee2be3 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/embed/record.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/embed/record.ts
@@ -2,148 +2,141 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
-import * as AppBskyFeedDefs from '../feed/defs'
-import * as AppBskyGraphDefs from '../graph/defs'
-import * as AppBskyLabelerDefs from '../labeler/defs'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as AppBskyEmbedImages from './images'
-import * as AppBskyEmbedVideo from './video'
-import * as AppBskyEmbedExternal from './external'
-import * as AppBskyEmbedRecordWithMedia from './recordWithMedia'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
+import type * as AppBskyFeedDefs from '../feed/defs.js'
+import type * as AppBskyGraphDefs from '../graph/defs.js'
+import type * as AppBskyLabelerDefs from '../labeler/defs.js'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as AppBskyEmbedImages from './images.js'
+import type * as AppBskyEmbedVideo from './video.js'
+import type * as AppBskyEmbedExternal from './external.js'
+import type * as AppBskyEmbedRecordWithMedia from './recordWithMedia.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.embed.record'
 
 export interface Main {
+  $type?: 'app.bsky.embed.record'
   record: ComAtprotoRepoStrongRef.Main
-  [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.record#main' ||
-      v.$type === 'app.bsky.embed.record')
-  )
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#main', v)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
 export interface View {
+  $type?: 'app.bsky.embed.record#view'
   record:
-    | ViewRecord
-    | ViewNotFound
-    | ViewBlocked
-    | ViewDetached
-    | AppBskyFeedDefs.GeneratorView
-    | AppBskyGraphDefs.ListView
-    | AppBskyLabelerDefs.LabelerView
-    | AppBskyGraphDefs.StarterPackViewBasic
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<ViewRecord>
+    | $Typed<ViewNotFound>
+    | $Typed<ViewBlocked>
+    | $Typed<ViewDetached>
+    | $Typed<AppBskyFeedDefs.GeneratorView>
+    | $Typed<AppBskyGraphDefs.ListView>
+    | $Typed<AppBskyLabelerDefs.LabelerView>
+    | $Typed<AppBskyGraphDefs.StarterPackViewBasic>
+    | { $type: string }
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.record#view'
-  )
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#view', v)
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
 
 export interface ViewRecord {
+  $type?: 'app.bsky.embed.record#viewRecord'
   uri: string
   cid: string
   author: AppBskyActorDefs.ProfileViewBasic
   /** The record data itself. */
-  value: {}
+  value: { [_ in string]: unknown }
   labels?: ComAtprotoLabelDefs.Label[]
   replyCount?: number
   repostCount?: number
   likeCount?: number
   quoteCount?: number
   embeds?: (
-    | AppBskyEmbedImages.View
-    | AppBskyEmbedVideo.View
-    | AppBskyEmbedExternal.View
-    | View
-    | AppBskyEmbedRecordWithMedia.View
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyEmbedImages.View>
+    | $Typed<AppBskyEmbedVideo.View>
+    | $Typed<AppBskyEmbedExternal.View>
+    | $Typed<View>
+    | $Typed<AppBskyEmbedRecordWithMedia.View>
+    | { $type: string }
   )[]
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isViewRecord(v: unknown): v is ViewRecord {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewRecord'
-  )
+const hashViewRecord = 'viewRecord'
+
+export function isViewRecord<V>(v: V) {
+  return is$typed(v, id, hashViewRecord)
 }
 
-export function validateViewRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewRecord', v)
+export function validateViewRecord<V>(v: V) {
+  return validate<ViewRecord & V>(v, id, hashViewRecord)
 }
 
 export interface ViewNotFound {
+  $type?: 'app.bsky.embed.record#viewNotFound'
   uri: string
   notFound: true
-  [k: string]: unknown
 }
 
-export function isViewNotFound(v: unknown): v is ViewNotFound {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewNotFound'
-  )
+const hashViewNotFound = 'viewNotFound'
+
+export function isViewNotFound<V>(v: V) {
+  return is$typed(v, id, hashViewNotFound)
 }
 
-export function validateViewNotFound(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewNotFound', v)
+export function validateViewNotFound<V>(v: V) {
+  return validate<ViewNotFound & V>(v, id, hashViewNotFound)
 }
 
 export interface ViewBlocked {
+  $type?: 'app.bsky.embed.record#viewBlocked'
   uri: string
   blocked: true
   author: AppBskyFeedDefs.BlockedAuthor
-  [k: string]: unknown
 }
 
-export function isViewBlocked(v: unknown): v is ViewBlocked {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewBlocked'
-  )
+const hashViewBlocked = 'viewBlocked'
+
+export function isViewBlocked<V>(v: V) {
+  return is$typed(v, id, hashViewBlocked)
 }
 
-export function validateViewBlocked(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewBlocked', v)
+export function validateViewBlocked<V>(v: V) {
+  return validate<ViewBlocked & V>(v, id, hashViewBlocked)
 }
 
 export interface ViewDetached {
+  $type?: 'app.bsky.embed.record#viewDetached'
   uri: string
   detached: true
-  [k: string]: unknown
 }
 
-export function isViewDetached(v: unknown): v is ViewDetached {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewDetached'
-  )
+const hashViewDetached = 'viewDetached'
+
+export function isViewDetached<V>(v: V) {
+  return is$typed(v, id, hashViewDetached)
 }
 
-export function validateViewDetached(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewDetached', v)
+export function validateViewDetached<V>(v: V) {
+  return validate<ViewDetached & V>(v, id, hashViewDetached)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/embed/recordWithMedia.ts b/packages/ozone/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
index 4df0ee5c2d7..2c36a988cc7 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
@@ -2,55 +2,54 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyEmbedRecord from './record'
-import * as AppBskyEmbedImages from './images'
-import * as AppBskyEmbedVideo from './video'
-import * as AppBskyEmbedExternal from './external'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyEmbedRecord from './record.js'
+import type * as AppBskyEmbedImages from './images.js'
+import type * as AppBskyEmbedVideo from './video.js'
+import type * as AppBskyEmbedExternal from './external.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.embed.recordWithMedia'
 
 export interface Main {
+  $type?: 'app.bsky.embed.recordWithMedia'
   record: AppBskyEmbedRecord.Main
   media:
-    | AppBskyEmbedImages.Main
-    | AppBskyEmbedVideo.Main
-    | AppBskyEmbedExternal.Main
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<AppBskyEmbedImages.Main>
+    | $Typed<AppBskyEmbedVideo.Main>
+    | $Typed<AppBskyEmbedExternal.Main>
+    | { $type: string }
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.recordWithMedia#main' ||
-      v.$type === 'app.bsky.embed.recordWithMedia')
-  )
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.recordWithMedia#main', v)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
 export interface View {
+  $type?: 'app.bsky.embed.recordWithMedia#view'
   record: AppBskyEmbedRecord.View
   media:
-    | AppBskyEmbedImages.View
-    | AppBskyEmbedVideo.View
-    | AppBskyEmbedExternal.View
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<AppBskyEmbedImages.View>
+    | $Typed<AppBskyEmbedVideo.View>
+    | $Typed<AppBskyEmbedExternal.View>
+    | { $type: string }
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.recordWithMedia#view'
-  )
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.recordWithMedia#view', v)
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/embed/video.ts b/packages/ozone/src/lexicon/types/app/bsky/embed/video.ts
index 50eb59aa038..10e59e37539 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/embed/video.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/embed/video.ts
@@ -2,66 +2,65 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyEmbedDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyEmbedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.embed.video'
 
 export interface Main {
+  $type?: 'app.bsky.embed.video'
   video: BlobRef
   captions?: Caption[]
   /** Alt text description of the video, for accessibility. */
   alt?: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.video#main' ||
-      v.$type === 'app.bsky.embed.video')
-  )
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#main', v)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
 export interface Caption {
+  $type?: 'app.bsky.embed.video#caption'
   lang: string
   file: BlobRef
-  [k: string]: unknown
 }
 
-export function isCaption(v: unknown): v is Caption {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.video#caption'
-  )
+const hashCaption = 'caption'
+
+export function isCaption<V>(v: V) {
+  return is$typed(v, id, hashCaption)
 }
 
-export function validateCaption(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#caption', v)
+export function validateCaption<V>(v: V) {
+  return validate<Caption & V>(v, id, hashCaption)
 }
 
 export interface View {
+  $type?: 'app.bsky.embed.video#view'
   cid: string
   playlist: string
   thumbnail?: string
   alt?: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.video#view'
-  )
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#view', v)
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/defs.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/defs.ts
index fdf7e58c8a3..f94aaefa7e9 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/defs.ts
@@ -2,31 +2,36 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as AppBskyEmbedImages from '../embed/images'
-import * as AppBskyEmbedVideo from '../embed/video'
-import * as AppBskyEmbedExternal from '../embed/external'
-import * as AppBskyEmbedRecord from '../embed/record'
-import * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as AppBskyGraphDefs from '../graph/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+import type * as AppBskyEmbedImages from '../embed/images.js'
+import type * as AppBskyEmbedVideo from '../embed/video.js'
+import type * as AppBskyEmbedExternal from '../embed/external.js'
+import type * as AppBskyEmbedRecord from '../embed/record.js'
+import type * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as AppBskyRichtextFacet from '../richtext/facet.js'
+import type * as AppBskyGraphDefs from '../graph/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.defs'
 
 export interface PostView {
+  $type?: 'app.bsky.feed.defs#postView'
   uri: string
   cid: string
   author: AppBskyActorDefs.ProfileViewBasic
-  record: {}
+  record: { [_ in string]: unknown }
   embed?:
-    | AppBskyEmbedImages.View
-    | AppBskyEmbedVideo.View
-    | AppBskyEmbedExternal.View
-    | AppBskyEmbedRecord.View
-    | AppBskyEmbedRecordWithMedia.View
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyEmbedImages.View>
+    | $Typed<AppBskyEmbedVideo.View>
+    | $Typed<AppBskyEmbedExternal.View>
+    | $Typed<AppBskyEmbedRecord.View>
+    | $Typed<AppBskyEmbedRecordWithMedia.View>
+    | { $type: string }
   replyCount?: number
   repostCount?: number
   likeCount?: number
@@ -35,225 +40,207 @@ export interface PostView {
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
   threadgate?: ThreadgateView
-  [k: string]: unknown
 }
 
-export function isPostView(v: unknown): v is PostView {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.defs#postView'
-  )
+const hashPostView = 'postView'
+
+export function isPostView<V>(v: V) {
+  return is$typed(v, id, hashPostView)
 }
 
-export function validatePostView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#postView', v)
+export function validatePostView<V>(v: V) {
+  return validate<PostView & V>(v, id, hashPostView)
 }
 
 /** Metadata about the requesting account's relationship with the subject content. Only has meaningful content for authed requests. */
 export interface ViewerState {
+  $type?: 'app.bsky.feed.defs#viewerState'
   repost?: string
   like?: string
   threadMuted?: boolean
   replyDisabled?: boolean
   embeddingDisabled?: boolean
   pinned?: boolean
-  [k: string]: unknown
 }
 
-export function isViewerState(v: unknown): v is ViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#viewerState'
-  )
+const hashViewerState = 'viewerState'
+
+export function isViewerState<V>(v: V) {
+  return is$typed(v, id, hashViewerState)
 }
 
-export function validateViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#viewerState', v)
+export function validateViewerState<V>(v: V) {
+  return validate<ViewerState & V>(v, id, hashViewerState)
 }
 
 /** Metadata about this post within the context of the thread it is in. */
 export interface ThreadContext {
+  $type?: 'app.bsky.feed.defs#threadContext'
   rootAuthorLike?: string
-  [k: string]: unknown
 }
 
-export function isThreadContext(v: unknown): v is ThreadContext {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#threadContext'
-  )
+const hashThreadContext = 'threadContext'
+
+export function isThreadContext<V>(v: V) {
+  return is$typed(v, id, hashThreadContext)
 }
 
-export function validateThreadContext(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#threadContext', v)
+export function validateThreadContext<V>(v: V) {
+  return validate<ThreadContext & V>(v, id, hashThreadContext)
 }
 
 export interface FeedViewPost {
+  $type?: 'app.bsky.feed.defs#feedViewPost'
   post: PostView
   reply?: ReplyRef
-  reason?: ReasonRepost | ReasonPin | { $type: string; [k: string]: unknown }
+  reason?: $Typed<ReasonRepost> | $Typed<ReasonPin> | { $type: string }
   /** Context provided by feed generator that may be passed back alongside interactions. */
   feedContext?: string
-  [k: string]: unknown
 }
 
-export function isFeedViewPost(v: unknown): v is FeedViewPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#feedViewPost'
-  )
+const hashFeedViewPost = 'feedViewPost'
+
+export function isFeedViewPost<V>(v: V) {
+  return is$typed(v, id, hashFeedViewPost)
 }
 
-export function validateFeedViewPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#feedViewPost', v)
+export function validateFeedViewPost<V>(v: V) {
+  return validate<FeedViewPost & V>(v, id, hashFeedViewPost)
 }
 
 export interface ReplyRef {
+  $type?: 'app.bsky.feed.defs#replyRef'
   root:
-    | PostView
-    | NotFoundPost
-    | BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<PostView>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | { $type: string }
   parent:
-    | PostView
-    | NotFoundPost
-    | BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<PostView>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | { $type: string }
   grandparentAuthor?: AppBskyActorDefs.ProfileViewBasic
-  [k: string]: unknown
 }
 
-export function isReplyRef(v: unknown): v is ReplyRef {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.defs#replyRef'
-  )
+const hashReplyRef = 'replyRef'
+
+export function isReplyRef<V>(v: V) {
+  return is$typed(v, id, hashReplyRef)
 }
 
-export function validateReplyRef(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#replyRef', v)
+export function validateReplyRef<V>(v: V) {
+  return validate<ReplyRef & V>(v, id, hashReplyRef)
 }
 
 export interface ReasonRepost {
+  $type?: 'app.bsky.feed.defs#reasonRepost'
   by: AppBskyActorDefs.ProfileViewBasic
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isReasonRepost(v: unknown): v is ReasonRepost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#reasonRepost'
-  )
+const hashReasonRepost = 'reasonRepost'
+
+export function isReasonRepost<V>(v: V) {
+  return is$typed(v, id, hashReasonRepost)
 }
 
-export function validateReasonRepost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#reasonRepost', v)
+export function validateReasonRepost<V>(v: V) {
+  return validate<ReasonRepost & V>(v, id, hashReasonRepost)
 }
 
 export interface ReasonPin {
-  [k: string]: unknown
+  $type?: 'app.bsky.feed.defs#reasonPin'
 }
 
-export function isReasonPin(v: unknown): v is ReasonPin {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#reasonPin'
-  )
+const hashReasonPin = 'reasonPin'
+
+export function isReasonPin<V>(v: V) {
+  return is$typed(v, id, hashReasonPin)
 }
 
-export function validateReasonPin(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#reasonPin', v)
+export function validateReasonPin<V>(v: V) {
+  return validate<ReasonPin & V>(v, id, hashReasonPin)
 }
 
 export interface ThreadViewPost {
+  $type?: 'app.bsky.feed.defs#threadViewPost'
   post: PostView
   parent?:
-    | ThreadViewPost
-    | NotFoundPost
-    | BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ThreadViewPost>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | { $type: string }
   replies?: (
-    | ThreadViewPost
-    | NotFoundPost
-    | BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ThreadViewPost>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | { $type: string }
   )[]
   threadContext?: ThreadContext
-  [k: string]: unknown
 }
 
-export function isThreadViewPost(v: unknown): v is ThreadViewPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#threadViewPost'
-  )
+const hashThreadViewPost = 'threadViewPost'
+
+export function isThreadViewPost<V>(v: V) {
+  return is$typed(v, id, hashThreadViewPost)
 }
 
-export function validateThreadViewPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#threadViewPost', v)
+export function validateThreadViewPost<V>(v: V) {
+  return validate<ThreadViewPost & V>(v, id, hashThreadViewPost)
 }
 
 export interface NotFoundPost {
+  $type?: 'app.bsky.feed.defs#notFoundPost'
   uri: string
   notFound: true
-  [k: string]: unknown
 }
 
-export function isNotFoundPost(v: unknown): v is NotFoundPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#notFoundPost'
-  )
+const hashNotFoundPost = 'notFoundPost'
+
+export function isNotFoundPost<V>(v: V) {
+  return is$typed(v, id, hashNotFoundPost)
 }
 
-export function validateNotFoundPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#notFoundPost', v)
+export function validateNotFoundPost<V>(v: V) {
+  return validate<NotFoundPost & V>(v, id, hashNotFoundPost)
 }
 
 export interface BlockedPost {
+  $type?: 'app.bsky.feed.defs#blockedPost'
   uri: string
   blocked: true
   author: BlockedAuthor
-  [k: string]: unknown
 }
 
-export function isBlockedPost(v: unknown): v is BlockedPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#blockedPost'
-  )
+const hashBlockedPost = 'blockedPost'
+
+export function isBlockedPost<V>(v: V) {
+  return is$typed(v, id, hashBlockedPost)
 }
 
-export function validateBlockedPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#blockedPost', v)
+export function validateBlockedPost<V>(v: V) {
+  return validate<BlockedPost & V>(v, id, hashBlockedPost)
 }
 
 export interface BlockedAuthor {
+  $type?: 'app.bsky.feed.defs#blockedAuthor'
   did: string
   viewer?: AppBskyActorDefs.ViewerState
-  [k: string]: unknown
 }
 
-export function isBlockedAuthor(v: unknown): v is BlockedAuthor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#blockedAuthor'
-  )
+const hashBlockedAuthor = 'blockedAuthor'
+
+export function isBlockedAuthor<V>(v: V) {
+  return is$typed(v, id, hashBlockedAuthor)
 }
 
-export function validateBlockedAuthor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#blockedAuthor', v)
+export function validateBlockedAuthor<V>(v: V) {
+  return validate<BlockedAuthor & V>(v, id, hashBlockedAuthor)
 }
 
 export interface GeneratorView {
+  $type?: 'app.bsky.feed.defs#generatorView'
   uri: string
   cid: string
   did: string
@@ -271,115 +258,103 @@ export interface GeneratorView {
     | 'app.bsky.feed.defs#contentModeVideo'
     | (string & {})
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isGeneratorView(v: unknown): v is GeneratorView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#generatorView'
-  )
+const hashGeneratorView = 'generatorView'
+
+export function isGeneratorView<V>(v: V) {
+  return is$typed(v, id, hashGeneratorView)
 }
 
-export function validateGeneratorView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#generatorView', v)
+export function validateGeneratorView<V>(v: V) {
+  return validate<GeneratorView & V>(v, id, hashGeneratorView)
 }
 
 export interface GeneratorViewerState {
+  $type?: 'app.bsky.feed.defs#generatorViewerState'
   like?: string
-  [k: string]: unknown
 }
 
-export function isGeneratorViewerState(v: unknown): v is GeneratorViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#generatorViewerState'
-  )
+const hashGeneratorViewerState = 'generatorViewerState'
+
+export function isGeneratorViewerState<V>(v: V) {
+  return is$typed(v, id, hashGeneratorViewerState)
 }
 
-export function validateGeneratorViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#generatorViewerState', v)
+export function validateGeneratorViewerState<V>(v: V) {
+  return validate<GeneratorViewerState & V>(v, id, hashGeneratorViewerState)
 }
 
 export interface SkeletonFeedPost {
+  $type?: 'app.bsky.feed.defs#skeletonFeedPost'
   post: string
   reason?:
-    | SkeletonReasonRepost
-    | SkeletonReasonPin
-    | { $type: string; [k: string]: unknown }
+    | $Typed<SkeletonReasonRepost>
+    | $Typed<SkeletonReasonPin>
+    | { $type: string }
   /** Context that will be passed through to client and may be passed to feed generator back alongside interactions. */
   feedContext?: string
-  [k: string]: unknown
 }
 
-export function isSkeletonFeedPost(v: unknown): v is SkeletonFeedPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonFeedPost'
-  )
+const hashSkeletonFeedPost = 'skeletonFeedPost'
+
+export function isSkeletonFeedPost<V>(v: V) {
+  return is$typed(v, id, hashSkeletonFeedPost)
 }
 
-export function validateSkeletonFeedPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonFeedPost', v)
+export function validateSkeletonFeedPost<V>(v: V) {
+  return validate<SkeletonFeedPost & V>(v, id, hashSkeletonFeedPost)
 }
 
 export interface SkeletonReasonRepost {
+  $type?: 'app.bsky.feed.defs#skeletonReasonRepost'
   repost: string
-  [k: string]: unknown
 }
 
-export function isSkeletonReasonRepost(v: unknown): v is SkeletonReasonRepost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonReasonRepost'
-  )
+const hashSkeletonReasonRepost = 'skeletonReasonRepost'
+
+export function isSkeletonReasonRepost<V>(v: V) {
+  return is$typed(v, id, hashSkeletonReasonRepost)
 }
 
-export function validateSkeletonReasonRepost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonReasonRepost', v)
+export function validateSkeletonReasonRepost<V>(v: V) {
+  return validate<SkeletonReasonRepost & V>(v, id, hashSkeletonReasonRepost)
 }
 
 export interface SkeletonReasonPin {
-  [k: string]: unknown
+  $type?: 'app.bsky.feed.defs#skeletonReasonPin'
 }
 
-export function isSkeletonReasonPin(v: unknown): v is SkeletonReasonPin {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonReasonPin'
-  )
+const hashSkeletonReasonPin = 'skeletonReasonPin'
+
+export function isSkeletonReasonPin<V>(v: V) {
+  return is$typed(v, id, hashSkeletonReasonPin)
 }
 
-export function validateSkeletonReasonPin(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonReasonPin', v)
+export function validateSkeletonReasonPin<V>(v: V) {
+  return validate<SkeletonReasonPin & V>(v, id, hashSkeletonReasonPin)
 }
 
 export interface ThreadgateView {
+  $type?: 'app.bsky.feed.defs#threadgateView'
   uri?: string
   cid?: string
-  record?: {}
+  record?: { [_ in string]: unknown }
   lists?: AppBskyGraphDefs.ListViewBasic[]
-  [k: string]: unknown
 }
 
-export function isThreadgateView(v: unknown): v is ThreadgateView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#threadgateView'
-  )
+const hashThreadgateView = 'threadgateView'
+
+export function isThreadgateView<V>(v: V) {
+  return is$typed(v, id, hashThreadgateView)
 }
 
-export function validateThreadgateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#threadgateView', v)
+export function validateThreadgateView<V>(v: V) {
+  return validate<ThreadgateView & V>(v, id, hashThreadgateView)
 }
 
 export interface Interaction {
+  $type?: 'app.bsky.feed.defs#interaction'
   item?: string
   event?:
     | 'app.bsky.feed.defs#requestLess'
@@ -397,47 +372,43 @@ export interface Interaction {
     | (string & {})
   /** Context on a feed item that was originally supplied by the feed generator on getFeedSkeleton. */
   feedContext?: string
-  [k: string]: unknown
 }
 
-export function isInteraction(v: unknown): v is Interaction {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#interaction'
-  )
+const hashInteraction = 'interaction'
+
+export function isInteraction<V>(v: V) {
+  return is$typed(v, id, hashInteraction)
 }
 
-export function validateInteraction(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#interaction', v)
+export function validateInteraction<V>(v: V) {
+  return validate<Interaction & V>(v, id, hashInteraction)
 }
 
 /** Request that less content like the given feed item be shown in the feed */
-export const REQUESTLESS = 'app.bsky.feed.defs#requestLess'
+export const REQUESTLESS = `${id}#requestLess`
 /** Request that more content like the given feed item be shown in the feed */
-export const REQUESTMORE = 'app.bsky.feed.defs#requestMore'
+export const REQUESTMORE = `${id}#requestMore`
 /** User clicked through to the feed item */
-export const CLICKTHROUGHITEM = 'app.bsky.feed.defs#clickthroughItem'
+export const CLICKTHROUGHITEM = `${id}#clickthroughItem`
 /** User clicked through to the author of the feed item */
-export const CLICKTHROUGHAUTHOR = 'app.bsky.feed.defs#clickthroughAuthor'
+export const CLICKTHROUGHAUTHOR = `${id}#clickthroughAuthor`
 /** User clicked through to the reposter of the feed item */
-export const CLICKTHROUGHREPOSTER = 'app.bsky.feed.defs#clickthroughReposter'
+export const CLICKTHROUGHREPOSTER = `${id}#clickthroughReposter`
 /** User clicked through to the embedded content of the feed item */
-export const CLICKTHROUGHEMBED = 'app.bsky.feed.defs#clickthroughEmbed'
+export const CLICKTHROUGHEMBED = `${id}#clickthroughEmbed`
 /** Declares the feed generator returns any types of posts. */
-export const CONTENTMODEUNSPECIFIED =
-  'app.bsky.feed.defs#contentModeUnspecified'
+export const CONTENTMODEUNSPECIFIED = `${id}#contentModeUnspecified`
 /** Declares the feed generator returns posts containing app.bsky.embed.video embeds. */
-export const CONTENTMODEVIDEO = 'app.bsky.feed.defs#contentModeVideo'
+export const CONTENTMODEVIDEO = `${id}#contentModeVideo`
 /** Feed item was seen by user */
-export const INTERACTIONSEEN = 'app.bsky.feed.defs#interactionSeen'
+export const INTERACTIONSEEN = `${id}#interactionSeen`
 /** User liked the feed item */
-export const INTERACTIONLIKE = 'app.bsky.feed.defs#interactionLike'
+export const INTERACTIONLIKE = `${id}#interactionLike`
 /** User reposted the feed item */
-export const INTERACTIONREPOST = 'app.bsky.feed.defs#interactionRepost'
+export const INTERACTIONREPOST = `${id}#interactionRepost`
 /** User replied to the feed item */
-export const INTERACTIONREPLY = 'app.bsky.feed.defs#interactionReply'
+export const INTERACTIONREPLY = `${id}#interactionReply`
 /** User quoted the feed item */
-export const INTERACTIONQUOTE = 'app.bsky.feed.defs#interactionQuote'
+export const INTERACTIONQUOTE = `${id}#interactionQuote`
 /** User shared the feed item */
-export const INTERACTIONSHARE = 'app.bsky.feed.defs#interactionShare'
+export const INTERACTIONSHARE = `${id}#interactionShare`
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
index 0a7d253ce8f..e3f17221cb1 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.describeFeedGenerator'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -16,7 +20,6 @@ export interface OutputSchema {
   did: string
   feeds: Feed[]
   links?: Links
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -46,36 +49,32 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Feed {
+  $type?: 'app.bsky.feed.describeFeedGenerator#feed'
   uri: string
-  [k: string]: unknown
 }
 
-export function isFeed(v: unknown): v is Feed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.describeFeedGenerator#feed'
-  )
+const hashFeed = 'feed'
+
+export function isFeed<V>(v: V) {
+  return is$typed(v, id, hashFeed)
 }
 
-export function validateFeed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.describeFeedGenerator#feed', v)
+export function validateFeed<V>(v: V) {
+  return validate<Feed & V>(v, id, hashFeed)
 }
 
 export interface Links {
+  $type?: 'app.bsky.feed.describeFeedGenerator#links'
   privacyPolicy?: string
   termsOfService?: string
-  [k: string]: unknown
 }
 
-export function isLinks(v: unknown): v is Links {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.describeFeedGenerator#links'
-  )
+const hashLinks = 'links'
+
+export function isLinks<V>(v: V) {
+  return is$typed(v, id, hashLinks)
 }
 
-export function validateLinks(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.describeFeedGenerator#links', v)
+export function validateLinks<V>(v: V) {
+  return validate<Links & V>(v, id, hashLinks)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/generator.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/generator.ts
index 482c7a7444e..3cddbae534b 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/generator.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/generator.ts
@@ -2,13 +2,18 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyRichtextFacet from '../richtext/facet.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.generator'
 
 export interface Record {
+  $type: 'app.bsky.feed.generator'
   did: string
   displayName: string
   description?: string
@@ -16,9 +21,7 @@ export interface Record {
   avatar?: BlobRef
   /** Declaration that a feed accepts feedback interactions from a client through app.bsky.feed.sendInteractions */
   acceptsInteractions?: boolean
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   contentMode?:
     | 'app.bsky.feed.defs#contentModeUnspecified'
     | 'app.bsky.feed.defs#contentModeVideo'
@@ -27,15 +30,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.generator#main' ||
-      v.$type === 'app.bsky.feed.generator')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.generator#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getActorFeeds.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
index 6af507c6e03..a2b257745b9 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getActorFeeds'
 
 export interface QueryParams {
   actor: string
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feeds: AppBskyFeedDefs.GeneratorView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getActorLikes.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getActorLikes.ts
index daf5060c8d2..b307c83b22d 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getActorLikes.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getActorLikes.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getActorLikes'
 
 export interface QueryParams {
   actor: string
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
index 2a14f45d6da..4d8b4098b77 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getAuthorFeed'
 
 export interface QueryParams {
   actor: string
@@ -29,7 +33,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeed.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeed.ts
index 5014c102155..593d3b63743 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeed.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeed.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getFeed'
 
 export interface QueryParams {
   feed: string
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
index 2b99efa318d..05ac731498e 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getFeedGenerator'
 
 export interface QueryParams {
   /** AT-URI of the feed generator record. */
@@ -22,7 +26,6 @@ export interface OutputSchema {
   isOnline: boolean
   /** Indicates whether the feed generator service is compatible with the record declaration. */
   isValid: boolean
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
index 2dd6f136f17..72a00cb2dd1 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getFeedGenerators'
 
 export interface QueryParams {
   feeds: string[]
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   feeds: AppBskyFeedDefs.GeneratorView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
index cd69f1a10b8..1f231dac80a 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getFeedSkeleton'
 
 export interface QueryParams {
   /** Reference to feed generator record describing the specific feed being requested. */
@@ -21,7 +25,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.SkeletonFeedPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getLikes.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getLikes.ts
index b035c2ea609..4b7e164cc2c 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getLikes.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getLikes.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getLikes'
 
 export interface QueryParams {
   /** AT-URI of the subject (eg, a post record). */
@@ -25,7 +29,6 @@ export interface OutputSchema {
   cid?: string
   cursor?: string
   likes: Like[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -55,18 +58,18 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Like {
+  $type?: 'app.bsky.feed.getLikes#like'
   indexedAt: string
   createdAt: string
   actor: AppBskyActorDefs.ProfileView
-  [k: string]: unknown
 }
 
-export function isLike(v: unknown): v is Like {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.getLikes#like'
-  )
+const hashLike = 'like'
+
+export function isLike<V>(v: V) {
+  return is$typed(v, id, hashLike)
 }
 
-export function validateLike(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.getLikes#like', v)
+export function validateLike<V>(v: V) {
+  return validate<Like & V>(v, id, hashLike)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getListFeed.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getListFeed.ts
index 0720feb5b6b..d131c5af040 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getListFeed.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getListFeed.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getListFeed'
 
 export interface QueryParams {
   /** Reference (AT-URI) to the list record. */
@@ -21,7 +25,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getPostThread.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getPostThread.ts
index 918faddfc1d..31e15ca72ac 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getPostThread.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getPostThread.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getPostThread'
 
 export interface QueryParams {
   /** Reference (AT-URI) to post record. */
@@ -22,12 +26,11 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   thread:
-    | AppBskyFeedDefs.ThreadViewPost
-    | AppBskyFeedDefs.NotFoundPost
-    | AppBskyFeedDefs.BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyFeedDefs.ThreadViewPost>
+    | $Typed<AppBskyFeedDefs.NotFoundPost>
+    | $Typed<AppBskyFeedDefs.BlockedPost>
+    | { $type: string }
   threadgate?: AppBskyFeedDefs.ThreadgateView
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getPosts.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getPosts.ts
index b7048083583..84dedf5816e 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getPosts.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getPosts.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getPosts'
 
 export interface QueryParams {
   /** List of post AT-URIs to return hydrated views for. */
@@ -18,7 +22,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   posts: AppBskyFeedDefs.PostView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getQuotes.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getQuotes.ts
index 23c7dd831f0..94a7b53c177 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getQuotes.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getQuotes.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getQuotes'
 
 export interface QueryParams {
   /** Reference (AT-URI) of post record */
@@ -25,7 +29,6 @@ export interface OutputSchema {
   cid?: string
   cursor?: string
   posts: AppBskyFeedDefs.PostView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getRepostedBy.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
index efae1c0b14f..81d65ae2c2b 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getRepostedBy'
 
 export interface QueryParams {
   /** Reference (AT-URI) of post record */
@@ -25,7 +29,6 @@ export interface OutputSchema {
   cid?: string
   cursor?: string
   repostedBy: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
index c660e995f9f..1dd00af2a37 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getSuggestedFeeds'
 
 export interface QueryParams {
   limit: number
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feeds: AppBskyFeedDefs.GeneratorView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getTimeline.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getTimeline.ts
index f9cd3d702c5..93f5b055b32 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getTimeline.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getTimeline.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getTimeline'
 
 export interface QueryParams {
   /** Variant 'algorithm' for timeline. Implementation-specific. NOTE: most feed flexibility has been moved to feed generator mechanism. */
@@ -21,7 +25,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/like.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/like.ts
index 1da9dd940dc..504023db951 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/like.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/like.ts
@@ -2,25 +2,28 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.like'
 
 export interface Record {
+  $type: 'app.bsky.feed.like'
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.like#main' || v.$type === 'app.bsky.feed.like')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.like#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/post.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/post.ts
index f9f2827c8d0..1c921bf4331 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/post.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/post.ts
@@ -2,19 +2,24 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as AppBskyEmbedImages from '../embed/images'
-import * as AppBskyEmbedVideo from '../embed/video'
-import * as AppBskyEmbedExternal from '../embed/external'
-import * as AppBskyEmbedRecord from '../embed/record'
-import * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyRichtextFacet from '../richtext/facet.js'
+import type * as AppBskyEmbedImages from '../embed/images.js'
+import type * as AppBskyEmbedVideo from '../embed/video.js'
+import type * as AppBskyEmbedExternal from '../embed/external.js'
+import type * as AppBskyEmbedRecord from '../embed/record.js'
+import type * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.post'
 
 export interface Record {
+  $type: 'app.bsky.feed.post'
   /** The primary post content. May be an empty string, if there are embeds. */
   text: string
   /** DEPRECATED: replaced by app.bsky.richtext.facet. */
@@ -23,17 +28,15 @@ export interface Record {
   facets?: AppBskyRichtextFacet.Main[]
   reply?: ReplyRef
   embed?:
-    | AppBskyEmbedImages.Main
-    | AppBskyEmbedVideo.Main
-    | AppBskyEmbedExternal.Main
-    | AppBskyEmbedRecord.Main
-    | AppBskyEmbedRecordWithMedia.Main
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyEmbedImages.Main>
+    | $Typed<AppBskyEmbedVideo.Main>
+    | $Typed<AppBskyEmbedExternal.Main>
+    | $Typed<AppBskyEmbedRecord.Main>
+    | $Typed<AppBskyEmbedRecordWithMedia.Main>
+    | { $type: string }
   /** Indicates human language of post primary text content. */
   langs?: string[]
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   /** Additional hashtags, in addition to any included in post text and facets. */
   tags?: string[]
   /** Client-declared timestamp when this post was originally created. */
@@ -41,68 +44,64 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.post#main' || v.$type === 'app.bsky.feed.post')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
 
 export interface ReplyRef {
+  $type?: 'app.bsky.feed.post#replyRef'
   root: ComAtprotoRepoStrongRef.Main
   parent: ComAtprotoRepoStrongRef.Main
-  [k: string]: unknown
 }
 
-export function isReplyRef(v: unknown): v is ReplyRef {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.post#replyRef'
-  )
+const hashReplyRef = 'replyRef'
+
+export function isReplyRef<V>(v: V) {
+  return is$typed(v, id, hashReplyRef)
 }
 
-export function validateReplyRef(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#replyRef', v)
+export function validateReplyRef<V>(v: V) {
+  return validate<ReplyRef & V>(v, id, hashReplyRef)
 }
 
 /** Deprecated: use facets instead. */
 export interface Entity {
+  $type?: 'app.bsky.feed.post#entity'
   index: TextSlice
   /** Expected values are 'mention' and 'link'. */
   type: string
   value: string
-  [k: string]: unknown
 }
 
-export function isEntity(v: unknown): v is Entity {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.post#entity'
-  )
+const hashEntity = 'entity'
+
+export function isEntity<V>(v: V) {
+  return is$typed(v, id, hashEntity)
 }
 
-export function validateEntity(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#entity', v)
+export function validateEntity<V>(v: V) {
+  return validate<Entity & V>(v, id, hashEntity)
 }
 
 /** Deprecated. Use app.bsky.richtext instead -- A text segment. Start is inclusive, end is exclusive. Indices are for utf16-encoded strings. */
 export interface TextSlice {
+  $type?: 'app.bsky.feed.post#textSlice'
   start: number
   end: number
-  [k: string]: unknown
 }
 
-export function isTextSlice(v: unknown): v is TextSlice {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.post#textSlice'
-  )
+const hashTextSlice = 'textSlice'
+
+export function isTextSlice<V>(v: V) {
+  return is$typed(v, id, hashTextSlice)
 }
 
-export function validateTextSlice(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#textSlice', v)
+export function validateTextSlice<V>(v: V) {
+  return validate<TextSlice & V>(v, id, hashTextSlice)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/postgate.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/postgate.ts
index da5d6b175b2..3bb6fa929ef 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/postgate.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/postgate.ts
@@ -2,47 +2,47 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.postgate'
 
 export interface Record {
+  $type: 'app.bsky.feed.postgate'
   createdAt: string
   /** Reference (AT-URI) to the post record. */
   post: string
   /** List of AT-URIs embedding this post that the author has detached from. */
   detachedEmbeddingUris?: string[]
   /** List of rules defining who can embed this post. If value is an empty array or is undefined, no particular rules apply and anyone can embed. */
-  embeddingRules?: (DisableRule | { $type: string; [k: string]: unknown })[]
+  embeddingRules?: ($Typed<DisableRule> | { $type: string })[]
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.postgate#main' ||
-      v.$type === 'app.bsky.feed.postgate')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.postgate#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
 
 /** Disables embedding of this post. */
 export interface DisableRule {
-  [k: string]: unknown
+  $type?: 'app.bsky.feed.postgate#disableRule'
 }
 
-export function isDisableRule(v: unknown): v is DisableRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.postgate#disableRule'
-  )
+const hashDisableRule = 'disableRule'
+
+export function isDisableRule<V>(v: V) {
+  return is$typed(v, id, hashDisableRule)
 }
 
-export function validateDisableRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.postgate#disableRule', v)
+export function validateDisableRule<V>(v: V) {
+  return validate<DisableRule & V>(v, id, hashDisableRule)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/repost.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/repost.ts
index 4c836d76e2a..00a74c8b617 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/repost.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/repost.ts
@@ -2,26 +2,28 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.repost'
 
 export interface Record {
+  $type: 'app.bsky.feed.repost'
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.repost#main' ||
-      v.$type === 'app.bsky.feed.repost')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.repost#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/searchPosts.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/searchPosts.ts
index 68e0b729b53..1f7a68d6085 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/searchPosts.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/searchPosts.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.searchPosts'
 
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
@@ -42,7 +46,6 @@ export interface OutputSchema {
   /** Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. */
   hitsTotal?: number
   posts: AppBskyFeedDefs.PostView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/sendInteractions.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/sendInteractions.ts
index b0280ad8028..e96f1a870f5 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/sendInteractions.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/sendInteractions.ts
@@ -3,22 +3,23 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.sendInteractions'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   interactions: AppBskyFeedDefs.Interaction[]
-  [k: string]: unknown
 }
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export interface HandlerInput {
   encoding: 'application/json'
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/threadgate.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/threadgate.ts
index 869b8d51d64..e15cda096aa 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/threadgate.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/threadgate.ts
@@ -2,20 +2,25 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.threadgate'
 
 export interface Record {
+  $type: 'app.bsky.feed.threadgate'
   /** Reference (AT-URI) to the post record. */
   post: string
   /** List of rules defining who can reply to this post. If value is an empty array, no one can reply. If value is undefined, anyone can reply. */
   allow?: (
-    | MentionRule
-    | FollowerRule
-    | FollowingRule
-    | ListRule
-    | { $type: string; [k: string]: unknown }
+    | $Typed<MentionRule>
+    | $Typed<FollowerRule>
+    | $Typed<FollowingRule>
+    | $Typed<ListRule>
+    | { $type: string }
   )[]
   createdAt: string
   /** List of hidden reply URIs. */
@@ -23,84 +28,73 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.threadgate#main' ||
-      v.$type === 'app.bsky.feed.threadgate')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
 
 /** Allow replies from actors mentioned in your post. */
 export interface MentionRule {
-  [k: string]: unknown
+  $type?: 'app.bsky.feed.threadgate#mentionRule'
 }
 
-export function isMentionRule(v: unknown): v is MentionRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#mentionRule'
-  )
+const hashMentionRule = 'mentionRule'
+
+export function isMentionRule<V>(v: V) {
+  return is$typed(v, id, hashMentionRule)
 }
 
-export function validateMentionRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#mentionRule', v)
+export function validateMentionRule<V>(v: V) {
+  return validate<MentionRule & V>(v, id, hashMentionRule)
 }
 
 /** Allow replies from actors who follow you. */
 export interface FollowerRule {
-  [k: string]: unknown
+  $type?: 'app.bsky.feed.threadgate#followerRule'
 }
 
-export function isFollowerRule(v: unknown): v is FollowerRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#followerRule'
-  )
+const hashFollowerRule = 'followerRule'
+
+export function isFollowerRule<V>(v: V) {
+  return is$typed(v, id, hashFollowerRule)
 }
 
-export function validateFollowerRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#followerRule', v)
+export function validateFollowerRule<V>(v: V) {
+  return validate<FollowerRule & V>(v, id, hashFollowerRule)
 }
 
 /** Allow replies from actors you follow. */
 export interface FollowingRule {
-  [k: string]: unknown
+  $type?: 'app.bsky.feed.threadgate#followingRule'
 }
 
-export function isFollowingRule(v: unknown): v is FollowingRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#followingRule'
-  )
+const hashFollowingRule = 'followingRule'
+
+export function isFollowingRule<V>(v: V) {
+  return is$typed(v, id, hashFollowingRule)
 }
 
-export function validateFollowingRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#followingRule', v)
+export function validateFollowingRule<V>(v: V) {
+  return validate<FollowingRule & V>(v, id, hashFollowingRule)
 }
 
 /** Allow replies from actors on a list. */
 export interface ListRule {
+  $type?: 'app.bsky.feed.threadgate#listRule'
   list: string
-  [k: string]: unknown
 }
 
-export function isListRule(v: unknown): v is ListRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#listRule'
-  )
+const hashListRule = 'listRule'
+
+export function isListRule<V>(v: V) {
+  return is$typed(v, id, hashListRule)
 }
 
-export function validateListRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#listRule', v)
+export function validateListRule<V>(v: V) {
+  return validate<ListRule & V>(v, id, hashListRule)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/block.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/block.ts
index b7f19f126b7..25ff38bd60d 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/block.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/block.ts
@@ -2,26 +2,28 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.block'
 
 export interface Record {
+  $type: 'app.bsky.graph.block'
   /** DID of the account to be blocked. */
   subject: string
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.block#main' ||
-      v.$type === 'app.bsky.graph.block')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.block#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/defs.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/defs.ts
index 63ecf7e00c0..bd9a4d6c07e 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/defs.ts
@@ -2,15 +2,20 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as AppBskyFeedDefs from '../feed/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+import type * as AppBskyRichtextFacet from '../richtext/facet.js'
+import type * as AppBskyFeedDefs from '../feed/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.defs'
 
 export interface ListViewBasic {
+  $type?: 'app.bsky.graph.defs#listViewBasic'
   uri: string
   cid: string
   name: string
@@ -20,22 +25,20 @@ export interface ListViewBasic {
   labels?: ComAtprotoLabelDefs.Label[]
   viewer?: ListViewerState
   indexedAt?: string
-  [k: string]: unknown
 }
 
-export function isListViewBasic(v: unknown): v is ListViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listViewBasic'
-  )
+const hashListViewBasic = 'listViewBasic'
+
+export function isListViewBasic<V>(v: V) {
+  return is$typed(v, id, hashListViewBasic)
 }
 
-export function validateListViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listViewBasic', v)
+export function validateListViewBasic<V>(v: V) {
+  return validate<ListViewBasic & V>(v, id, hashListViewBasic)
 }
 
 export interface ListView {
+  $type?: 'app.bsky.graph.defs#listView'
   uri: string
   cid: string
   creator: AppBskyActorDefs.ProfileView
@@ -48,43 +51,39 @@ export interface ListView {
   labels?: ComAtprotoLabelDefs.Label[]
   viewer?: ListViewerState
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isListView(v: unknown): v is ListView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listView'
-  )
+const hashListView = 'listView'
+
+export function isListView<V>(v: V) {
+  return is$typed(v, id, hashListView)
 }
 
-export function validateListView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listView', v)
+export function validateListView<V>(v: V) {
+  return validate<ListView & V>(v, id, hashListView)
 }
 
 export interface ListItemView {
+  $type?: 'app.bsky.graph.defs#listItemView'
   uri: string
   subject: AppBskyActorDefs.ProfileView
-  [k: string]: unknown
 }
 
-export function isListItemView(v: unknown): v is ListItemView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listItemView'
-  )
+const hashListItemView = 'listItemView'
+
+export function isListItemView<V>(v: V) {
+  return is$typed(v, id, hashListItemView)
 }
 
-export function validateListItemView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listItemView', v)
+export function validateListItemView<V>(v: V) {
+  return validate<ListItemView & V>(v, id, hashListItemView)
 }
 
 export interface StarterPackView {
+  $type?: 'app.bsky.graph.defs#starterPackView'
   uri: string
   cid: string
-  record: {}
+  record: { [_ in string]: unknown }
   creator: AppBskyActorDefs.ProfileViewBasic
   list?: ListViewBasic
   listItemsSample?: ListItemView[]
@@ -93,44 +92,39 @@ export interface StarterPackView {
   joinedAllTimeCount?: number
   labels?: ComAtprotoLabelDefs.Label[]
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isStarterPackView(v: unknown): v is StarterPackView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#starterPackView'
-  )
+const hashStarterPackView = 'starterPackView'
+
+export function isStarterPackView<V>(v: V) {
+  return is$typed(v, id, hashStarterPackView)
 }
 
-export function validateStarterPackView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#starterPackView', v)
+export function validateStarterPackView<V>(v: V) {
+  return validate<StarterPackView & V>(v, id, hashStarterPackView)
 }
 
 export interface StarterPackViewBasic {
+  $type?: 'app.bsky.graph.defs#starterPackViewBasic'
   uri: string
   cid: string
-  record: {}
+  record: { [_ in string]: unknown }
   creator: AppBskyActorDefs.ProfileViewBasic
   listItemCount?: number
   joinedWeekCount?: number
   joinedAllTimeCount?: number
   labels?: ComAtprotoLabelDefs.Label[]
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isStarterPackViewBasic(v: unknown): v is StarterPackViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#starterPackViewBasic'
-  )
+const hashStarterPackViewBasic = 'starterPackViewBasic'
+
+export function isStarterPackViewBasic<V>(v: V) {
+  return is$typed(v, id, hashStarterPackViewBasic)
 }
 
-export function validateStarterPackViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#starterPackViewBasic', v)
+export function validateStarterPackViewBasic<V>(v: V) {
+  return validate<StarterPackViewBasic & V>(v, id, hashStarterPackViewBasic)
 }
 
 export type ListPurpose =
@@ -140,67 +134,61 @@ export type ListPurpose =
   | (string & {})
 
 /** A list of actors to apply an aggregate moderation action (mute/block) on. */
-export const MODLIST = 'app.bsky.graph.defs#modlist'
+export const MODLIST = `${id}#modlist`
 /** A list of actors used for curation purposes such as list feeds or interaction gating. */
-export const CURATELIST = 'app.bsky.graph.defs#curatelist'
+export const CURATELIST = `${id}#curatelist`
 /** A list of actors used for only for reference purposes such as within a starter pack. */
-export const REFERENCELIST = 'app.bsky.graph.defs#referencelist'
+export const REFERENCELIST = `${id}#referencelist`
 
 export interface ListViewerState {
+  $type?: 'app.bsky.graph.defs#listViewerState'
   muted?: boolean
   blocked?: string
-  [k: string]: unknown
 }
 
-export function isListViewerState(v: unknown): v is ListViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listViewerState'
-  )
+const hashListViewerState = 'listViewerState'
+
+export function isListViewerState<V>(v: V) {
+  return is$typed(v, id, hashListViewerState)
 }
 
-export function validateListViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listViewerState', v)
+export function validateListViewerState<V>(v: V) {
+  return validate<ListViewerState & V>(v, id, hashListViewerState)
 }
 
 /** indicates that a handle or DID could not be resolved */
 export interface NotFoundActor {
+  $type?: 'app.bsky.graph.defs#notFoundActor'
   actor: string
   notFound: true
-  [k: string]: unknown
 }
 
-export function isNotFoundActor(v: unknown): v is NotFoundActor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#notFoundActor'
-  )
+const hashNotFoundActor = 'notFoundActor'
+
+export function isNotFoundActor<V>(v: V) {
+  return is$typed(v, id, hashNotFoundActor)
 }
 
-export function validateNotFoundActor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#notFoundActor', v)
+export function validateNotFoundActor<V>(v: V) {
+  return validate<NotFoundActor & V>(v, id, hashNotFoundActor)
 }
 
 /** lists the bi-directional graph relationships between one actor (not indicated in the object), and the target actors (the DID included in the object) */
 export interface Relationship {
+  $type?: 'app.bsky.graph.defs#relationship'
   did: string
   /** if the actor follows this DID, this is the AT-URI of the follow record */
   following?: string
   /** if the actor is followed by this DID, contains the AT-URI of the follow record */
   followedBy?: string
-  [k: string]: unknown
 }
 
-export function isRelationship(v: unknown): v is Relationship {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#relationship'
-  )
+const hashRelationship = 'relationship'
+
+export function isRelationship<V>(v: V) {
+  return is$typed(v, id, hashRelationship)
 }
 
-export function validateRelationship(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#relationship', v)
+export function validateRelationship<V>(v: V) {
+  return validate<Relationship & V>(v, id, hashRelationship)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/follow.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/follow.ts
index 4b74a58a5df..79478d39135 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/follow.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/follow.ts
@@ -2,25 +2,27 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.follow'
 
 export interface Record {
+  $type: 'app.bsky.graph.follow'
   subject: string
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.follow#main' ||
-      v.$type === 'app.bsky.graph.follow')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.follow#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
index 352c542990f..2e55945485a 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getActorStarterPacks'
 
 export interface QueryParams {
   actor: string
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   starterPacks: AppBskyGraphDefs.StarterPackViewBasic[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getBlocks.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getBlocks.ts
index 1fdd49c6831..dddd7a555a9 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getBlocks.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getBlocks.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getBlocks'
 
 export interface QueryParams {
   limit: number
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   blocks: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getFollowers.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getFollowers.ts
index 1f348e97d20..e631e3313ce 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getFollowers.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getFollowers.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getFollowers'
 
 export interface QueryParams {
   actor: string
@@ -21,7 +25,6 @@ export interface OutputSchema {
   subject: AppBskyActorDefs.ProfileView
   cursor?: string
   followers: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getFollows.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getFollows.ts
index a9664991c88..efd34eaedaa 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getFollows.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getFollows.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getFollows'
 
 export interface QueryParams {
   actor: string
@@ -21,7 +25,6 @@ export interface OutputSchema {
   subject: AppBskyActorDefs.ProfileView
   cursor?: string
   follows: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
index 1f348e97d20..92562abea9a 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getKnownFollowers'
 
 export interface QueryParams {
   actor: string
@@ -21,7 +25,6 @@ export interface OutputSchema {
   subject: AppBskyActorDefs.ProfileView
   cursor?: string
   followers: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getList.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getList.ts
index a8408edd622..eba37cede07 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getList.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getList.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getList'
 
 export interface QueryParams {
   /** Reference (AT-URI) of the list record to hydrate. */
@@ -22,7 +26,6 @@ export interface OutputSchema {
   cursor?: string
   list: AppBskyGraphDefs.ListView
   items: AppBskyGraphDefs.ListItemView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getListBlocks.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getListBlocks.ts
index 728892f4379..0918ecbac30 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getListBlocks.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getListBlocks.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getListBlocks'
 
 export interface QueryParams {
   limit: number
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   lists: AppBskyGraphDefs.ListView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getListMutes.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getListMutes.ts
index 728892f4379..d5ff5158769 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getListMutes.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getListMutes.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getListMutes'
 
 export interface QueryParams {
   limit: number
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   lists: AppBskyGraphDefs.ListView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getLists.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getLists.ts
index 0ed8abc586e..854fc9534f9 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getLists.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getLists.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getLists'
 
 export interface QueryParams {
   /** The account (actor) to enumerate lists from. */
@@ -21,7 +25,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   lists: AppBskyGraphDefs.ListView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getMutes.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getMutes.ts
index 45c7966644e..e1c5615e412 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getMutes.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getMutes.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getMutes'
 
 export interface QueryParams {
   limit: number
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   mutes: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getRelationships.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getRelationships.ts
index 677c8815d43..adff220f8ed 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getRelationships.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getRelationships.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getRelationships'
 
 export interface QueryParams {
   /** Primary account requesting relationships for. */
@@ -21,11 +25,10 @@ export type InputSchema = undefined
 export interface OutputSchema {
   actor?: string
   relationships: (
-    | AppBskyGraphDefs.Relationship
-    | AppBskyGraphDefs.NotFoundActor
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyGraphDefs.Relationship>
+    | $Typed<AppBskyGraphDefs.NotFoundActor>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPack.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPack.ts
index bbf8a537da0..a7e7e479201 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPack.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPack.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getStarterPack'
 
 export interface QueryParams {
   /** Reference (AT-URI) of the starter pack record. */
@@ -18,7 +22,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   starterPack: AppBskyGraphDefs.StarterPackView
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPacks.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
index 1ea054400b3..9b99308dba9 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getStarterPacks'
 
 export interface QueryParams {
   uris: string[]
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   starterPacks: AppBskyGraphDefs.StarterPackViewBasic[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
index 8736dc71b45..098070d2da7 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getSuggestedFollowsByActor'
 
 export interface QueryParams {
   actor: string
@@ -21,7 +25,6 @@ export interface OutputSchema {
   isFallback?: boolean
   /** Snowflake for this recommendation, use when submitting recommendation events. */
   recId?: number
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/list.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/list.ts
index 91c8ccee5bb..f899e73317a 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/list.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/list.ts
@@ -2,36 +2,36 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyGraphDefs from './defs'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyGraphDefs from './defs.js'
+import type * as AppBskyRichtextFacet from '../richtext/facet.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.list'
 
 export interface Record {
+  $type: 'app.bsky.graph.list'
   purpose: AppBskyGraphDefs.ListPurpose
   /** Display name for list; can not be empty. */
   name: string
   description?: string
   descriptionFacets?: AppBskyRichtextFacet.Main[]
   avatar?: BlobRef
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.list#main' ||
-      v.$type === 'app.bsky.graph.list')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.list#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/listblock.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/listblock.ts
index 592778c7a51..05a204fa3b5 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/listblock.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/listblock.ts
@@ -2,26 +2,28 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.listblock'
 
 export interface Record {
+  $type: 'app.bsky.graph.listblock'
   /** Reference (AT-URI) to the mod list record. */
   subject: string
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.listblock#main' ||
-      v.$type === 'app.bsky.graph.listblock')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.listblock#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/listitem.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/listitem.ts
index 5e93b34a111..46e0ccbf206 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/listitem.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/listitem.ts
@@ -2,11 +2,16 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.listitem'
 
 export interface Record {
+  $type: 'app.bsky.graph.listitem'
   /** The account which is included on the list. */
   subject: string
   /** Reference (AT-URI) to the list record (app.bsky.graph.list). */
@@ -15,15 +20,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.listitem#main' ||
-      v.$type === 'app.bsky.graph.listitem')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.listitem#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/muteActor.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/muteActor.ts
index 7d0057721d6..5b76c3eb88f 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/muteActor.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/muteActor.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.muteActor'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   actor: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/muteActorList.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/muteActorList.ts
index 1d80ac0d3db..62be146bdff 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/muteActorList.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/muteActorList.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.muteActorList'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   list: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/muteThread.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/muteThread.ts
index 659ced88112..bc9f0c2339d 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/muteThread.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/muteThread.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.muteThread'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   root: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
index 70bc184bb43..6ffc5517a74 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.searchStarterPacks'
 
 export interface QueryParams {
   /** Search query string. Syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
@@ -21,7 +25,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   starterPacks: AppBskyGraphDefs.StarterPackViewBasic[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/starterpack.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/starterpack.ts
index 0daf8daf688..d7761245080 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/starterpack.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/starterpack.ts
@@ -2,12 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyRichtextFacet from '../richtext/facet'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyRichtextFacet from '../richtext/facet.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.starterpack'
 
 export interface Record {
+  $type: 'app.bsky.graph.starterpack'
   /** Display name for starter pack; can not be empty. */
   name: string
   description?: string
@@ -19,32 +24,27 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.starterpack#main' ||
-      v.$type === 'app.bsky.graph.starterpack')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.starterpack#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
 
 export interface FeedItem {
+  $type?: 'app.bsky.graph.starterpack#feedItem'
   uri: string
-  [k: string]: unknown
 }
 
-export function isFeedItem(v: unknown): v is FeedItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.starterpack#feedItem'
-  )
+const hashFeedItem = 'feedItem'
+
+export function isFeedItem<V>(v: V) {
+  return is$typed(v, id, hashFeedItem)
 }
 
-export function validateFeedItem(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.starterpack#feedItem', v)
+export function validateFeedItem<V>(v: V) {
+  return validate<FeedItem & V>(v, id, hashFeedItem)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActor.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActor.ts
index 7d0057721d6..91519c3f2b3 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActor.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActor.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.unmuteActor'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   actor: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActorList.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
index 1d80ac0d3db..00e0959d70d 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.unmuteActorList'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   list: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteThread.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteThread.ts
index 659ced88112..2465768319e 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteThread.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteThread.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.unmuteThread'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   root: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/labeler/defs.ts b/packages/ozone/src/lexicon/types/app/bsky/labeler/defs.ts
index e12c7203c57..453b010db5e 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/labeler/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/labeler/defs.ts
@@ -2,13 +2,18 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.labeler.defs'
 
 export interface LabelerView {
+  $type?: 'app.bsky.labeler.defs#labelerView'
   uri: string
   cid: string
   creator: AppBskyActorDefs.ProfileView
@@ -16,22 +21,20 @@ export interface LabelerView {
   viewer?: LabelerViewerState
   indexedAt: string
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isLabelerView(v: unknown): v is LabelerView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerView'
-  )
+const hashLabelerView = 'labelerView'
+
+export function isLabelerView<V>(v: V) {
+  return is$typed(v, id, hashLabelerView)
 }
 
-export function validateLabelerView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerView', v)
+export function validateLabelerView<V>(v: V) {
+  return validate<LabelerView & V>(v, id, hashLabelerView)
 }
 
 export interface LabelerViewDetailed {
+  $type?: 'app.bsky.labeler.defs#labelerViewDetailed'
   uri: string
   cid: string
   creator: AppBskyActorDefs.ProfileView
@@ -40,54 +43,47 @@ export interface LabelerViewDetailed {
   viewer?: LabelerViewerState
   indexedAt: string
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isLabelerViewDetailed(v: unknown): v is LabelerViewDetailed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerViewDetailed'
-  )
+const hashLabelerViewDetailed = 'labelerViewDetailed'
+
+export function isLabelerViewDetailed<V>(v: V) {
+  return is$typed(v, id, hashLabelerViewDetailed)
 }
 
-export function validateLabelerViewDetailed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerViewDetailed', v)
+export function validateLabelerViewDetailed<V>(v: V) {
+  return validate<LabelerViewDetailed & V>(v, id, hashLabelerViewDetailed)
 }
 
 export interface LabelerViewerState {
+  $type?: 'app.bsky.labeler.defs#labelerViewerState'
   like?: string
-  [k: string]: unknown
 }
 
-export function isLabelerViewerState(v: unknown): v is LabelerViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerViewerState'
-  )
+const hashLabelerViewerState = 'labelerViewerState'
+
+export function isLabelerViewerState<V>(v: V) {
+  return is$typed(v, id, hashLabelerViewerState)
 }
 
-export function validateLabelerViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerViewerState', v)
+export function validateLabelerViewerState<V>(v: V) {
+  return validate<LabelerViewerState & V>(v, id, hashLabelerViewerState)
 }
 
 export interface LabelerPolicies {
+  $type?: 'app.bsky.labeler.defs#labelerPolicies'
   /** The label values which this labeler publishes. May include global or custom labels. */
   labelValues: ComAtprotoLabelDefs.LabelValue[]
   /** Label values created by this labeler and scoped exclusively to it. Labels defined here will override global label definitions for this labeler. */
   labelValueDefinitions?: ComAtprotoLabelDefs.LabelValueDefinition[]
-  [k: string]: unknown
 }
 
-export function isLabelerPolicies(v: unknown): v is LabelerPolicies {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerPolicies'
-  )
+const hashLabelerPolicies = 'labelerPolicies'
+
+export function isLabelerPolicies<V>(v: V) {
+  return is$typed(v, id, hashLabelerPolicies)
 }
 
-export function validateLabelerPolicies(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerPolicies', v)
+export function validateLabelerPolicies<V>(v: V) {
+  return validate<LabelerPolicies & V>(v, id, hashLabelerPolicies)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/labeler/getServices.ts b/packages/ozone/src/lexicon/types/app/bsky/labeler/getServices.ts
index e1d318b6177..edee111a234 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/labeler/getServices.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/labeler/getServices.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyLabelerDefs from './defs'
+import type * as AppBskyLabelerDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.labeler.getServices'
 
 export interface QueryParams {
   dids: string[]
@@ -18,11 +22,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   views: (
-    | AppBskyLabelerDefs.LabelerView
-    | AppBskyLabelerDefs.LabelerViewDetailed
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyLabelerDefs.LabelerView>
+    | $Typed<AppBskyLabelerDefs.LabelerViewDetailed>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/labeler/service.ts b/packages/ozone/src/lexicon/types/app/bsky/labeler/service.ts
index a044b8699b6..368f71e53bc 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/labeler/service.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/labeler/service.ts
@@ -2,30 +2,30 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyLabelerDefs from './defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyLabelerDefs from './defs.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.labeler.service'
 
 export interface Record {
+  $type: 'app.bsky.labeler.service'
   policies: AppBskyLabelerDefs.LabelerPolicies
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.labeler.service#main' ||
-      v.$type === 'app.bsky.labeler.service')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.service#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/notification/getUnreadCount.ts b/packages/ozone/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
index d2cff779da4..835ea895332 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.notification.getUnreadCount'
+
 export interface QueryParams {
   priority?: boolean
   seenAt?: string
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   count: number
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/notification/listNotifications.ts b/packages/ozone/src/lexicon/types/app/bsky/notification/listNotifications.ts
index 69d05288acb..de01a6b6b79 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/notification/listNotifications.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/notification/listNotifications.ts
@@ -3,12 +3,16 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.notification.listNotifications'
 
 export interface QueryParams {
   /** Notification reasons to include in response. */
@@ -26,7 +30,6 @@ export interface OutputSchema {
   notifications: Notification[]
   priority?: boolean
   seenAt?: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -56,6 +59,7 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Notification {
+  $type?: 'app.bsky.notification.listNotifications#notification'
   uri: string
   cid: string
   author: AppBskyActorDefs.ProfileView
@@ -70,24 +74,18 @@ export interface Notification {
     | 'starterpack-joined'
     | (string & {})
   reasonSubject?: string
-  record: {}
+  record: { [_ in string]: unknown }
   isRead: boolean
   indexedAt: string
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isNotification(v: unknown): v is Notification {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.notification.listNotifications#notification'
-  )
+const hashNotification = 'notification'
+
+export function isNotification<V>(v: V) {
+  return is$typed(v, id, hashNotification)
 }
 
-export function validateNotification(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'app.bsky.notification.listNotifications#notification',
-    v,
-  )
+export function validateNotification<V>(v: V) {
+  return validate<Notification & V>(v, id, hashNotification)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/notification/putPreferences.ts b/packages/ozone/src/lexicon/types/app/bsky/notification/putPreferences.ts
index 2271b658cb2..616ed6ed417 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/notification/putPreferences.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/notification/putPreferences.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.notification.putPreferences'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   priority: boolean
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/notification/registerPush.ts b/packages/ozone/src/lexicon/types/app/bsky/notification/registerPush.ts
index c4ca7104764..028b564401e 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/notification/registerPush.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/notification/registerPush.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.notification.registerPush'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -15,7 +19,6 @@ export interface InputSchema {
   token: string
   platform: 'ios' | 'android' | 'web' | (string & {})
   appId: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/notification/updateSeen.ts b/packages/ozone/src/lexicon/types/app/bsky/notification/updateSeen.ts
index 690e68dbeeb..4269de0642e 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/notification/updateSeen.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/notification/updateSeen.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.notification.updateSeen'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   seenAt: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/richtext/facet.ts b/packages/ozone/src/lexicon/types/app/bsky/richtext/facet.ts
index 139b5382caf..8085d33c8ee 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/richtext/facet.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/richtext/facet.ts
@@ -2,97 +2,92 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.richtext.facet'
 
 /** Annotation of a sub-string within rich text. */
 export interface Main {
+  $type?: 'app.bsky.richtext.facet'
   index: ByteSlice
-  features: (Mention | Link | Tag | { $type: string; [k: string]: unknown })[]
-  [k: string]: unknown
+  features: ($Typed<Mention> | $Typed<Link> | $Typed<Tag> | { $type: string })[]
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.richtext.facet#main' ||
-      v.$type === 'app.bsky.richtext.facet')
-  )
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#main', v)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
 /** Facet feature for mention of another account. The text is usually a handle, including a '@' prefix, but the facet reference is a DID. */
 export interface Mention {
+  $type?: 'app.bsky.richtext.facet#mention'
   did: string
-  [k: string]: unknown
 }
 
-export function isMention(v: unknown): v is Mention {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#mention'
-  )
+const hashMention = 'mention'
+
+export function isMention<V>(v: V) {
+  return is$typed(v, id, hashMention)
 }
 
-export function validateMention(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#mention', v)
+export function validateMention<V>(v: V) {
+  return validate<Mention & V>(v, id, hashMention)
 }
 
 /** Facet feature for a URL. The text URL may have been simplified or truncated, but the facet reference should be a complete URL. */
 export interface Link {
+  $type?: 'app.bsky.richtext.facet#link'
   uri: string
-  [k: string]: unknown
 }
 
-export function isLink(v: unknown): v is Link {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#link'
-  )
+const hashLink = 'link'
+
+export function isLink<V>(v: V) {
+  return is$typed(v, id, hashLink)
 }
 
-export function validateLink(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#link', v)
+export function validateLink<V>(v: V) {
+  return validate<Link & V>(v, id, hashLink)
 }
 
 /** Facet feature for a hashtag. The text usually includes a '#' prefix, but the facet reference should not (except in the case of 'double hash tags'). */
 export interface Tag {
+  $type?: 'app.bsky.richtext.facet#tag'
   tag: string
-  [k: string]: unknown
 }
 
-export function isTag(v: unknown): v is Tag {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.richtext.facet#tag'
-  )
+const hashTag = 'tag'
+
+export function isTag<V>(v: V) {
+  return is$typed(v, id, hashTag)
 }
 
-export function validateTag(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#tag', v)
+export function validateTag<V>(v: V) {
+  return validate<Tag & V>(v, id, hashTag)
 }
 
 /** Specifies the sub-string range a facet feature applies to. Start index is inclusive, end index is exclusive. Indices are zero-indexed, counting bytes of the UTF-8 encoded text. NOTE: some languages, like Javascript, use UTF-16 or Unicode codepoints for string slice indexing; in these languages, convert to byte arrays before working with facets. */
 export interface ByteSlice {
+  $type?: 'app.bsky.richtext.facet#byteSlice'
   byteStart: number
   byteEnd: number
-  [k: string]: unknown
 }
 
-export function isByteSlice(v: unknown): v is ByteSlice {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#byteSlice'
-  )
+const hashByteSlice = 'byteSlice'
+
+export function isByteSlice<V>(v: V) {
+  return is$typed(v, id, hashByteSlice)
 }
 
-export function validateByteSlice(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#byteSlice', v)
+export function validateByteSlice<V>(v: V) {
+  return validate<ByteSlice & V>(v, id, hashByteSlice)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/defs.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/defs.ts
index f25e35853c5..6bde35e5709 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/defs.ts
@@ -2,84 +2,77 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.defs'
 
 export interface SkeletonSearchPost {
+  $type?: 'app.bsky.unspecced.defs#skeletonSearchPost'
   uri: string
-  [k: string]: unknown
 }
 
-export function isSkeletonSearchPost(v: unknown): v is SkeletonSearchPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#skeletonSearchPost'
-  )
+const hashSkeletonSearchPost = 'skeletonSearchPost'
+
+export function isSkeletonSearchPost<V>(v: V) {
+  return is$typed(v, id, hashSkeletonSearchPost)
 }
 
-export function validateSkeletonSearchPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.unspecced.defs#skeletonSearchPost', v)
+export function validateSkeletonSearchPost<V>(v: V) {
+  return validate<SkeletonSearchPost & V>(v, id, hashSkeletonSearchPost)
 }
 
 export interface SkeletonSearchActor {
+  $type?: 'app.bsky.unspecced.defs#skeletonSearchActor'
   did: string
-  [k: string]: unknown
 }
 
-export function isSkeletonSearchActor(v: unknown): v is SkeletonSearchActor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#skeletonSearchActor'
-  )
+const hashSkeletonSearchActor = 'skeletonSearchActor'
+
+export function isSkeletonSearchActor<V>(v: V) {
+  return is$typed(v, id, hashSkeletonSearchActor)
 }
 
-export function validateSkeletonSearchActor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.unspecced.defs#skeletonSearchActor', v)
+export function validateSkeletonSearchActor<V>(v: V) {
+  return validate<SkeletonSearchActor & V>(v, id, hashSkeletonSearchActor)
 }
 
 export interface SkeletonSearchStarterPack {
+  $type?: 'app.bsky.unspecced.defs#skeletonSearchStarterPack'
   uri: string
-  [k: string]: unknown
 }
 
-export function isSkeletonSearchStarterPack(
-  v: unknown,
-): v is SkeletonSearchStarterPack {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#skeletonSearchStarterPack'
-  )
+const hashSkeletonSearchStarterPack = 'skeletonSearchStarterPack'
+
+export function isSkeletonSearchStarterPack<V>(v: V) {
+  return is$typed(v, id, hashSkeletonSearchStarterPack)
 }
 
-export function validateSkeletonSearchStarterPack(
-  v: unknown,
-): ValidationResult {
-  return lexicons.validate(
-    'app.bsky.unspecced.defs#skeletonSearchStarterPack',
+export function validateSkeletonSearchStarterPack<V>(v: V) {
+  return validate<SkeletonSearchStarterPack & V>(
     v,
+    id,
+    hashSkeletonSearchStarterPack,
   )
 }
 
 export interface TrendingTopic {
+  $type?: 'app.bsky.unspecced.defs#trendingTopic'
   topic: string
   displayName?: string
   description?: string
   link: string
-  [k: string]: unknown
 }
 
-export function isTrendingTopic(v: unknown): v is TrendingTopic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#trendingTopic'
-  )
+const hashTrendingTopic = 'trendingTopic'
+
+export function isTrendingTopic<V>(v: V) {
+  return is$typed(v, id, hashTrendingTopic)
 }
 
-export function validateTrendingTopic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.unspecced.defs#trendingTopic', v)
+export function validateTrendingTopic<V>(v: V) {
+  return validate<TrendingTopic & V>(v, id, hashTrendingTopic)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getConfig.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getConfig.ts
index e922e1f10df..c4ebde0c7bf 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getConfig.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getConfig.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.getConfig'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
 
 export interface OutputSchema {
   checkEmailConfirmed?: boolean
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
index 56ecba098be..ad662f6a41b 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from '../feed/defs'
+import type * as AppBskyFeedDefs from '../feed/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.getPopularFeedGenerators'
 
 export interface QueryParams {
   limit: number
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feeds: AppBskyFeedDefs.GeneratorView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
index 4b68e768e20..c6d9a6963c4 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyUnspeccedDefs from './defs'
+import type * as AppBskyUnspeccedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.getSuggestionsSkeleton'
 
 export interface QueryParams {
   /** DID of the account making the request (not included for public/unauthenticated queries). Used to boost followed accounts in ranking. */
@@ -27,7 +31,6 @@ export interface OutputSchema {
   relativeToDid?: string
   /** Snowflake for this recommendation, use when submitting recommendation events. */
   recId?: number
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
index 7febcd64994..bb0b8acd2b1 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.getTaggedSuggestions'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
 
 export interface OutputSchema {
   suggestions: Suggestion[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -44,23 +47,18 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Suggestion {
+  $type?: 'app.bsky.unspecced.getTaggedSuggestions#suggestion'
   tag: string
   subjectType: 'actor' | 'feed' | (string & {})
   subject: string
-  [k: string]: unknown
 }
 
-export function isSuggestion(v: unknown): v is Suggestion {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.getTaggedSuggestions#suggestion'
-  )
+const hashSuggestion = 'suggestion'
+
+export function isSuggestion<V>(v: V) {
+  return is$typed(v, id, hashSuggestion)
 }
 
-export function validateSuggestion(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'app.bsky.unspecced.getTaggedSuggestions#suggestion',
-    v,
-  )
+export function validateSuggestion<V>(v: V) {
+  return validate<Suggestion & V>(v, id, hashSuggestion)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
index 469ecd63b79..6ffd18ce20d 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyUnspeccedDefs from './defs'
+import type * as AppBskyUnspeccedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.getTrendingTopics'
 
 export interface QueryParams {
   /** DID of the account making the request (not included for public/unauthenticated queries). Used to boost followed accounts in ranking. */
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   topics: AppBskyUnspeccedDefs.TrendingTopic[]
   suggested: AppBskyUnspeccedDefs.TrendingTopic[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
index 0cb2c5e0b9c..8972f20da04 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyUnspeccedDefs from './defs'
+import type * as AppBskyUnspeccedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.searchActorsSkeleton'
 
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. For typeahead search, only simple term match is supported, not full syntax. */
@@ -28,7 +32,6 @@ export interface OutputSchema {
   /** Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. */
   hitsTotal?: number
   actors: AppBskyUnspeccedDefs.SkeletonSearchActor[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
index 00318176398..6e116ab78ba 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyUnspeccedDefs from './defs'
+import type * as AppBskyUnspeccedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.searchPostsSkeleton'
 
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
@@ -44,7 +48,6 @@ export interface OutputSchema {
   /** Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. */
   hitsTotal?: number
   posts: AppBskyUnspeccedDefs.SkeletonSearchPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
index d488cb43fed..05f18e7cc2b 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyUnspeccedDefs from './defs'
+import type * as AppBskyUnspeccedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.searchStarterPacksSkeleton'
 
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
@@ -26,7 +30,6 @@ export interface OutputSchema {
   /** Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. */
   hitsTotal?: number
   starterPacks: AppBskyUnspeccedDefs.SkeletonSearchStarterPack[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/video/defs.ts b/packages/ozone/src/lexicon/types/app/bsky/video/defs.ts
index 12f4d674794..15079613e68 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/video/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/video/defs.ts
@@ -2,11 +2,16 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.video.defs'
 
 export interface JobStatus {
+  $type?: 'app.bsky.video.defs#jobStatus'
   jobId: string
   did: string
   /** The state of the video processing job. All values not listed as a known value indicate that the job is in process. */
@@ -16,17 +21,14 @@ export interface JobStatus {
   blob?: BlobRef
   error?: string
   message?: string
-  [k: string]: unknown
 }
 
-export function isJobStatus(v: unknown): v is JobStatus {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.video.defs#jobStatus'
-  )
+const hashJobStatus = 'jobStatus'
+
+export function isJobStatus<V>(v: V) {
+  return is$typed(v, id, hashJobStatus)
 }
 
-export function validateJobStatus(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.video.defs#jobStatus', v)
+export function validateJobStatus<V>(v: V) {
+  return validate<JobStatus & V>(v, id, hashJobStatus)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/video/getJobStatus.ts b/packages/ozone/src/lexicon/types/app/bsky/video/getJobStatus.ts
index 846dbf5e0b5..8add5896050 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/video/getJobStatus.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/video/getJobStatus.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyVideoDefs from './defs'
+import type * as AppBskyVideoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.video.getJobStatus'
 
 export interface QueryParams {
   jobId: string
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   jobStatus: AppBskyVideoDefs.JobStatus
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/video/getUploadLimits.ts b/packages/ozone/src/lexicon/types/app/bsky/video/getUploadLimits.ts
index d1930430c9d..70069eaf71e 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/video/getUploadLimits.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/video/getUploadLimits.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.video.getUploadLimits'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -18,7 +22,6 @@ export interface OutputSchema {
   remainingDailyBytes?: number
   message?: string
   error?: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/video/uploadVideo.ts b/packages/ozone/src/lexicon/types/app/bsky/video/uploadVideo.ts
index 99291559507..576c84967a5 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/video/uploadVideo.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/video/uploadVideo.ts
@@ -2,13 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import stream from 'stream'
+import stream from 'node:stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyVideoDefs from './defs'
+import type * as AppBskyVideoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.video.uploadVideo'
 
 export interface QueryParams {}
 
@@ -16,7 +20,6 @@ export type InputSchema = string | Uint8Array | Blob
 
 export interface OutputSchema {
   jobStatus: AppBskyVideoDefs.JobStatus
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/actor/declaration.ts b/packages/ozone/src/lexicon/types/chat/bsky/actor/declaration.ts
index b837351c1e1..b153d13a088 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/actor/declaration.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/actor/declaration.ts
@@ -2,24 +2,26 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.actor.declaration'
 
 export interface Record {
+  $type: 'chat.bsky.actor.declaration'
   allowIncoming: 'all' | 'none' | 'following' | (string & {})
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'chat.bsky.actor.declaration#main' ||
-      v.$type === 'chat.bsky.actor.declaration')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.actor.declaration#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/actor/defs.ts b/packages/ozone/src/lexicon/types/chat/bsky/actor/defs.ts
index 8a05d480784..031c1d1a87c 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/actor/defs.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/actor/defs.ts
@@ -2,13 +2,18 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../../../app/bsky/actor/defs.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.actor.defs'
 
 export interface ProfileViewBasic {
+  $type?: 'chat.bsky.actor.defs#profileViewBasic'
   did: string
   handle: string
   displayName?: string
@@ -18,17 +23,14 @@ export interface ProfileViewBasic {
   labels?: ComAtprotoLabelDefs.Label[]
   /** Set to true when the actor cannot actively participate in converations */
   chatDisabled?: boolean
-  [k: string]: unknown
 }
 
-export function isProfileViewBasic(v: unknown): v is ProfileViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.actor.defs#profileViewBasic'
-  )
+const hashProfileViewBasic = 'profileViewBasic'
+
+export function isProfileViewBasic<V>(v: V) {
+  return is$typed(v, id, hashProfileViewBasic)
 }
 
-export function validateProfileViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.actor.defs#profileViewBasic', v)
+export function validateProfileViewBasic<V>(v: V) {
+  return validate<ProfileViewBasic & V>(v, id, hashProfileViewBasic)
 }
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/actor/deleteAccount.ts b/packages/ozone/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
index 1ae84f6c7cc..bfad6d56da6 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
@@ -3,18 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.actor.deleteAccount'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export type HandlerInput = undefined
 
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/actor/exportAccountData.ts b/packages/ozone/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
index 363a8c68b97..e97a0ede3ef 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
@@ -2,13 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import stream from 'stream'
+import stream from 'node:stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.actor.exportAccountData'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/defs.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/defs.ts
index b2452410be2..4d458fb798e 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/defs.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/defs.ts
@@ -2,215 +2,193 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyRichtextFacet from '../../../app/bsky/richtext/facet'
-import * as AppBskyEmbedRecord from '../../../app/bsky/embed/record'
-import * as ChatBskyActorDefs from '../actor/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyRichtextFacet from '../../../app/bsky/richtext/facet.js'
+import type * as AppBskyEmbedRecord from '../../../app/bsky/embed/record.js'
+import type * as ChatBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.defs'
 
 export interface MessageRef {
+  $type?: 'chat.bsky.convo.defs#messageRef'
   did: string
   convoId: string
   messageId: string
-  [k: string]: unknown
 }
 
-export function isMessageRef(v: unknown): v is MessageRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageRef'
-  )
+const hashMessageRef = 'messageRef'
+
+export function isMessageRef<V>(v: V) {
+  return is$typed(v, id, hashMessageRef)
 }
 
-export function validateMessageRef(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageRef', v)
+export function validateMessageRef<V>(v: V) {
+  return validate<MessageRef & V>(v, id, hashMessageRef)
 }
 
 export interface MessageInput {
+  $type?: 'chat.bsky.convo.defs#messageInput'
   text: string
   /** Annotations of text (mentions, URLs, hashtags, etc) */
   facets?: AppBskyRichtextFacet.Main[]
-  embed?: AppBskyEmbedRecord.Main | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+  embed?: $Typed<AppBskyEmbedRecord.Main> | { $type: string }
 }
 
-export function isMessageInput(v: unknown): v is MessageInput {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageInput'
-  )
+const hashMessageInput = 'messageInput'
+
+export function isMessageInput<V>(v: V) {
+  return is$typed(v, id, hashMessageInput)
 }
 
-export function validateMessageInput(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageInput', v)
+export function validateMessageInput<V>(v: V) {
+  return validate<MessageInput & V>(v, id, hashMessageInput)
 }
 
 export interface MessageView {
+  $type?: 'chat.bsky.convo.defs#messageView'
   id: string
   rev: string
   text: string
   /** Annotations of text (mentions, URLs, hashtags, etc) */
   facets?: AppBskyRichtextFacet.Main[]
-  embed?: AppBskyEmbedRecord.View | { $type: string; [k: string]: unknown }
+  embed?: $Typed<AppBskyEmbedRecord.View> | { $type: string }
   sender: MessageViewSender
   sentAt: string
-  [k: string]: unknown
 }
 
-export function isMessageView(v: unknown): v is MessageView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageView'
-  )
+const hashMessageView = 'messageView'
+
+export function isMessageView<V>(v: V) {
+  return is$typed(v, id, hashMessageView)
 }
 
-export function validateMessageView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageView', v)
+export function validateMessageView<V>(v: V) {
+  return validate<MessageView & V>(v, id, hashMessageView)
 }
 
 export interface DeletedMessageView {
+  $type?: 'chat.bsky.convo.defs#deletedMessageView'
   id: string
   rev: string
   sender: MessageViewSender
   sentAt: string
-  [k: string]: unknown
 }
 
-export function isDeletedMessageView(v: unknown): v is DeletedMessageView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#deletedMessageView'
-  )
+const hashDeletedMessageView = 'deletedMessageView'
+
+export function isDeletedMessageView<V>(v: V) {
+  return is$typed(v, id, hashDeletedMessageView)
 }
 
-export function validateDeletedMessageView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#deletedMessageView', v)
+export function validateDeletedMessageView<V>(v: V) {
+  return validate<DeletedMessageView & V>(v, id, hashDeletedMessageView)
 }
 
 export interface MessageViewSender {
+  $type?: 'chat.bsky.convo.defs#messageViewSender'
   did: string
-  [k: string]: unknown
 }
 
-export function isMessageViewSender(v: unknown): v is MessageViewSender {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageViewSender'
-  )
+const hashMessageViewSender = 'messageViewSender'
+
+export function isMessageViewSender<V>(v: V) {
+  return is$typed(v, id, hashMessageViewSender)
 }
 
-export function validateMessageViewSender(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageViewSender', v)
+export function validateMessageViewSender<V>(v: V) {
+  return validate<MessageViewSender & V>(v, id, hashMessageViewSender)
 }
 
 export interface ConvoView {
+  $type?: 'chat.bsky.convo.defs#convoView'
   id: string
   rev: string
   members: ChatBskyActorDefs.ProfileViewBasic[]
   lastMessage?:
-    | MessageView
-    | DeletedMessageView
-    | { $type: string; [k: string]: unknown }
+    | $Typed<MessageView>
+    | $Typed<DeletedMessageView>
+    | { $type: string }
   muted: boolean
   opened?: boolean
   unreadCount: number
-  [k: string]: unknown
 }
 
-export function isConvoView(v: unknown): v is ConvoView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#convoView'
-  )
+const hashConvoView = 'convoView'
+
+export function isConvoView<V>(v: V) {
+  return is$typed(v, id, hashConvoView)
 }
 
-export function validateConvoView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#convoView', v)
+export function validateConvoView<V>(v: V) {
+  return validate<ConvoView & V>(v, id, hashConvoView)
 }
 
 export interface LogBeginConvo {
+  $type?: 'chat.bsky.convo.defs#logBeginConvo'
   rev: string
   convoId: string
-  [k: string]: unknown
 }
 
-export function isLogBeginConvo(v: unknown): v is LogBeginConvo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logBeginConvo'
-  )
+const hashLogBeginConvo = 'logBeginConvo'
+
+export function isLogBeginConvo<V>(v: V) {
+  return is$typed(v, id, hashLogBeginConvo)
 }
 
-export function validateLogBeginConvo(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logBeginConvo', v)
+export function validateLogBeginConvo<V>(v: V) {
+  return validate<LogBeginConvo & V>(v, id, hashLogBeginConvo)
 }
 
 export interface LogLeaveConvo {
+  $type?: 'chat.bsky.convo.defs#logLeaveConvo'
   rev: string
   convoId: string
-  [k: string]: unknown
 }
 
-export function isLogLeaveConvo(v: unknown): v is LogLeaveConvo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logLeaveConvo'
-  )
+const hashLogLeaveConvo = 'logLeaveConvo'
+
+export function isLogLeaveConvo<V>(v: V) {
+  return is$typed(v, id, hashLogLeaveConvo)
 }
 
-export function validateLogLeaveConvo(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logLeaveConvo', v)
+export function validateLogLeaveConvo<V>(v: V) {
+  return validate<LogLeaveConvo & V>(v, id, hashLogLeaveConvo)
 }
 
 export interface LogCreateMessage {
+  $type?: 'chat.bsky.convo.defs#logCreateMessage'
   rev: string
   convoId: string
-  message:
-    | MessageView
-    | DeletedMessageView
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+  message: $Typed<MessageView> | $Typed<DeletedMessageView> | { $type: string }
 }
 
-export function isLogCreateMessage(v: unknown): v is LogCreateMessage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logCreateMessage'
-  )
+const hashLogCreateMessage = 'logCreateMessage'
+
+export function isLogCreateMessage<V>(v: V) {
+  return is$typed(v, id, hashLogCreateMessage)
 }
 
-export function validateLogCreateMessage(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logCreateMessage', v)
+export function validateLogCreateMessage<V>(v: V) {
+  return validate<LogCreateMessage & V>(v, id, hashLogCreateMessage)
 }
 
 export interface LogDeleteMessage {
+  $type?: 'chat.bsky.convo.defs#logDeleteMessage'
   rev: string
   convoId: string
-  message:
-    | MessageView
-    | DeletedMessageView
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+  message: $Typed<MessageView> | $Typed<DeletedMessageView> | { $type: string }
 }
 
-export function isLogDeleteMessage(v: unknown): v is LogDeleteMessage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logDeleteMessage'
-  )
+const hashLogDeleteMessage = 'logDeleteMessage'
+
+export function isLogDeleteMessage<V>(v: V) {
+  return is$typed(v, id, hashLogDeleteMessage)
 }
 
-export function validateLogDeleteMessage(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logDeleteMessage', v)
+export function validateLogDeleteMessage<V>(v: V) {
+  return validate<LogDeleteMessage & V>(v, id, hashLogDeleteMessage)
 }
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
index 2a70c63df4f..5a75ca53e09 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.deleteMessageForSelf'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
   messageId: string
-  [k: string]: unknown
 }
 
 export type OutputSchema = ChatBskyConvoDefs.DeletedMessageView
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvo.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvo.ts
index e6d1a651280..e0f3ed80b2a 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvo.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvo.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.getConvo'
 
 export interface QueryParams {
   convoId: string
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
index 0062e2230e6..0b085f06893 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.getConvoForMembers'
 
 export interface QueryParams {
   members: string[]
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/getLog.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/getLog.ts
index 2d1354f09bd..d439c2eabfb 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/getLog.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/getLog.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.getLog'
 
 export interface QueryParams {
   cursor?: string
@@ -18,13 +22,12 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   logs: (
-    | ChatBskyConvoDefs.LogBeginConvo
-    | ChatBskyConvoDefs.LogLeaveConvo
-    | ChatBskyConvoDefs.LogCreateMessage
-    | ChatBskyConvoDefs.LogDeleteMessage
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ChatBskyConvoDefs.LogBeginConvo>
+    | $Typed<ChatBskyConvoDefs.LogLeaveConvo>
+    | $Typed<ChatBskyConvoDefs.LogCreateMessage>
+    | $Typed<ChatBskyConvoDefs.LogDeleteMessage>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/getMessages.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/getMessages.ts
index 689dd4539dd..8c2c327986c 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/getMessages.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/getMessages.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.getMessages'
 
 export interface QueryParams {
   convoId: string
@@ -20,11 +24,10 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   messages: (
-    | ChatBskyConvoDefs.MessageView
-    | ChatBskyConvoDefs.DeletedMessageView
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ChatBskyConvoDefs.MessageView>
+    | $Typed<ChatBskyConvoDefs.DeletedMessageView>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/leaveConvo.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
index 99af5702e29..d7c557469dc 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
@@ -3,22 +3,24 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.leaveConvo'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convoId: string
   rev: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/listConvos.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/listConvos.ts
index 5e9a3dad264..2db1d29308f 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/listConvos.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/listConvos.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.listConvos'
 
 export interface QueryParams {
   limit: number
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   convos: ChatBskyConvoDefs.ConvoView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/muteConvo.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/muteConvo.ts
index 4d39442ff86..3b843c62122 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/muteConvo.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/muteConvo.ts
@@ -3,22 +3,24 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.muteConvo'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessage.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessage.ts
index 94acb7f018d..d8ebca50f53 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessage.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessage.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.sendMessage'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
   message: ChatBskyConvoDefs.MessageInput
-  [k: string]: unknown
 }
 
 export type OutputSchema = ChatBskyConvoDefs.MessageView
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
index 29556e52e7a..9c2e1a22623 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
@@ -3,22 +3,24 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.sendMessageBatch'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   items: BatchItem[]
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   items: ChatBskyConvoDefs.MessageView[]
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
@@ -51,19 +53,17 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface BatchItem {
+  $type?: 'chat.bsky.convo.sendMessageBatch#batchItem'
   convoId: string
   message: ChatBskyConvoDefs.MessageInput
-  [k: string]: unknown
 }
 
-export function isBatchItem(v: unknown): v is BatchItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.sendMessageBatch#batchItem'
-  )
+const hashBatchItem = 'batchItem'
+
+export function isBatchItem<V>(v: V) {
+  return is$typed(v, id, hashBatchItem)
 }
 
-export function validateBatchItem(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.sendMessageBatch#batchItem', v)
+export function validateBatchItem<V>(v: V) {
+  return validate<BatchItem & V>(v, id, hashBatchItem)
 }
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
index 4d39442ff86..cc29f5bb24e 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
@@ -3,22 +3,24 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.unmuteConvo'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/updateRead.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/updateRead.ts
index 6aa23309332..f4f12cd7789 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/updateRead.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/updateRead.ts
@@ -3,23 +3,25 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.updateRead'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
   messageId?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts b/packages/ozone/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
index f99260a1b85..5c24a50c5b5 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.moderation.getActorMetadata'
+
 export interface QueryParams {
   actor: string
 }
@@ -18,7 +22,6 @@ export interface OutputSchema {
   day: Metadata
   month: Metadata
   all: Metadata
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -48,21 +51,19 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Metadata {
+  $type?: 'chat.bsky.moderation.getActorMetadata#metadata'
   messagesSent: number
   messagesReceived: number
   convos: number
   convosStarted: number
-  [k: string]: unknown
 }
 
-export function isMetadata(v: unknown): v is Metadata {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.moderation.getActorMetadata#metadata'
-  )
+const hashMetadata = 'metadata'
+
+export function isMetadata<V>(v: V) {
+  return is$typed(v, id, hashMetadata)
 }
 
-export function validateMetadata(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.moderation.getActorMetadata#metadata', v)
+export function validateMetadata<V>(v: V) {
+  return validate<Metadata & V>(v, id, hashMetadata)
 }
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts b/packages/ozone/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
index 39489eb7c12..037d4dde4ec 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from '../convo/defs'
+import type * as ChatBskyConvoDefs from '../convo/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.moderation.getMessageContext'
 
 export interface QueryParams {
   /** Conversation that the message is from. NOTE: this field will eventually be required. */
@@ -21,11 +25,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   messages: (
-    | ChatBskyConvoDefs.MessageView
-    | ChatBskyConvoDefs.DeletedMessageView
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ChatBskyConvoDefs.MessageView>
+    | $Typed<ChatBskyConvoDefs.DeletedMessageView>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts b/packages/ozone/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
index 17324495c1c..6bf8c511da7 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.moderation.updateActorAccess'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   actor: string
   allowAccess: boolean
   ref?: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/defs.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/defs.ts
index f58b7c7ece4..c130e5bb0c2 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/defs.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/defs.ts
@@ -2,34 +2,37 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoServerDefs from '../server/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoServerDefs from '../server/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.defs'
 
 export interface StatusAttr {
+  $type?: 'com.atproto.admin.defs#statusAttr'
   applied: boolean
   ref?: string
-  [k: string]: unknown
 }
 
-export function isStatusAttr(v: unknown): v is StatusAttr {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#statusAttr'
-  )
+const hashStatusAttr = 'statusAttr'
+
+export function isStatusAttr<V>(v: V) {
+  return is$typed(v, id, hashStatusAttr)
 }
 
-export function validateStatusAttr(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#statusAttr', v)
+export function validateStatusAttr<V>(v: V) {
+  return validate<StatusAttr & V>(v, id, hashStatusAttr)
 }
 
 export interface AccountView {
+  $type?: 'com.atproto.admin.defs#accountView'
   did: string
   handle: string
   email?: string
-  relatedRecords?: {}[]
+  relatedRecords?: { [_ in string]: unknown }[]
   indexedAt: string
   invitedBy?: ComAtprotoServerDefs.InviteCode
   invites?: ComAtprotoServerDefs.InviteCode[]
@@ -38,71 +41,62 @@ export interface AccountView {
   inviteNote?: string
   deactivatedAt?: string
   threatSignatures?: ThreatSignature[]
-  [k: string]: unknown
 }
 
-export function isAccountView(v: unknown): v is AccountView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#accountView'
-  )
+const hashAccountView = 'accountView'
+
+export function isAccountView<V>(v: V) {
+  return is$typed(v, id, hashAccountView)
 }
 
-export function validateAccountView(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#accountView', v)
+export function validateAccountView<V>(v: V) {
+  return validate<AccountView & V>(v, id, hashAccountView)
 }
 
 export interface RepoRef {
+  $type?: 'com.atproto.admin.defs#repoRef'
   did: string
-  [k: string]: unknown
 }
 
-export function isRepoRef(v: unknown): v is RepoRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#repoRef'
-  )
+const hashRepoRef = 'repoRef'
+
+export function isRepoRef<V>(v: V) {
+  return is$typed(v, id, hashRepoRef)
 }
 
-export function validateRepoRef(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#repoRef', v)
+export function validateRepoRef<V>(v: V) {
+  return validate<RepoRef & V>(v, id, hashRepoRef)
 }
 
 export interface RepoBlobRef {
+  $type?: 'com.atproto.admin.defs#repoBlobRef'
   did: string
   cid: string
   recordUri?: string
-  [k: string]: unknown
 }
 
-export function isRepoBlobRef(v: unknown): v is RepoBlobRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#repoBlobRef'
-  )
+const hashRepoBlobRef = 'repoBlobRef'
+
+export function isRepoBlobRef<V>(v: V) {
+  return is$typed(v, id, hashRepoBlobRef)
 }
 
-export function validateRepoBlobRef(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#repoBlobRef', v)
+export function validateRepoBlobRef<V>(v: V) {
+  return validate<RepoBlobRef & V>(v, id, hashRepoBlobRef)
 }
 
 export interface ThreatSignature {
+  $type?: 'com.atproto.admin.defs#threatSignature'
   property: string
   value: string
-  [k: string]: unknown
 }
 
-export function isThreatSignature(v: unknown): v is ThreatSignature {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#threatSignature'
-  )
+const hashThreatSignature = 'threatSignature'
+
+export function isThreatSignature<V>(v: V) {
+  return is$typed(v, id, hashThreatSignature)
 }
 
-export function validateThreatSignature(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#threatSignature', v)
+export function validateThreatSignature<V>(v: V) {
+  return validate<ThreatSignature & V>(v, id, hashThreatSignature)
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/deleteAccount.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/deleteAccount.ts
index 1b0223ea303..f000acc12b1 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/deleteAccount.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/deleteAccount.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.deleteAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   did: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
index d8f8ecad320..1d01b3a8860 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.disableAccountInvites'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   account: string
   /** Optional reason for disabled invites. */
   note?: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
index 75a9fb472a5..5b112c656e8 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
@@ -3,17 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.disableInviteCodes'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   codes?: string[]
   accounts?: string[]
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
index b072ad7ec56..a8e1a00894c 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.enableAccountInvites'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   account: string
   /** Optional reason for enabled invites. */
   note?: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfo.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
index acea7749774..c6f703d1625 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
+import type * as ComAtprotoAdminDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.getAccountInfo'
 
 export interface QueryParams {
   did: string
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfos.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
index 7d9fa3fdcbf..c876c92ef6b 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
+import type * as ComAtprotoAdminDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.getAccountInfos'
 
 export interface QueryParams {
   dids: string[]
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   infos: ComAtprotoAdminDefs.AccountView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/getInviteCodes.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
index 9619d5e4b5b..d685988633c 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoServerDefs from '../server/defs'
+import type * as ComAtprotoServerDefs from '../server/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.getInviteCodes'
 
 export interface QueryParams {
   sort: 'recent' | 'usage' | (string & {})
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   codes: ComAtprotoServerDefs.InviteCode[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
index 3aff3e6f322..06d25f389ec 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
@@ -3,12 +3,16 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
-import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
+import type * as ComAtprotoAdminDefs from './defs.js'
+import type * as ComAtprotoRepoStrongRef from '../repo/strongRef.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.getSubjectStatus'
 
 export interface QueryParams {
   did?: string
@@ -20,13 +24,12 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ComAtprotoAdminDefs.RepoBlobRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ComAtprotoAdminDefs.RepoBlobRef>
+    | { $type: string }
   takedown?: ComAtprotoAdminDefs.StatusAttr
   deactivated?: ComAtprotoAdminDefs.StatusAttr
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/searchAccounts.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/searchAccounts.ts
index 96b26867f41..043d5a0ba31 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/searchAccounts.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/searchAccounts.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
+import type * as ComAtprotoAdminDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.searchAccounts'
 
 export interface QueryParams {
   email?: string
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   accounts: ComAtprotoAdminDefs.AccountView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/sendEmail.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/sendEmail.ts
index 5c8bebe791d..462e403aa0c 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/sendEmail.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/sendEmail.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.sendEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -17,12 +21,10 @@ export interface InputSchema {
   senderDid: string
   /** Additional comment by the sender that won't be used in the email itself but helpful to provide more context for moderators/reviewers */
   comment?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   sent: boolean
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
index e3ea26f7298..c9e60e9c621 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.updateAccountEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   /** The handle or DID of the repo. */
   account: string
   email: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
index 87d861faef5..721a486dc16 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
@@ -3,17 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.updateAccountHandle'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   did: string
   handle: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
index b6aef601e13..c782b5cc9ce 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
@@ -3,17 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.updateAccountPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   did: string
   password: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
index ae48689cb4f..f768e076005 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
@@ -3,34 +3,36 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
-import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
+import type * as ComAtprotoAdminDefs from './defs.js'
+import type * as ComAtprotoRepoStrongRef from '../repo/strongRef.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.updateSubjectStatus'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ComAtprotoAdminDefs.RepoBlobRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ComAtprotoAdminDefs.RepoBlobRef>
+    | { $type: string }
   takedown?: ComAtprotoAdminDefs.StatusAttr
   deactivated?: ComAtprotoAdminDefs.StatusAttr
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ComAtprotoAdminDefs.RepoBlobRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ComAtprotoAdminDefs.RepoBlobRef>
+    | { $type: string }
   takedown?: ComAtprotoAdminDefs.StatusAttr
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts b/packages/ozone/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
index 33bd5f6fa05..add1d696b5c 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.getRecommendedDidCredentials'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -16,9 +20,8 @@ export interface OutputSchema {
   /** Recommended rotation keys for PLC dids. Should be undefined (or ignored) for did:webs. */
   rotationKeys?: string[]
   alsoKnownAs?: string[]
-  verificationMethods?: {}
-  services?: {}
-  [k: string]: unknown
+  verificationMethods?: { [_ in string]: unknown }
+  services?: { [_ in string]: unknown }
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts b/packages/ozone/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
index 7620d0abb69..a9818c9bece 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.requestPlcOperationSignature'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/identity/resolveHandle.ts b/packages/ozone/src/lexicon/types/com/atproto/identity/resolveHandle.ts
index e319fbfbadb..7c7fd5fe225 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/identity/resolveHandle.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/resolveHandle.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.resolveHandle'
+
 export interface QueryParams {
   /** The handle to resolve. */
   handle: string
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   did: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/identity/signPlcOperation.ts b/packages/ozone/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
index 9b0cb540b8e..b8b684fd5c2 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.signPlcOperation'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -15,15 +19,13 @@ export interface InputSchema {
   token?: string
   rotationKeys?: string[]
   alsoKnownAs?: string[]
-  verificationMethods?: {}
-  services?: {}
-  [k: string]: unknown
+  verificationMethods?: { [_ in string]: unknown }
+  services?: { [_ in string]: unknown }
 }
 
 export interface OutputSchema {
   /** A signed DID PLC operation. */
-  operation: {}
-  [k: string]: unknown
+  operation: { [_ in string]: unknown }
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts b/packages/ozone/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
index 9b85d7dcb2f..388ad351dec 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.submitPlcOperation'
+
 export interface QueryParams {}
 
 export interface InputSchema {
-  operation: {}
-  [k: string]: unknown
+  operation: { [_ in string]: unknown }
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/identity/updateHandle.ts b/packages/ozone/src/lexicon/types/com/atproto/identity/updateHandle.ts
index 8a271d80264..dee985db8f2 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/identity/updateHandle.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/updateHandle.ts
@@ -3,17 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.updateHandle'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   /** The new handle. */
   handle: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/label/defs.ts b/packages/ozone/src/lexicon/types/com/atproto/label/defs.ts
index 348e985622b..b5f75bfce0b 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/label/defs.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/label/defs.ts
@@ -2,12 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.label.defs'
 
 /** Metadata tag on an atproto resource (eg, repo or record). */
 export interface Label {
+  $type?: 'com.atproto.label.defs#label'
   /** The AT Protocol version of the label object. */
   ver?: number
   /** DID of the actor who created this label. */
@@ -26,60 +31,54 @@ export interface Label {
   exp?: string
   /** Signature of dag-cbor encoded label. */
   sig?: Uint8Array
-  [k: string]: unknown
 }
 
-export function isLabel(v: unknown): v is Label {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#label'
-  )
+const hashLabel = 'label'
+
+export function isLabel<V>(v: V) {
+  return is$typed(v, id, hashLabel)
 }
 
-export function validateLabel(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#label', v)
+export function validateLabel<V>(v: V) {
+  return validate<Label & V>(v, id, hashLabel)
 }
 
 /** Metadata tags on an atproto record, published by the author within the record. */
 export interface SelfLabels {
+  $type?: 'com.atproto.label.defs#selfLabels'
   values: SelfLabel[]
-  [k: string]: unknown
 }
 
-export function isSelfLabels(v: unknown): v is SelfLabels {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#selfLabels'
-  )
+const hashSelfLabels = 'selfLabels'
+
+export function isSelfLabels<V>(v: V) {
+  return is$typed(v, id, hashSelfLabels)
 }
 
-export function validateSelfLabels(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#selfLabels', v)
+export function validateSelfLabels<V>(v: V) {
+  return validate<SelfLabels & V>(v, id, hashSelfLabels)
 }
 
 /** Metadata tag on an atproto record, published by the author within the record. Note that schemas should use #selfLabels, not #selfLabel. */
 export interface SelfLabel {
+  $type?: 'com.atproto.label.defs#selfLabel'
   /** The short string name of the value or type of this label. */
   val: string
-  [k: string]: unknown
 }
 
-export function isSelfLabel(v: unknown): v is SelfLabel {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#selfLabel'
-  )
+const hashSelfLabel = 'selfLabel'
+
+export function isSelfLabel<V>(v: V) {
+  return is$typed(v, id, hashSelfLabel)
 }
 
-export function validateSelfLabel(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#selfLabel', v)
+export function validateSelfLabel<V>(v: V) {
+  return validate<SelfLabel & V>(v, id, hashSelfLabel)
 }
 
 /** Declares a label value and its expected interpretations and behaviors. */
 export interface LabelValueDefinition {
+  $type?: 'com.atproto.label.defs#labelValueDefinition'
   /** The value of the label being defined. Must only include lowercase ascii and the '-' character ([a-z-]+). */
   identifier: string
   /** How should a client visually convey this label? 'inform' means neutral and informational; 'alert' means negative and warning; 'none' means show nothing. */
@@ -91,48 +90,40 @@ export interface LabelValueDefinition {
   /** Does the user need to have adult content enabled in order to configure this label? */
   adultOnly?: boolean
   locales: LabelValueDefinitionStrings[]
-  [k: string]: unknown
 }
 
-export function isLabelValueDefinition(v: unknown): v is LabelValueDefinition {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#labelValueDefinition'
-  )
+const hashLabelValueDefinition = 'labelValueDefinition'
+
+export function isLabelValueDefinition<V>(v: V) {
+  return is$typed(v, id, hashLabelValueDefinition)
 }
 
-export function validateLabelValueDefinition(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#labelValueDefinition', v)
+export function validateLabelValueDefinition<V>(v: V) {
+  return validate<LabelValueDefinition & V>(v, id, hashLabelValueDefinition)
 }
 
 /** Strings which describe the label in the UI, localized into a specific language. */
 export interface LabelValueDefinitionStrings {
+  $type?: 'com.atproto.label.defs#labelValueDefinitionStrings'
   /** The code of the language these strings are written in. */
   lang: string
   /** A short human-readable name for the label. */
   name: string
   /** A longer description of what the label means and why it might be applied. */
   description: string
-  [k: string]: unknown
 }
 
-export function isLabelValueDefinitionStrings(
-  v: unknown,
-): v is LabelValueDefinitionStrings {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#labelValueDefinitionStrings'
-  )
+const hashLabelValueDefinitionStrings = 'labelValueDefinitionStrings'
+
+export function isLabelValueDefinitionStrings<V>(v: V) {
+  return is$typed(v, id, hashLabelValueDefinitionStrings)
 }
 
-export function validateLabelValueDefinitionStrings(
-  v: unknown,
-): ValidationResult {
-  return lexicons.validate(
-    'com.atproto.label.defs#labelValueDefinitionStrings',
+export function validateLabelValueDefinitionStrings<V>(v: V) {
+  return validate<LabelValueDefinitionStrings & V>(
     v,
+    id,
+    hashLabelValueDefinitionStrings,
   )
 }
 
diff --git a/packages/ozone/src/lexicon/types/com/atproto/label/queryLabels.ts b/packages/ozone/src/lexicon/types/com/atproto/label/queryLabels.ts
index 9873f6914b4..b179124e639 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/label/queryLabels.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/label/queryLabels.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoLabelDefs from './defs'
+import type * as ComAtprotoLabelDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.label.queryLabels'
 
 export interface QueryParams {
   /** List of AT URI patterns to match (boolean 'OR'). Each may be a prefix (ending with '*'; will match inclusive of the string leading to '*'), or a full URI. */
@@ -23,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   labels: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/label/subscribeLabels.ts b/packages/ozone/src/lexicon/types/com/atproto/label/subscribeLabels.ts
index 6034b35d895..da6e961fa94 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/label/subscribeLabels.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/label/subscribeLabels.ts
@@ -2,22 +2,23 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, ErrorFrame } from '@atproto/xrpc-server'
-import { IncomingMessage } from 'http'
-import * as ComAtprotoLabelDefs from './defs'
+import { IncomingMessage } from 'node:http'
+import type * as ComAtprotoLabelDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.label.subscribeLabels'
 
 export interface QueryParams {
   /** The last known event seq number to backfill from. */
   cursor?: number
 }
 
-export type OutputSchema =
-  | Labels
-  | Info
-  | { $type: string; [k: string]: unknown }
+export type OutputSchema = $Typed<Labels> | $Typed<Info> | { $type: string }
 export type HandlerError = ErrorFrame<'FutureCursor'>
 export type HandlerOutput = HandlerError | OutputSchema
 export type HandlerReqCtx<HA extends HandlerAuth = never> = {
@@ -31,37 +32,33 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => AsyncIterable<HandlerOutput>
 
 export interface Labels {
+  $type?: 'com.atproto.label.subscribeLabels#labels'
   seq: number
   labels: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isLabels(v: unknown): v is Labels {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.subscribeLabels#labels'
-  )
+const hashLabels = 'labels'
+
+export function isLabels<V>(v: V) {
+  return is$typed(v, id, hashLabels)
 }
 
-export function validateLabels(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.subscribeLabels#labels', v)
+export function validateLabels<V>(v: V) {
+  return validate<Labels & V>(v, id, hashLabels)
 }
 
 export interface Info {
+  $type?: 'com.atproto.label.subscribeLabels#info'
   name: 'OutdatedCursor' | (string & {})
   message?: string
-  [k: string]: unknown
 }
 
-export function isInfo(v: unknown): v is Info {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.subscribeLabels#info'
-  )
+const hashInfo = 'info'
+
+export function isInfo<V>(v: V) {
+  return is$typed(v, id, hashInfo)
 }
 
-export function validateInfo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.subscribeLabels#info', v)
+export function validateInfo<V>(v: V) {
+  return validate<Info & V>(v, id, hashInfo)
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/lexicon/schema.ts b/packages/ozone/src/lexicon/types/com/atproto/lexicon/schema.ts
index fbb12809710..4f632560c7f 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/lexicon/schema.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/lexicon/schema.ts
@@ -2,25 +2,27 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.lexicon.schema'
 
 export interface Record {
+  $type: 'com.atproto.lexicon.schema'
   /** Indicates the 'version' of the Lexicon language. Must be '1' for the current atproto/Lexicon schema system. */
   lexicon: number
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'com.atproto.lexicon.schema#main' ||
-      v.$type === 'com.atproto.lexicon.schema')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.lexicon.schema#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/moderation/createReport.ts b/packages/ozone/src/lexicon/types/com/atproto/moderation/createReport.ts
index dc7985c7685..5022352bc70 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/moderation/createReport.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/moderation/createReport.ts
@@ -3,13 +3,17 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoModerationDefs from './defs'
-import * as ComAtprotoAdminDefs from '../admin/defs'
-import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
+import type * as ComAtprotoModerationDefs from './defs.js'
+import type * as ComAtprotoAdminDefs from '../admin/defs.js'
+import type * as ComAtprotoRepoStrongRef from '../repo/strongRef.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.moderation.createReport'
 
 export interface QueryParams {}
 
@@ -18,10 +22,9 @@ export interface InputSchema {
   /** Additional context about the content and violation. */
   reason?: string
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | { $type: string }
 }
 
 export interface OutputSchema {
@@ -29,12 +32,11 @@ export interface OutputSchema {
   reasonType: ComAtprotoModerationDefs.ReasonType
   reason?: string
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | { $type: string }
   reportedBy: string
   createdAt: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/moderation/defs.ts b/packages/ozone/src/lexicon/types/com/atproto/moderation/defs.ts
index 08e555c2422..2d7a46f5dd8 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/moderation/defs.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/moderation/defs.ts
@@ -2,9 +2,13 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.moderation.defs'
 
 export type ReasonType =
   | 'com.atproto.moderation.defs#reasonSpam'
@@ -17,16 +21,16 @@ export type ReasonType =
   | (string & {})
 
 /** Spam: frequent unwanted promotion, replies, mentions */
-export const REASONSPAM = 'com.atproto.moderation.defs#reasonSpam'
+export const REASONSPAM = `${id}#reasonSpam`
 /** Direct violation of server rules, laws, terms of service */
-export const REASONVIOLATION = 'com.atproto.moderation.defs#reasonViolation'
+export const REASONVIOLATION = `${id}#reasonViolation`
 /** Misleading identity, affiliation, or content */
-export const REASONMISLEADING = 'com.atproto.moderation.defs#reasonMisleading'
+export const REASONMISLEADING = `${id}#reasonMisleading`
 /** Unwanted or mislabeled sexual content */
-export const REASONSEXUAL = 'com.atproto.moderation.defs#reasonSexual'
+export const REASONSEXUAL = `${id}#reasonSexual`
 /** Rude, harassing, explicit, or otherwise unwelcoming behavior */
-export const REASONRUDE = 'com.atproto.moderation.defs#reasonRude'
+export const REASONRUDE = `${id}#reasonRude`
 /** Other: reports not falling under another report category */
-export const REASONOTHER = 'com.atproto.moderation.defs#reasonOther'
+export const REASONOTHER = `${id}#reasonOther`
 /** Appeal: appeal a previously taken moderation action */
-export const REASONAPPEAL = 'com.atproto.moderation.defs#reasonAppeal'
+export const REASONAPPEAL = `${id}#reasonAppeal`
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/applyWrites.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/applyWrites.ts
index a58fcc0a56b..c6e07aff94e 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/applyWrites.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/applyWrites.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoRepoDefs from './defs'
+import type * as ComAtprotoRepoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.applyWrites'
 
 export interface QueryParams {}
 
@@ -16,16 +20,18 @@ export interface InputSchema {
   repo: string
   /** Can be set to 'false' to skip Lexicon schema validation of record data across all operations, 'true' to require it, or leave unset to validate only for known Lexicons. */
   validate?: boolean
-  writes: (Create | Update | Delete)[]
+  writes: ($Typed<Create> | $Typed<Update> | $Typed<Delete>)[]
   /** If provided, the entire operation will fail if the current repo commit CID does not match this value. Used to prevent conflicting repo mutations. */
   swapCommit?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   commit?: ComAtprotoRepoDefs.CommitMeta
-  results?: (CreateResult | UpdateResult | DeleteResult)[]
-  [k: string]: unknown
+  results?: (
+    | $Typed<CreateResult>
+    | $Typed<UpdateResult>
+    | $Typed<DeleteResult>
+  )[]
 }
 
 export interface HandlerInput {
@@ -60,113 +66,101 @@ export type Handler<HA extends HandlerAuth = never> = (
 
 /** Operation which creates a new record. */
 export interface Create {
+  $type?: 'com.atproto.repo.applyWrites#create'
   collection: string
   rkey?: string
-  value: {}
-  [k: string]: unknown
+  value: { [_ in string]: unknown }
 }
 
-export function isCreate(v: unknown): v is Create {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#create'
-  )
+const hashCreate = 'create'
+
+export function isCreate<V>(v: V) {
+  return is$typed(v, id, hashCreate)
 }
 
-export function validateCreate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#create', v)
+export function validateCreate<V>(v: V) {
+  return validate<Create & V>(v, id, hashCreate)
 }
 
 /** Operation which updates an existing record. */
 export interface Update {
+  $type?: 'com.atproto.repo.applyWrites#update'
   collection: string
   rkey: string
-  value: {}
-  [k: string]: unknown
+  value: { [_ in string]: unknown }
 }
 
-export function isUpdate(v: unknown): v is Update {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#update'
-  )
+const hashUpdate = 'update'
+
+export function isUpdate<V>(v: V) {
+  return is$typed(v, id, hashUpdate)
 }
 
-export function validateUpdate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#update', v)
+export function validateUpdate<V>(v: V) {
+  return validate<Update & V>(v, id, hashUpdate)
 }
 
 /** Operation which deletes an existing record. */
 export interface Delete {
+  $type?: 'com.atproto.repo.applyWrites#delete'
   collection: string
   rkey: string
-  [k: string]: unknown
 }
 
-export function isDelete(v: unknown): v is Delete {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#delete'
-  )
+const hashDelete = 'delete'
+
+export function isDelete<V>(v: V) {
+  return is$typed(v, id, hashDelete)
 }
 
-export function validateDelete(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#delete', v)
+export function validateDelete<V>(v: V) {
+  return validate<Delete & V>(v, id, hashDelete)
 }
 
 export interface CreateResult {
+  $type?: 'com.atproto.repo.applyWrites#createResult'
   uri: string
   cid: string
   validationStatus?: 'valid' | 'unknown' | (string & {})
-  [k: string]: unknown
 }
 
-export function isCreateResult(v: unknown): v is CreateResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#createResult'
-  )
+const hashCreateResult = 'createResult'
+
+export function isCreateResult<V>(v: V) {
+  return is$typed(v, id, hashCreateResult)
 }
 
-export function validateCreateResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#createResult', v)
+export function validateCreateResult<V>(v: V) {
+  return validate<CreateResult & V>(v, id, hashCreateResult)
 }
 
 export interface UpdateResult {
+  $type?: 'com.atproto.repo.applyWrites#updateResult'
   uri: string
   cid: string
   validationStatus?: 'valid' | 'unknown' | (string & {})
-  [k: string]: unknown
 }
 
-export function isUpdateResult(v: unknown): v is UpdateResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#updateResult'
-  )
+const hashUpdateResult = 'updateResult'
+
+export function isUpdateResult<V>(v: V) {
+  return is$typed(v, id, hashUpdateResult)
 }
 
-export function validateUpdateResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#updateResult', v)
+export function validateUpdateResult<V>(v: V) {
+  return validate<UpdateResult & V>(v, id, hashUpdateResult)
 }
 
 export interface DeleteResult {
-  [k: string]: unknown
+  $type?: 'com.atproto.repo.applyWrites#deleteResult'
 }
 
-export function isDeleteResult(v: unknown): v is DeleteResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#deleteResult'
-  )
+const hashDeleteResult = 'deleteResult'
+
+export function isDeleteResult<V>(v: V) {
+  return is$typed(v, id, hashDeleteResult)
 }
 
-export function validateDeleteResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#deleteResult', v)
+export function validateDeleteResult<V>(v: V) {
+  return validate<DeleteResult & V>(v, id, hashDeleteResult)
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/createRecord.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/createRecord.ts
index 0982f49bf3d..f844aa60313 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/createRecord.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/createRecord.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoRepoDefs from './defs'
+import type * as ComAtprotoRepoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.createRecord'
 
 export interface QueryParams {}
 
@@ -21,10 +25,9 @@ export interface InputSchema {
   /** Can be set to 'false' to skip Lexicon schema validation of record data, 'true' to require it, or leave unset to validate only for known Lexicons. */
   validate?: boolean
   /** The record itself. Must contain a $type field. */
-  record: {}
+  record: { [_ in string]: unknown }
   /** Compare and swap with the previous commit by CID. */
   swapCommit?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
@@ -32,7 +35,6 @@ export interface OutputSchema {
   cid: string
   commit?: ComAtprotoRepoDefs.CommitMeta
   validationStatus?: 'valid' | 'unknown' | (string & {})
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/defs.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/defs.ts
index 8357fe2a611..3b02739d7dd 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/defs.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/defs.ts
@@ -2,24 +2,26 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.defs'
 
 export interface CommitMeta {
+  $type?: 'com.atproto.repo.defs#commitMeta'
   cid: string
   rev: string
-  [k: string]: unknown
 }
 
-export function isCommitMeta(v: unknown): v is CommitMeta {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.defs#commitMeta'
-  )
+const hashCommitMeta = 'commitMeta'
+
+export function isCommitMeta<V>(v: V) {
+  return is$typed(v, id, hashCommitMeta)
 }
 
-export function validateCommitMeta(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.defs#commitMeta', v)
+export function validateCommitMeta<V>(v: V) {
+  return validate<CommitMeta & V>(v, id, hashCommitMeta)
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/deleteRecord.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/deleteRecord.ts
index c86ab7ba47a..ce903f82544 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/deleteRecord.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/deleteRecord.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoRepoDefs from './defs'
+import type * as ComAtprotoRepoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.deleteRecord'
 
 export interface QueryParams {}
 
@@ -22,12 +26,10 @@ export interface InputSchema {
   swapRecord?: string
   /** Compare and swap with the previous commit by CID. */
   swapCommit?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   commit?: ComAtprotoRepoDefs.CommitMeta
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/describeRepo.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/describeRepo.ts
index 5b187f3758c..c2c6afe848d 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/describeRepo.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/describeRepo.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.describeRepo'
+
 export interface QueryParams {
   /** The handle or DID of the repo. */
   repo: string
@@ -19,12 +23,11 @@ export interface OutputSchema {
   handle: string
   did: string
   /** The complete DID document for this account. */
-  didDoc: {}
+  didDoc: { [_ in string]: unknown }
   /** List of all the collections (NSIDs) for which this repo contains at least one record. */
   collections: string[]
   /** Indicates if handle is currently valid (resolves bi-directionally) */
   handleIsCorrect: boolean
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/getRecord.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/getRecord.ts
index 96ce9ee551f..62509f77008 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/getRecord.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/getRecord.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.getRecord'
+
 export interface QueryParams {
   /** The handle or DID of the repo. */
   repo: string
@@ -24,8 +28,7 @@ export type InputSchema = undefined
 export interface OutputSchema {
   uri: string
   cid?: string
-  value: {}
-  [k: string]: unknown
+  value: { [_ in string]: unknown }
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/importRepo.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/importRepo.ts
index 685918f455f..f15a7784258 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/importRepo.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/importRepo.ts
@@ -2,13 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import stream from 'stream'
+import stream from 'node:stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.importRepo'
+
 export interface QueryParams {}
 
 export type InputSchema = string | Uint8Array | Blob
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
index f1be00d8e87..0404bac3f48 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.listMissingBlobs'
+
 export interface QueryParams {
   limit: number
   cursor?: string
@@ -18,7 +22,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   blobs: RecordBlob[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -48,19 +51,17 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface RecordBlob {
+  $type?: 'com.atproto.repo.listMissingBlobs#recordBlob'
   cid: string
   recordUri: string
-  [k: string]: unknown
 }
 
-export function isRecordBlob(v: unknown): v is RecordBlob {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.listMissingBlobs#recordBlob'
-  )
+const hashRecordBlob = 'recordBlob'
+
+export function isRecordBlob<V>(v: V) {
+  return is$typed(v, id, hashRecordBlob)
 }
 
-export function validateRecordBlob(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.listMissingBlobs#recordBlob', v)
+export function validateRecordBlob<V>(v: V) {
+  return validate<RecordBlob & V>(v, id, hashRecordBlob)
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/listRecords.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/listRecords.ts
index e328cfbb204..573d34d70a8 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/listRecords.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/listRecords.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.listRecords'
+
 export interface QueryParams {
   /** The handle or DID of the repo. */
   repo: string
@@ -29,7 +33,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   records: Record[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -59,20 +62,18 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Record {
+  $type?: 'com.atproto.repo.listRecords#record'
   uri: string
   cid: string
-  value: {}
-  [k: string]: unknown
+  value: { [_ in string]: unknown }
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.listRecords#record'
-  )
+const hashRecord = 'record'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.listRecords#record', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/putRecord.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/putRecord.ts
index 269244ede91..7d417a860f6 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/putRecord.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/putRecord.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoRepoDefs from './defs'
+import type * as ComAtprotoRepoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.putRecord'
 
 export interface QueryParams {}
 
@@ -21,12 +25,11 @@ export interface InputSchema {
   /** Can be set to 'false' to skip Lexicon schema validation of record data, 'true' to require it, or leave unset to validate only for known Lexicons. */
   validate?: boolean
   /** The record to write. */
-  record: {}
+  record: { [_ in string]: unknown }
   /** Compare and swap with the previous record by CID. WARNING: nullable and optional field; may cause problems with golang implementation */
   swapRecord?: string | null
   /** Compare and swap with the previous commit by CID. */
   swapCommit?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
@@ -34,7 +37,6 @@ export interface OutputSchema {
   cid: string
   commit?: ComAtprotoRepoDefs.CommitMeta
   validationStatus?: 'valid' | 'unknown' | (string & {})
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/strongRef.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/strongRef.ts
index 8b21a6ddf81..e2652df53cb 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/strongRef.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/strongRef.ts
@@ -2,25 +2,26 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+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
-  [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'com.atproto.repo.strongRef#main' ||
-      v.$type === 'com.atproto.repo.strongRef')
-  )
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.strongRef#main', v)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/uploadBlob.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/uploadBlob.ts
index 7595e7295e6..c523b188706 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/uploadBlob.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/uploadBlob.ts
@@ -2,20 +2,23 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import stream from 'stream'
+import stream from 'node:stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.uploadBlob'
+
 export interface QueryParams {}
 
 export type InputSchema = string | Uint8Array | Blob
 
 export interface OutputSchema {
   blob: BlobRef
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/activateAccount.ts b/packages/ozone/src/lexicon/types/com/atproto/server/activateAccount.ts
index 7620d0abb69..70cd19e46a5 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/activateAccount.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/activateAccount.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.activateAccount'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/checkAccountStatus.ts b/packages/ozone/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
index 2ad98689303..0487aea5938 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.checkAccountStatus'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -22,7 +26,6 @@ export interface OutputSchema {
   privateStateValues: number
   expectedBlobs: number
   importedBlobs: number
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/confirmEmail.ts b/packages/ozone/src/lexicon/types/com/atproto/server/confirmEmail.ts
index d6338b80fc5..9a3cb61558b 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/confirmEmail.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/confirmEmail.ts
@@ -3,17 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.confirmEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   email: string
   token: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/createAccount.ts b/packages/ozone/src/lexicon/types/com/atproto/server/createAccount.ts
index a85c83edffc..c1efde363c2 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/createAccount.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/createAccount.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.createAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -24,8 +28,7 @@ export interface InputSchema {
   /** DID PLC rotation key (aka, recovery key) to be included in PLC creation operation. */
   recoveryKey?: string
   /** A signed DID PLC operation to be submitted as part of importing an existing account to this instance. NOTE: this optional field may be updated when full account migration is implemented. */
-  plcOp?: {}
-  [k: string]: unknown
+  plcOp?: { [_ in string]: unknown }
 }
 
 /** Account login session returned on successful account creation. */
@@ -36,8 +39,7 @@ export interface OutputSchema {
   /** The DID of the new account. */
   did: string
   /** Complete DID document. */
-  didDoc?: {}
-  [k: string]: unknown
+  didDoc?: { [_ in string]: unknown }
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/createAppPassword.ts b/packages/ozone/src/lexicon/types/com/atproto/server/createAppPassword.ts
index 65ad1d4b4cb..4ef50d9f210 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/createAppPassword.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/createAppPassword.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.createAppPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -15,7 +19,6 @@ export interface InputSchema {
   name: string
   /** If an app password has 'privileged' access to possibly sensitive account state. Meant for use with trusted clients. */
   privileged?: boolean
-  [k: string]: unknown
 }
 
 export type OutputSchema = AppPassword
@@ -51,24 +54,19 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface AppPassword {
+  $type?: 'com.atproto.server.createAppPassword#appPassword'
   name: string
   password: string
   createdAt: string
   privileged?: boolean
-  [k: string]: unknown
 }
 
-export function isAppPassword(v: unknown): v is AppPassword {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.createAppPassword#appPassword'
-  )
+const hashAppPassword = 'appPassword'
+
+export function isAppPassword<V>(v: V) {
+  return is$typed(v, id, hashAppPassword)
 }
 
-export function validateAppPassword(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'com.atproto.server.createAppPassword#appPassword',
-    v,
-  )
+export function validateAppPassword<V>(v: V) {
+  return validate<AppPassword & V>(v, id, hashAppPassword)
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCode.ts b/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCode.ts
index 82daf7eea6f..fcda04f920b 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCode.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCode.ts
@@ -3,22 +3,24 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.createInviteCode'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   useCount: number
   forAccount?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   code: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCodes.ts b/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCodes.ts
index fa2c1f73c2a..6f447d94d74 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCodes.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCodes.ts
@@ -3,23 +3,25 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.createInviteCodes'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   codeCount: number
   useCount: number
   forAccounts?: string[]
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   codes: AccountCodes[]
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
@@ -52,22 +54,17 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface AccountCodes {
+  $type?: 'com.atproto.server.createInviteCodes#accountCodes'
   account: string
   codes: string[]
-  [k: string]: unknown
 }
 
-export function isAccountCodes(v: unknown): v is AccountCodes {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.createInviteCodes#accountCodes'
-  )
+const hashAccountCodes = 'accountCodes'
+
+export function isAccountCodes<V>(v: V) {
+  return is$typed(v, id, hashAccountCodes)
 }
 
-export function validateAccountCodes(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'com.atproto.server.createInviteCodes#accountCodes',
-    v,
-  )
+export function validateAccountCodes<V>(v: V) {
+  return validate<AccountCodes & V>(v, id, hashAccountCodes)
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/createSession.ts b/packages/ozone/src/lexicon/types/com/atproto/server/createSession.ts
index 47ffaaaa0bd..1f3b974ce63 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/createSession.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/createSession.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.createSession'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -17,7 +21,6 @@ export interface InputSchema {
   authFactorToken?: string
   /** When true, instead of throwing error for takendown accounts, a valid response with a narrow scoped token will be returned */
   allowTakendown?: boolean
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
@@ -25,14 +28,13 @@ export interface OutputSchema {
   refreshJwt: string
   handle: string
   did: string
-  didDoc?: {}
+  didDoc?: { [_ in string]: unknown }
   email?: string
   emailConfirmed?: boolean
   emailAuthFactor?: boolean
   active?: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/deactivateAccount.ts b/packages/ozone/src/lexicon/types/com/atproto/server/deactivateAccount.ts
index 56b86424e61..6bf18012bda 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/deactivateAccount.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/deactivateAccount.ts
@@ -3,17 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.deactivateAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   /** A recommendation to server as to how long they should hold onto the deactivated account before deleting. */
   deleteAfter?: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/defs.ts b/packages/ozone/src/lexicon/types/com/atproto/server/defs.ts
index 9bd67c9d7a5..a3b0bb6d989 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/defs.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/defs.ts
@@ -2,11 +2,16 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.defs'
 
 export interface InviteCode {
+  $type?: 'com.atproto.server.defs#inviteCode'
   code: string
   available: number
   disabled: boolean
@@ -14,35 +19,30 @@ export interface InviteCode {
   createdBy: string
   createdAt: string
   uses: InviteCodeUse[]
-  [k: string]: unknown
 }
 
-export function isInviteCode(v: unknown): v is InviteCode {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.defs#inviteCode'
-  )
+const hashInviteCode = 'inviteCode'
+
+export function isInviteCode<V>(v: V) {
+  return is$typed(v, id, hashInviteCode)
 }
 
-export function validateInviteCode(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.defs#inviteCode', v)
+export function validateInviteCode<V>(v: V) {
+  return validate<InviteCode & V>(v, id, hashInviteCode)
 }
 
 export interface InviteCodeUse {
+  $type?: 'com.atproto.server.defs#inviteCodeUse'
   usedBy: string
   usedAt: string
-  [k: string]: unknown
 }
 
-export function isInviteCodeUse(v: unknown): v is InviteCodeUse {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.defs#inviteCodeUse'
-  )
+const hashInviteCodeUse = 'inviteCodeUse'
+
+export function isInviteCodeUse<V>(v: V) {
+  return is$typed(v, id, hashInviteCodeUse)
 }
 
-export function validateInviteCodeUse(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.defs#inviteCodeUse', v)
+export function validateInviteCodeUse<V>(v: V) {
+  return validate<InviteCodeUse & V>(v, id, hashInviteCodeUse)
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/deleteAccount.ts b/packages/ozone/src/lexicon/types/com/atproto/server/deleteAccount.ts
index 93b7b78a0e5..f717788711b 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/deleteAccount.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/deleteAccount.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.deleteAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   did: string
   password: string
   token: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/deleteSession.ts b/packages/ozone/src/lexicon/types/com/atproto/server/deleteSession.ts
index 7620d0abb69..644d4ffde04 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/deleteSession.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/deleteSession.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.deleteSession'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/describeServer.ts b/packages/ozone/src/lexicon/types/com/atproto/server/describeServer.ts
index 6964a59ffdf..17b0400d611 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/describeServer.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/describeServer.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.describeServer'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -22,7 +26,6 @@ export interface OutputSchema {
   links?: Links
   contact?: Contact
   did: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -52,36 +55,32 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Links {
+  $type?: 'com.atproto.server.describeServer#links'
   privacyPolicy?: string
   termsOfService?: string
-  [k: string]: unknown
 }
 
-export function isLinks(v: unknown): v is Links {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.describeServer#links'
-  )
+const hashLinks = 'links'
+
+export function isLinks<V>(v: V) {
+  return is$typed(v, id, hashLinks)
 }
 
-export function validateLinks(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.describeServer#links', v)
+export function validateLinks<V>(v: V) {
+  return validate<Links & V>(v, id, hashLinks)
 }
 
 export interface Contact {
+  $type?: 'com.atproto.server.describeServer#contact'
   email?: string
-  [k: string]: unknown
 }
 
-export function isContact(v: unknown): v is Contact {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.describeServer#contact'
-  )
+const hashContact = 'contact'
+
+export function isContact<V>(v: V) {
+  return is$typed(v, id, hashContact)
 }
 
-export function validateContact(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.describeServer#contact', v)
+export function validateContact<V>(v: V) {
+  return validate<Contact & V>(v, id, hashContact)
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts b/packages/ozone/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
index 1cdf1299961..3c6998c47ee 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoServerDefs from './defs'
+import type * as ComAtprotoServerDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.getAccountInviteCodes'
 
 export interface QueryParams {
   includeUsed: boolean
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   codes: ComAtprotoServerDefs.InviteCode[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/getServiceAuth.ts b/packages/ozone/src/lexicon/types/com/atproto/server/getServiceAuth.ts
index 1e9d1398be7..a8c53382f01 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/getServiceAuth.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/getServiceAuth.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.getServiceAuth'
+
 export interface QueryParams {
   /** The DID of the service that the token will be used to authenticate with */
   aud: string
@@ -21,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   token: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/getSession.ts b/packages/ozone/src/lexicon/types/com/atproto/server/getSession.ts
index cafa6bc7452..1c5ad0d543f 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/getSession.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/getSession.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.getSession'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -18,11 +22,10 @@ export interface OutputSchema {
   email?: string
   emailConfirmed?: boolean
   emailAuthFactor?: boolean
-  didDoc?: {}
+  didDoc?: { [_ in string]: unknown }
   active?: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/listAppPasswords.ts b/packages/ozone/src/lexicon/types/com/atproto/server/listAppPasswords.ts
index 99219e67f7f..4881fa79fc0 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/listAppPasswords.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/listAppPasswords.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.listAppPasswords'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
 
 export interface OutputSchema {
   passwords: AppPassword[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -45,20 +48,18 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface AppPassword {
+  $type?: 'com.atproto.server.listAppPasswords#appPassword'
   name: string
   createdAt: string
   privileged?: boolean
-  [k: string]: unknown
 }
 
-export function isAppPassword(v: unknown): v is AppPassword {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.listAppPasswords#appPassword'
-  )
+const hashAppPassword = 'appPassword'
+
+export function isAppPassword<V>(v: V) {
+  return is$typed(v, id, hashAppPassword)
 }
 
-export function validateAppPassword(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.listAppPasswords#appPassword', v)
+export function validateAppPassword<V>(v: V) {
+  return validate<AppPassword & V>(v, id, hashAppPassword)
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/refreshSession.ts b/packages/ozone/src/lexicon/types/com/atproto/server/refreshSession.ts
index 59e8f9d5a32..bc13c402019 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/refreshSession.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/refreshSession.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.refreshSession'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -17,11 +21,10 @@ export interface OutputSchema {
   refreshJwt: string
   handle: string
   did: string
-  didDoc?: {}
+  didDoc?: { [_ in string]: unknown }
   active?: boolean
   /** Hosting status of the account. If not specified, then assume 'active'. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/requestAccountDelete.ts b/packages/ozone/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
index 7620d0abb69..e8eac86efbf 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.requestAccountDelete'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts b/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
index 7620d0abb69..2d64a2adf1b 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.requestEmailConfirmation'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts b/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
index 87b9a094ccc..548b4f3a26f 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.requestEmailUpdate'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
 
 export interface OutputSchema {
   tokenRequired: boolean
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/requestPasswordReset.ts b/packages/ozone/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
index ae541342aff..58ae5e8d70e 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.requestPasswordReset'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   email: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/reserveSigningKey.ts b/packages/ozone/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
index 72850ce061b..71a4dd20515 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
@@ -3,23 +3,25 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.reserveSigningKey'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   /** The DID to reserve a key for. */
   did?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   /** The public key for the reserved signing key, in did:key serialization. */
   signingKey: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/resetPassword.ts b/packages/ozone/src/lexicon/types/com/atproto/server/resetPassword.ts
index 4b5b8ea1ecc..d292f7c5f93 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/resetPassword.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/resetPassword.ts
@@ -3,17 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.resetPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   token: string
   password: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/revokeAppPassword.ts b/packages/ozone/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
index 80131f8c9e3..b52e6d5103b 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.revokeAppPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   name: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/updateEmail.ts b/packages/ozone/src/lexicon/types/com/atproto/server/updateEmail.ts
index a80982da4f8..ffd0e2e23b9 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/updateEmail.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/updateEmail.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.updateEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -15,7 +19,6 @@ export interface InputSchema {
   emailAuthFactor?: boolean
   /** Requires a token from com.atproto.sever.requestEmailUpdate if the account's email has been confirmed. */
   token?: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getBlob.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getBlob.ts
index 659c71c1a8d..89c40de7cb7 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getBlob.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getBlob.ts
@@ -2,13 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import stream from 'stream'
+import stream from 'node:stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getBlob'
+
 export interface QueryParams {
   /** The DID of the account. */
   did: string
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getBlocks.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getBlocks.ts
index 7fef8b7f64d..f51e262791a 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getBlocks.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getBlocks.ts
@@ -2,13 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import stream from 'stream'
+import stream from 'node:stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getBlocks'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getCheckout.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getCheckout.ts
index 3d519f6916d..571e3a2badd 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getCheckout.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getCheckout.ts
@@ -2,13 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import stream from 'stream'
+import stream from 'node:stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getCheckout'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getHead.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getHead.ts
index d9bb230cef5..f2a144c2675 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getHead.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getHead.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getHead'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   root: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getLatestCommit.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
index 6041841e311..0446f442025 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getLatestCommit'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
@@ -18,7 +22,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cid: string
   rev: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getRecord.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getRecord.ts
index afbd779faf1..1c7a509b1b4 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getRecord.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getRecord.ts
@@ -2,13 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import stream from 'stream'
+import stream from 'node:stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getRecord'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getRepo.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getRepo.ts
index 62a86f56a38..4e62086f457 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getRepo.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getRepo.ts
@@ -2,13 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import stream from 'stream'
+import stream from 'node:stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getRepo'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getRepoStatus.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
index 743bcc45767..e23b538dc38 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getRepoStatus'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
@@ -22,7 +26,6 @@ export interface OutputSchema {
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
   /** Optional field, the current rev of the repo, if active=true */
   rev?: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/listBlobs.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/listBlobs.ts
index abb1719f41b..34d8557c3a8 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/listBlobs.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/listBlobs.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.listBlobs'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
@@ -22,7 +26,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   cids: string[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/listRepos.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/listRepos.ts
index 228d6a004b5..22d1cfa2db6 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/listRepos.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/listRepos.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.listRepos'
+
 export interface QueryParams {
   limit: number
   cursor?: string
@@ -18,7 +22,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   repos: Repo[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -48,6 +51,7 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Repo {
+  $type?: 'com.atproto.sync.listRepos#repo'
   did: string
   /** Current repo commit CID */
   head: string
@@ -55,17 +59,14 @@ export interface Repo {
   active?: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
-export function isRepo(v: unknown): v is Repo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.listRepos#repo'
-  )
+const hashRepo = 'repo'
+
+export function isRepo<V>(v: V) {
+  return is$typed(v, id, hashRepo)
 }
 
-export function validateRepo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.listRepos#repo', v)
+export function validateRepo<V>(v: V) {
+  return validate<Repo & V>(v, id, hashRepo)
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
index b2d2e6b2e48..1bc47cea7d8 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
@@ -3,17 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.notifyOfUpdate'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   /** Hostname of the current service (usually a PDS) that is notifying of update. */
   hostname: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/requestCrawl.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/requestCrawl.ts
index fd54e157b7b..c50adf43847 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/requestCrawl.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/requestCrawl.ts
@@ -3,17 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.requestCrawl'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   /** Hostname of the current service (eg, PDS) that is requesting to be crawled. */
   hostname: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/subscribeRepos.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
index 8f9855a5da4..0cb11e48b86 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
@@ -2,11 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, ErrorFrame } from '@atproto/xrpc-server'
-import { IncomingMessage } from 'http'
+import { IncomingMessage } from 'node:http'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.subscribeRepos'
 
 export interface QueryParams {
   /** The last known event seq number to backfill from. */
@@ -14,14 +18,14 @@ export interface QueryParams {
 }
 
 export type OutputSchema =
-  | Commit
-  | Identity
-  | Account
-  | Handle
-  | Migrate
-  | Tombstone
-  | Info
-  | { $type: string; [k: string]: unknown }
+  | $Typed<Commit>
+  | $Typed<Identity>
+  | $Typed<Account>
+  | $Typed<Handle>
+  | $Typed<Migrate>
+  | $Typed<Tombstone>
+  | $Typed<Info>
+  | { $type: string }
 export type HandlerError = ErrorFrame<'FutureCursor' | 'ConsumerTooSlow'>
 export type HandlerOutput = HandlerError | OutputSchema
 export type HandlerReqCtx<HA extends HandlerAuth = never> = {
@@ -36,6 +40,7 @@ export type Handler<HA extends HandlerAuth = never> = (
 
 /** Represents an update of repository state. Note that empty commits are allowed, which include no repo data changes, but an update to rev and signature. */
 export interface Commit {
+  $type?: 'com.atproto.sync.subscribeRepos#commit'
   /** The stream sequence number of this message. */
   seq: number
   /** DEPRECATED -- unused */
@@ -58,45 +63,41 @@ export interface Commit {
   blobs: CID[]
   /** Timestamp of when this message was originally broadcast. */
   time: string
-  [k: string]: unknown
 }
 
-export function isCommit(v: unknown): v is Commit {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#commit'
-  )
+const hashCommit = 'commit'
+
+export function isCommit<V>(v: V) {
+  return is$typed(v, id, hashCommit)
 }
 
-export function validateCommit(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#commit', v)
+export function validateCommit<V>(v: V) {
+  return validate<Commit & V>(v, id, hashCommit)
 }
 
 /** Represents a change to an account's identity. Could be an updated handle, signing key, or pds hosting endpoint. Serves as a prod to all downstream services to refresh their identity cache. */
 export interface Identity {
+  $type?: 'com.atproto.sync.subscribeRepos#identity'
   seq: number
   did: string
   time: string
   /** The current handle for the account, or 'handle.invalid' if validation fails. This field is optional, might have been validated or passed-through from an upstream source. Semantics and behaviors for PDS vs Relay may evolve in the future; see atproto specs for more details. */
   handle?: string
-  [k: string]: unknown
 }
 
-export function isIdentity(v: unknown): v is Identity {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#identity'
-  )
+const hashIdentity = 'identity'
+
+export function isIdentity<V>(v: V) {
+  return is$typed(v, id, hashIdentity)
 }
 
-export function validateIdentity(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#identity', v)
+export function validateIdentity<V>(v: V) {
+  return validate<Identity & V>(v, id, hashIdentity)
 }
 
 /** Represents a change to an account's status on a host (eg, PDS or Relay). The semantics of this event are that the status is at the host which emitted the event, not necessarily that at the currently active PDS. Eg, a Relay takedown would emit a takedown with active=false, even if the PDS is still active. */
 export interface Account {
+  $type?: 'com.atproto.sync.subscribeRepos#account'
   seq: number
   did: string
   time: string
@@ -104,118 +105,105 @@ export interface Account {
   active: boolean
   /** If active=false, this optional field indicates a reason for why the account is not active. */
   status?: 'takendown' | 'suspended' | 'deleted' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
-export function isAccount(v: unknown): v is Account {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#account'
-  )
+const hashAccount = 'account'
+
+export function isAccount<V>(v: V) {
+  return is$typed(v, id, hashAccount)
 }
 
-export function validateAccount(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#account', v)
+export function validateAccount<V>(v: V) {
+  return validate<Account & V>(v, id, hashAccount)
 }
 
 /** DEPRECATED -- Use #identity event instead */
 export interface Handle {
+  $type?: 'com.atproto.sync.subscribeRepos#handle'
   seq: number
   did: string
   handle: string
   time: string
-  [k: string]: unknown
 }
 
-export function isHandle(v: unknown): v is Handle {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#handle'
-  )
+const hashHandle = 'handle'
+
+export function isHandle<V>(v: V) {
+  return is$typed(v, id, hashHandle)
 }
 
-export function validateHandle(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#handle', v)
+export function validateHandle<V>(v: V) {
+  return validate<Handle & V>(v, id, hashHandle)
 }
 
 /** DEPRECATED -- Use #account event instead */
 export interface Migrate {
+  $type?: 'com.atproto.sync.subscribeRepos#migrate'
   seq: number
   did: string
   migrateTo: string | null
   time: string
-  [k: string]: unknown
 }
 
-export function isMigrate(v: unknown): v is Migrate {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#migrate'
-  )
+const hashMigrate = 'migrate'
+
+export function isMigrate<V>(v: V) {
+  return is$typed(v, id, hashMigrate)
 }
 
-export function validateMigrate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#migrate', v)
+export function validateMigrate<V>(v: V) {
+  return validate<Migrate & V>(v, id, hashMigrate)
 }
 
 /** DEPRECATED -- Use #account event instead */
 export interface Tombstone {
+  $type?: 'com.atproto.sync.subscribeRepos#tombstone'
   seq: number
   did: string
   time: string
-  [k: string]: unknown
 }
 
-export function isTombstone(v: unknown): v is Tombstone {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#tombstone'
-  )
+const hashTombstone = 'tombstone'
+
+export function isTombstone<V>(v: V) {
+  return is$typed(v, id, hashTombstone)
 }
 
-export function validateTombstone(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#tombstone', v)
+export function validateTombstone<V>(v: V) {
+  return validate<Tombstone & V>(v, id, hashTombstone)
 }
 
 export interface Info {
+  $type?: 'com.atproto.sync.subscribeRepos#info'
   name: 'OutdatedCursor' | (string & {})
   message?: string
-  [k: string]: unknown
 }
 
-export function isInfo(v: unknown): v is Info {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#info'
-  )
+const hashInfo = 'info'
+
+export function isInfo<V>(v: V) {
+  return is$typed(v, id, hashInfo)
 }
 
-export function validateInfo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#info', v)
+export function validateInfo<V>(v: V) {
+  return validate<Info & V>(v, id, hashInfo)
 }
 
 /** A repo operation, ie a mutation of a single record. */
 export interface RepoOp {
+  $type?: 'com.atproto.sync.subscribeRepos#repoOp'
   action: 'create' | 'update' | 'delete' | (string & {})
   path: string
   /** For creates and updates, the new record CID. For deletions, null. */
   cid: CID | null
-  [k: string]: unknown
 }
 
-export function isRepoOp(v: unknown): v is RepoOp {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#repoOp'
-  )
+const hashRepoOp = 'repoOp'
+
+export function isRepoOp<V>(v: V) {
+  return is$typed(v, id, hashRepoOp)
 }
 
-export function validateRepoOp(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#repoOp', v)
+export function validateRepoOp<V>(v: V) {
+  return validate<RepoOp & V>(v, id, hashRepoOp)
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/temp/addReservedHandle.ts b/packages/ozone/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
index 69be85f72df..78679f078eb 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
@@ -3,21 +3,22 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.temp.addReservedHandle'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   handle: string
-  [k: string]: unknown
 }
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export interface HandlerInput {
   encoding: 'application/json'
diff --git a/packages/ozone/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts b/packages/ozone/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
index 9c7ef1ae6ab..375cdcab7d8 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.temp.checkSignupQueue'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -16,7 +20,6 @@ export interface OutputSchema {
   activated: boolean
   placeInQueue?: number
   estimatedTimeMs?: number
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/temp/fetchLabels.ts b/packages/ozone/src/lexicon/types/com/atproto/temp/fetchLabels.ts
index 0392ba06ea2..bda6d96d968 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/temp/fetchLabels.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/temp/fetchLabels.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoLabelDefs from '../label/defs'
+import type * as ComAtprotoLabelDefs from '../label/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.temp.fetchLabels'
 
 export interface QueryParams {
   since?: number
@@ -18,7 +22,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   labels: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts b/packages/ozone/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
index 8ebee2ad46d..f8c12f72948 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.temp.requestPhoneVerification'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   phoneNumber: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/communication/createTemplate.ts b/packages/ozone/src/lexicon/types/tools/ozone/communication/createTemplate.ts
index 49d46cc6299..1c4bad90748 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/communication/createTemplate.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/communication/createTemplate.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneCommunicationDefs from './defs'
+import type * as ToolsOzoneCommunicationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.communication.createTemplate'
 
 export interface QueryParams {}
 
@@ -22,7 +26,6 @@ export interface InputSchema {
   lang?: string
   /** DID of the user who is creating the template. */
   createdBy?: string
-  [k: string]: unknown
 }
 
 export type OutputSchema = ToolsOzoneCommunicationDefs.TemplateView
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/communication/defs.ts b/packages/ozone/src/lexicon/types/tools/ozone/communication/defs.ts
index 1342dc3c399..c2346fe3bce 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/communication/defs.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/communication/defs.ts
@@ -2,11 +2,16 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.communication.defs'
 
 export interface TemplateView {
+  $type?: 'tools.ozone.communication.defs#templateView'
   id: string
   /** Name of the template. */
   name: string
@@ -21,17 +26,14 @@ export interface TemplateView {
   lastUpdatedBy: string
   createdAt: string
   updatedAt: string
-  [k: string]: unknown
 }
 
-export function isTemplateView(v: unknown): v is TemplateView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.communication.defs#templateView'
-  )
+const hashTemplateView = 'templateView'
+
+export function isTemplateView<V>(v: V) {
+  return is$typed(v, id, hashTemplateView)
 }
 
-export function validateTemplateView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.communication.defs#templateView', v)
+export function validateTemplateView<V>(v: V) {
+  return validate<TemplateView & V>(v, id, hashTemplateView)
 }
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts b/packages/ozone/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts
index d773d84d8e6..43ae07dc711 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.communication.deleteTemplate'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   id: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/communication/listTemplates.ts b/packages/ozone/src/lexicon/types/tools/ozone/communication/listTemplates.ts
index aa2738f5ca2..5a316456f6c 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/communication/listTemplates.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/communication/listTemplates.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneCommunicationDefs from './defs'
+import type * as ToolsOzoneCommunicationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.communication.listTemplates'
 
 export interface QueryParams {}
 
@@ -15,7 +19,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   communicationTemplates: ToolsOzoneCommunicationDefs.TemplateView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/communication/updateTemplate.ts b/packages/ozone/src/lexicon/types/tools/ozone/communication/updateTemplate.ts
index 9f9c532e136..1d56ab55740 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/communication/updateTemplate.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/communication/updateTemplate.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneCommunicationDefs from './defs'
+import type * as ToolsOzoneCommunicationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.communication.updateTemplate'
 
 export interface QueryParams {}
 
@@ -25,7 +29,6 @@ export interface InputSchema {
   /** DID of the user who is updating the template. */
   updatedBy?: string
   disabled?: boolean
-  [k: string]: unknown
 }
 
 export type OutputSchema = ToolsOzoneCommunicationDefs.TemplateView
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts
index 1fb7bf8e25e..611010a42a4 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts
@@ -2,121 +2,119 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
-import * as ChatBskyConvoDefs from '../../../chat/bsky/convo/defs'
-import * as ComAtprotoModerationDefs from '../../../com/atproto/moderation/defs'
-import * as ComAtprotoServerDefs from '../../../com/atproto/server/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs.js'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
+import type * as ChatBskyConvoDefs from '../../../chat/bsky/convo/defs.js'
+import type * as ComAtprotoModerationDefs from '../../../com/atproto/moderation/defs.js'
+import type * as ComAtprotoServerDefs from '../../../com/atproto/server/defs.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.defs'
 
 export interface ModEventView {
+  $type?: 'tools.ozone.moderation.defs#modEventView'
   id: number
   event:
-    | ModEventTakedown
-    | ModEventReverseTakedown
-    | ModEventComment
-    | ModEventReport
-    | ModEventLabel
-    | ModEventAcknowledge
-    | ModEventEscalate
-    | ModEventMute
-    | ModEventUnmute
-    | ModEventMuteReporter
-    | ModEventUnmuteReporter
-    | ModEventEmail
-    | ModEventResolveAppeal
-    | ModEventDivert
-    | ModEventTag
-    | AccountEvent
-    | IdentityEvent
-    | RecordEvent
-    | ModEventPriorityScore
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ModEventTakedown>
+    | $Typed<ModEventReverseTakedown>
+    | $Typed<ModEventComment>
+    | $Typed<ModEventReport>
+    | $Typed<ModEventLabel>
+    | $Typed<ModEventAcknowledge>
+    | $Typed<ModEventEscalate>
+    | $Typed<ModEventMute>
+    | $Typed<ModEventUnmute>
+    | $Typed<ModEventMuteReporter>
+    | $Typed<ModEventUnmuteReporter>
+    | $Typed<ModEventEmail>
+    | $Typed<ModEventResolveAppeal>
+    | $Typed<ModEventDivert>
+    | $Typed<ModEventTag>
+    | $Typed<AccountEvent>
+    | $Typed<IdentityEvent>
+    | $Typed<RecordEvent>
+    | $Typed<ModEventPriorityScore>
+    | { $type: string }
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ChatBskyConvoDefs.MessageRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ChatBskyConvoDefs.MessageRef>
+    | { $type: string }
   subjectBlobCids: string[]
   createdBy: string
   createdAt: string
   creatorHandle?: string
   subjectHandle?: string
-  [k: string]: unknown
 }
 
-export function isModEventView(v: unknown): v is ModEventView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventView'
-  )
+const hashModEventView = 'modEventView'
+
+export function isModEventView<V>(v: V) {
+  return is$typed(v, id, hashModEventView)
 }
 
-export function validateModEventView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventView', v)
+export function validateModEventView<V>(v: V) {
+  return validate<ModEventView & V>(v, id, hashModEventView)
 }
 
 export interface ModEventViewDetail {
+  $type?: 'tools.ozone.moderation.defs#modEventViewDetail'
   id: number
   event:
-    | ModEventTakedown
-    | ModEventReverseTakedown
-    | ModEventComment
-    | ModEventReport
-    | ModEventLabel
-    | ModEventAcknowledge
-    | ModEventEscalate
-    | ModEventMute
-    | ModEventUnmute
-    | ModEventMuteReporter
-    | ModEventUnmuteReporter
-    | ModEventEmail
-    | ModEventResolveAppeal
-    | ModEventDivert
-    | ModEventTag
-    | AccountEvent
-    | IdentityEvent
-    | RecordEvent
-    | ModEventPriorityScore
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ModEventTakedown>
+    | $Typed<ModEventReverseTakedown>
+    | $Typed<ModEventComment>
+    | $Typed<ModEventReport>
+    | $Typed<ModEventLabel>
+    | $Typed<ModEventAcknowledge>
+    | $Typed<ModEventEscalate>
+    | $Typed<ModEventMute>
+    | $Typed<ModEventUnmute>
+    | $Typed<ModEventMuteReporter>
+    | $Typed<ModEventUnmuteReporter>
+    | $Typed<ModEventEmail>
+    | $Typed<ModEventResolveAppeal>
+    | $Typed<ModEventDivert>
+    | $Typed<ModEventTag>
+    | $Typed<AccountEvent>
+    | $Typed<IdentityEvent>
+    | $Typed<RecordEvent>
+    | $Typed<ModEventPriorityScore>
+    | { $type: string }
   subject:
-    | RepoView
-    | RepoViewNotFound
-    | RecordView
-    | RecordViewNotFound
-    | { $type: string; [k: string]: unknown }
+    | $Typed<RepoView>
+    | $Typed<RepoViewNotFound>
+    | $Typed<RecordView>
+    | $Typed<RecordViewNotFound>
+    | { $type: string }
   subjectBlobs: BlobView[]
   createdBy: string
   createdAt: string
-  [k: string]: unknown
 }
 
-export function isModEventViewDetail(v: unknown): v is ModEventViewDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventViewDetail'
-  )
+const hashModEventViewDetail = 'modEventViewDetail'
+
+export function isModEventViewDetail<V>(v: V) {
+  return is$typed(v, id, hashModEventViewDetail)
 }
 
-export function validateModEventViewDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventViewDetail', v)
+export function validateModEventViewDetail<V>(v: V) {
+  return validate<ModEventViewDetail & V>(v, id, hashModEventViewDetail)
 }
 
 export interface SubjectStatusView {
+  $type?: 'tools.ozone.moderation.defs#subjectStatusView'
   id: number
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | { $type: string; [k: string]: unknown }
-  hosting?:
-    | AccountHosting
-    | RecordHosting
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | { $type: string }
+  hosting?: $Typed<AccountHosting> | $Typed<RecordHosting> | { $type: string }
   subjectBlobCids?: string[]
   subjectRepoHandle?: string
   /** Timestamp referencing when the last update was made to the moderation status of the subject */
@@ -142,23 +140,21 @@ export interface SubjectStatusView {
   tags?: string[]
   accountStats?: AccountStats
   recordsStats?: RecordsStats
-  [k: string]: unknown
 }
 
-export function isSubjectStatusView(v: unknown): v is SubjectStatusView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#subjectStatusView'
-  )
+const hashSubjectStatusView = 'subjectStatusView'
+
+export function isSubjectStatusView<V>(v: V) {
+  return is$typed(v, id, hashSubjectStatusView)
 }
 
-export function validateSubjectStatusView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#subjectStatusView', v)
+export function validateSubjectStatusView<V>(v: V) {
+  return validate<SubjectStatusView & V>(v, id, hashSubjectStatusView)
 }
 
 /** Statistics about a particular account subject */
 export interface AccountStats {
+  $type?: 'tools.ozone.moderation.defs#accountStats'
   /** Total number of reports on the account */
   reportCount?: number
   /** Total number of appeals against a moderation action on the account */
@@ -169,23 +165,21 @@ export interface AccountStats {
   escalateCount?: number
   /** Number of times the account was taken down */
   takedownCount?: number
-  [k: string]: unknown
 }
 
-export function isAccountStats(v: unknown): v is AccountStats {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#accountStats'
-  )
+const hashAccountStats = 'accountStats'
+
+export function isAccountStats<V>(v: V) {
+  return is$typed(v, id, hashAccountStats)
 }
 
-export function validateAccountStats(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#accountStats', v)
+export function validateAccountStats<V>(v: V) {
+  return validate<AccountStats & V>(v, id, hashAccountStats)
 }
 
 /** Statistics about a set of record subject items */
 export interface RecordsStats {
+  $type?: 'tools.ozone.moderation.defs#recordsStats'
   /** Cumulative sum of the number of reports on the items in the set */
   totalReports?: number
   /** Number of items that were reported at least once */
@@ -202,19 +196,16 @@ export interface RecordsStats {
   processedCount?: number
   /** Number of item currently taken down */
   takendownCount?: number
-  [k: string]: unknown
 }
 
-export function isRecordsStats(v: unknown): v is RecordsStats {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordsStats'
-  )
+const hashRecordsStats = 'recordsStats'
+
+export function isRecordsStats<V>(v: V) {
+  return is$typed(v, id, hashRecordsStats)
 }
 
-export function validateRecordsStats(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordsStats', v)
+export function validateRecordsStats<V>(v: V) {
+  return validate<RecordsStats & V>(v, id, hashRecordsStats)
 }
 
 export type SubjectReviewState =
@@ -225,16 +216,17 @@ export type SubjectReviewState =
   | (string & {})
 
 /** Moderator review status of a subject: Open. Indicates that the subject needs to be reviewed by a moderator */
-export const REVIEWOPEN = 'tools.ozone.moderation.defs#reviewOpen'
+export const REVIEWOPEN = `${id}#reviewOpen`
 /** Moderator review status of a subject: Escalated. Indicates that the subject was escalated for review by a moderator */
-export const REVIEWESCALATED = 'tools.ozone.moderation.defs#reviewEscalated'
+export const REVIEWESCALATED = `${id}#reviewEscalated`
 /** Moderator review status of a subject: Closed. Indicates that the subject was already reviewed and resolved by a moderator */
-export const REVIEWCLOSED = 'tools.ozone.moderation.defs#reviewClosed'
+export const REVIEWCLOSED = `${id}#reviewClosed`
 /** Moderator review status of a subject: Unnecessary. Indicates that the subject does not need a review at the moment but there is probably some moderation related metadata available for it */
-export const REVIEWNONE = 'tools.ozone.moderation.defs#reviewNone'
+export const REVIEWNONE = `${id}#reviewNone`
 
 /** Take down a subject permanently or temporarily */
 export interface ModEventTakedown {
+  $type?: 'tools.ozone.moderation.defs#modEventTakedown'
   comment?: string
   /** Indicates how long the takedown should be in effect before automatically expiring. */
   durationInHours?: number
@@ -242,344 +234,293 @@ export interface ModEventTakedown {
   acknowledgeAccountSubjects?: boolean
   /** Names/Keywords of the policies that drove the decision. */
   policies?: string[]
-  [k: string]: unknown
 }
 
-export function isModEventTakedown(v: unknown): v is ModEventTakedown {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventTakedown'
-  )
+const hashModEventTakedown = 'modEventTakedown'
+
+export function isModEventTakedown<V>(v: V) {
+  return is$typed(v, id, hashModEventTakedown)
 }
 
-export function validateModEventTakedown(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventTakedown', v)
+export function validateModEventTakedown<V>(v: V) {
+  return validate<ModEventTakedown & V>(v, id, hashModEventTakedown)
 }
 
 /** Revert take down action on a subject */
 export interface ModEventReverseTakedown {
+  $type?: 'tools.ozone.moderation.defs#modEventReverseTakedown'
   /** Describe reasoning behind the reversal. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventReverseTakedown(
-  v: unknown,
-): v is ModEventReverseTakedown {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventReverseTakedown'
-  )
+const hashModEventReverseTakedown = 'modEventReverseTakedown'
+
+export function isModEventReverseTakedown<V>(v: V) {
+  return is$typed(v, id, hashModEventReverseTakedown)
 }
 
-export function validateModEventReverseTakedown(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventReverseTakedown',
+export function validateModEventReverseTakedown<V>(v: V) {
+  return validate<ModEventReverseTakedown & V>(
     v,
+    id,
+    hashModEventReverseTakedown,
   )
 }
 
 /** Resolve appeal on a subject */
 export interface ModEventResolveAppeal {
+  $type?: 'tools.ozone.moderation.defs#modEventResolveAppeal'
   /** Describe resolution. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventResolveAppeal(
-  v: unknown,
-): v is ModEventResolveAppeal {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventResolveAppeal'
-  )
+const hashModEventResolveAppeal = 'modEventResolveAppeal'
+
+export function isModEventResolveAppeal<V>(v: V) {
+  return is$typed(v, id, hashModEventResolveAppeal)
 }
 
-export function validateModEventResolveAppeal(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventResolveAppeal',
-    v,
-  )
+export function validateModEventResolveAppeal<V>(v: V) {
+  return validate<ModEventResolveAppeal & V>(v, id, hashModEventResolveAppeal)
 }
 
 /** Add a comment to a subject */
 export interface ModEventComment {
+  $type?: 'tools.ozone.moderation.defs#modEventComment'
   comment: string
   /** Make the comment persistent on the subject */
   sticky?: boolean
-  [k: string]: unknown
 }
 
-export function isModEventComment(v: unknown): v is ModEventComment {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventComment'
-  )
+const hashModEventComment = 'modEventComment'
+
+export function isModEventComment<V>(v: V) {
+  return is$typed(v, id, hashModEventComment)
 }
 
-export function validateModEventComment(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventComment', v)
+export function validateModEventComment<V>(v: V) {
+  return validate<ModEventComment & V>(v, id, hashModEventComment)
 }
 
 /** Report a subject */
 export interface ModEventReport {
+  $type?: 'tools.ozone.moderation.defs#modEventReport'
   comment?: string
   /** Set to true if the reporter was muted from reporting at the time of the event. These reports won't impact the reviewState of the subject. */
   isReporterMuted?: boolean
   reportType: ComAtprotoModerationDefs.ReasonType
-  [k: string]: unknown
 }
 
-export function isModEventReport(v: unknown): v is ModEventReport {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventReport'
-  )
+const hashModEventReport = 'modEventReport'
+
+export function isModEventReport<V>(v: V) {
+  return is$typed(v, id, hashModEventReport)
 }
 
-export function validateModEventReport(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventReport', v)
+export function validateModEventReport<V>(v: V) {
+  return validate<ModEventReport & V>(v, id, hashModEventReport)
 }
 
 /** Apply/Negate labels on a subject */
 export interface ModEventLabel {
+  $type?: 'tools.ozone.moderation.defs#modEventLabel'
   comment?: string
   createLabelVals: string[]
   negateLabelVals: string[]
   /** Indicates how long the label will remain on the subject. Only applies on labels that are being added. */
   durationInHours?: number
-  [k: string]: unknown
 }
 
-export function isModEventLabel(v: unknown): v is ModEventLabel {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventLabel'
-  )
+const hashModEventLabel = 'modEventLabel'
+
+export function isModEventLabel<V>(v: V) {
+  return is$typed(v, id, hashModEventLabel)
 }
 
-export function validateModEventLabel(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventLabel', v)
+export function validateModEventLabel<V>(v: V) {
+  return validate<ModEventLabel & V>(v, id, hashModEventLabel)
 }
 
 /** Set priority score of the subject. Higher score means higher priority. */
 export interface ModEventPriorityScore {
+  $type?: 'tools.ozone.moderation.defs#modEventPriorityScore'
   comment?: string
   score: number
-  [k: string]: unknown
 }
 
-export function isModEventPriorityScore(
-  v: unknown,
-): v is ModEventPriorityScore {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventPriorityScore'
-  )
+const hashModEventPriorityScore = 'modEventPriorityScore'
+
+export function isModEventPriorityScore<V>(v: V) {
+  return is$typed(v, id, hashModEventPriorityScore)
 }
 
-export function validateModEventPriorityScore(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventPriorityScore',
-    v,
-  )
+export function validateModEventPriorityScore<V>(v: V) {
+  return validate<ModEventPriorityScore & V>(v, id, hashModEventPriorityScore)
 }
 
 export interface ModEventAcknowledge {
+  $type?: 'tools.ozone.moderation.defs#modEventAcknowledge'
   comment?: string
   /** If true, all other reports on content authored by this account will be resolved (acknowledged). */
   acknowledgeAccountSubjects?: boolean
-  [k: string]: unknown
 }
 
-export function isModEventAcknowledge(v: unknown): v is ModEventAcknowledge {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventAcknowledge'
-  )
+const hashModEventAcknowledge = 'modEventAcknowledge'
+
+export function isModEventAcknowledge<V>(v: V) {
+  return is$typed(v, id, hashModEventAcknowledge)
 }
 
-export function validateModEventAcknowledge(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventAcknowledge', v)
+export function validateModEventAcknowledge<V>(v: V) {
+  return validate<ModEventAcknowledge & V>(v, id, hashModEventAcknowledge)
 }
 
 export interface ModEventEscalate {
+  $type?: 'tools.ozone.moderation.defs#modEventEscalate'
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventEscalate(v: unknown): v is ModEventEscalate {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventEscalate'
-  )
+const hashModEventEscalate = 'modEventEscalate'
+
+export function isModEventEscalate<V>(v: V) {
+  return is$typed(v, id, hashModEventEscalate)
 }
 
-export function validateModEventEscalate(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventEscalate', v)
+export function validateModEventEscalate<V>(v: V) {
+  return validate<ModEventEscalate & V>(v, id, hashModEventEscalate)
 }
 
 /** Mute incoming reports on a subject */
 export interface ModEventMute {
+  $type?: 'tools.ozone.moderation.defs#modEventMute'
   comment?: string
   /** Indicates how long the subject should remain muted. */
   durationInHours: number
-  [k: string]: unknown
 }
 
-export function isModEventMute(v: unknown): v is ModEventMute {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventMute'
-  )
+const hashModEventMute = 'modEventMute'
+
+export function isModEventMute<V>(v: V) {
+  return is$typed(v, id, hashModEventMute)
 }
 
-export function validateModEventMute(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventMute', v)
+export function validateModEventMute<V>(v: V) {
+  return validate<ModEventMute & V>(v, id, hashModEventMute)
 }
 
 /** Unmute action on a subject */
 export interface ModEventUnmute {
+  $type?: 'tools.ozone.moderation.defs#modEventUnmute'
   /** Describe reasoning behind the reversal. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventUnmute(v: unknown): v is ModEventUnmute {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventUnmute'
-  )
+const hashModEventUnmute = 'modEventUnmute'
+
+export function isModEventUnmute<V>(v: V) {
+  return is$typed(v, id, hashModEventUnmute)
 }
 
-export function validateModEventUnmute(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventUnmute', v)
+export function validateModEventUnmute<V>(v: V) {
+  return validate<ModEventUnmute & V>(v, id, hashModEventUnmute)
 }
 
 /** Mute incoming reports from an account */
 export interface ModEventMuteReporter {
+  $type?: 'tools.ozone.moderation.defs#modEventMuteReporter'
   comment?: string
   /** Indicates how long the account should remain muted. Falsy value here means a permanent mute. */
   durationInHours?: number
-  [k: string]: unknown
 }
 
-export function isModEventMuteReporter(v: unknown): v is ModEventMuteReporter {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventMuteReporter'
-  )
+const hashModEventMuteReporter = 'modEventMuteReporter'
+
+export function isModEventMuteReporter<V>(v: V) {
+  return is$typed(v, id, hashModEventMuteReporter)
 }
 
-export function validateModEventMuteReporter(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventMuteReporter',
-    v,
-  )
+export function validateModEventMuteReporter<V>(v: V) {
+  return validate<ModEventMuteReporter & V>(v, id, hashModEventMuteReporter)
 }
 
 /** Unmute incoming reports from an account */
 export interface ModEventUnmuteReporter {
+  $type?: 'tools.ozone.moderation.defs#modEventUnmuteReporter'
   /** Describe reasoning behind the reversal. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventUnmuteReporter(
-  v: unknown,
-): v is ModEventUnmuteReporter {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventUnmuteReporter'
-  )
+const hashModEventUnmuteReporter = 'modEventUnmuteReporter'
+
+export function isModEventUnmuteReporter<V>(v: V) {
+  return is$typed(v, id, hashModEventUnmuteReporter)
 }
 
-export function validateModEventUnmuteReporter(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventUnmuteReporter',
-    v,
-  )
+export function validateModEventUnmuteReporter<V>(v: V) {
+  return validate<ModEventUnmuteReporter & V>(v, id, hashModEventUnmuteReporter)
 }
 
 /** Keep a log of outgoing email to a user */
 export interface ModEventEmail {
+  $type?: 'tools.ozone.moderation.defs#modEventEmail'
   /** The subject line of the email sent to the user. */
   subjectLine: string
   /** The content of the email sent to the user. */
   content?: string
   /** Additional comment about the outgoing comm. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventEmail(v: unknown): v is ModEventEmail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventEmail'
-  )
+const hashModEventEmail = 'modEventEmail'
+
+export function isModEventEmail<V>(v: V) {
+  return is$typed(v, id, hashModEventEmail)
 }
 
-export function validateModEventEmail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventEmail', v)
+export function validateModEventEmail<V>(v: V) {
+  return validate<ModEventEmail & V>(v, id, hashModEventEmail)
 }
 
 /** Divert a record's blobs to a 3rd party service for further scanning/tagging */
 export interface ModEventDivert {
+  $type?: 'tools.ozone.moderation.defs#modEventDivert'
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventDivert(v: unknown): v is ModEventDivert {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventDivert'
-  )
+const hashModEventDivert = 'modEventDivert'
+
+export function isModEventDivert<V>(v: V) {
+  return is$typed(v, id, hashModEventDivert)
 }
 
-export function validateModEventDivert(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventDivert', v)
+export function validateModEventDivert<V>(v: V) {
+  return validate<ModEventDivert & V>(v, id, hashModEventDivert)
 }
 
 /** Add/Remove a tag on a subject */
 export interface ModEventTag {
+  $type?: 'tools.ozone.moderation.defs#modEventTag'
   /** Tags to be added to the subject. If already exists, won't be duplicated. */
   add: string[]
   /** Tags to be removed to the subject. Ignores a tag If it doesn't exist, won't be duplicated. */
   remove: string[]
   /** Additional comment about added/removed tags. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventTag(v: unknown): v is ModEventTag {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventTag'
-  )
+const hashModEventTag = 'modEventTag'
+
+export function isModEventTag<V>(v: V) {
+  return is$typed(v, id, hashModEventTag)
 }
 
-export function validateModEventTag(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventTag', v)
+export function validateModEventTag<V>(v: V) {
+  return validate<ModEventTag & V>(v, id, hashModEventTag)
 }
 
 /** Logs account status related events on a repo subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
 export interface AccountEvent {
+  $type?: 'tools.ozone.moderation.defs#accountEvent'
   comment?: string
   /** Indicates that the account has a repository which can be fetched from the host that emitted this event. */
   active: boolean
@@ -592,69 +533,63 @@ export interface AccountEvent {
     | 'tombstoned'
     | (string & {})
   timestamp: string
-  [k: string]: unknown
 }
 
-export function isAccountEvent(v: unknown): v is AccountEvent {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#accountEvent'
-  )
+const hashAccountEvent = 'accountEvent'
+
+export function isAccountEvent<V>(v: V) {
+  return is$typed(v, id, hashAccountEvent)
 }
 
-export function validateAccountEvent(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#accountEvent', v)
+export function validateAccountEvent<V>(v: V) {
+  return validate<AccountEvent & V>(v, id, hashAccountEvent)
 }
 
 /** Logs identity related events on a repo subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
 export interface IdentityEvent {
+  $type?: 'tools.ozone.moderation.defs#identityEvent'
   comment?: string
   handle?: string
   pdsHost?: string
   tombstone?: boolean
   timestamp: string
-  [k: string]: unknown
 }
 
-export function isIdentityEvent(v: unknown): v is IdentityEvent {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#identityEvent'
-  )
+const hashIdentityEvent = 'identityEvent'
+
+export function isIdentityEvent<V>(v: V) {
+  return is$typed(v, id, hashIdentityEvent)
 }
 
-export function validateIdentityEvent(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#identityEvent', v)
+export function validateIdentityEvent<V>(v: V) {
+  return validate<IdentityEvent & V>(v, id, hashIdentityEvent)
 }
 
 /** Logs lifecycle event on a record subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
 export interface RecordEvent {
+  $type?: 'tools.ozone.moderation.defs#recordEvent'
   comment?: string
   op: 'create' | 'update' | 'delete' | (string & {})
   cid?: string
   timestamp: string
-  [k: string]: unknown
 }
 
-export function isRecordEvent(v: unknown): v is RecordEvent {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordEvent'
-  )
+const hashRecordEvent = 'recordEvent'
+
+export function isRecordEvent<V>(v: V) {
+  return is$typed(v, id, hashRecordEvent)
 }
 
-export function validateRecordEvent(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordEvent', v)
+export function validateRecordEvent<V>(v: V) {
+  return validate<RecordEvent & V>(v, id, hashRecordEvent)
 }
 
 export interface RepoView {
+  $type?: 'tools.ozone.moderation.defs#repoView'
   did: string
   handle: string
   email?: string
-  relatedRecords: {}[]
+  relatedRecords: { [_ in string]: unknown }[]
   indexedAt: string
   moderation: Moderation
   invitedBy?: ComAtprotoServerDefs.InviteCode
@@ -662,26 +597,24 @@ export interface RepoView {
   inviteNote?: string
   deactivatedAt?: string
   threatSignatures?: ComAtprotoAdminDefs.ThreatSignature[]
-  [k: string]: unknown
 }
 
-export function isRepoView(v: unknown): v is RepoView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#repoView'
-  )
+const hashRepoView = 'repoView'
+
+export function isRepoView<V>(v: V) {
+  return is$typed(v, id, hashRepoView)
 }
 
-export function validateRepoView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#repoView', v)
+export function validateRepoView<V>(v: V) {
+  return validate<RepoView & V>(v, id, hashRepoView)
 }
 
 export interface RepoViewDetail {
+  $type?: 'tools.ozone.moderation.defs#repoViewDetail'
   did: string
   handle: string
   email?: string
-  relatedRecords: {}[]
+  relatedRecords: { [_ in string]: unknown }[]
   indexedAt: string
   moderation: ModerationDetail
   labels?: ComAtprotoLabelDefs.Label[]
@@ -692,199 +625,176 @@ export interface RepoViewDetail {
   emailConfirmedAt?: string
   deactivatedAt?: string
   threatSignatures?: ComAtprotoAdminDefs.ThreatSignature[]
-  [k: string]: unknown
 }
 
-export function isRepoViewDetail(v: unknown): v is RepoViewDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#repoViewDetail'
-  )
+const hashRepoViewDetail = 'repoViewDetail'
+
+export function isRepoViewDetail<V>(v: V) {
+  return is$typed(v, id, hashRepoViewDetail)
 }
 
-export function validateRepoViewDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#repoViewDetail', v)
+export function validateRepoViewDetail<V>(v: V) {
+  return validate<RepoViewDetail & V>(v, id, hashRepoViewDetail)
 }
 
 export interface RepoViewNotFound {
+  $type?: 'tools.ozone.moderation.defs#repoViewNotFound'
   did: string
-  [k: string]: unknown
 }
 
-export function isRepoViewNotFound(v: unknown): v is RepoViewNotFound {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#repoViewNotFound'
-  )
+const hashRepoViewNotFound = 'repoViewNotFound'
+
+export function isRepoViewNotFound<V>(v: V) {
+  return is$typed(v, id, hashRepoViewNotFound)
 }
 
-export function validateRepoViewNotFound(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#repoViewNotFound', v)
+export function validateRepoViewNotFound<V>(v: V) {
+  return validate<RepoViewNotFound & V>(v, id, hashRepoViewNotFound)
 }
 
 export interface RecordView {
+  $type?: 'tools.ozone.moderation.defs#recordView'
   uri: string
   cid: string
-  value: {}
+  value: { [_ in string]: unknown }
   blobCids: string[]
   indexedAt: string
   moderation: Moderation
   repo: RepoView
-  [k: string]: unknown
 }
 
-export function isRecordView(v: unknown): v is RecordView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordView'
-  )
+const hashRecordView = 'recordView'
+
+export function isRecordView<V>(v: V) {
+  return is$typed(v, id, hashRecordView)
 }
 
-export function validateRecordView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordView', v)
+export function validateRecordView<V>(v: V) {
+  return validate<RecordView & V>(v, id, hashRecordView)
 }
 
 export interface RecordViewDetail {
+  $type?: 'tools.ozone.moderation.defs#recordViewDetail'
   uri: string
   cid: string
-  value: {}
+  value: { [_ in string]: unknown }
   blobs: BlobView[]
   labels?: ComAtprotoLabelDefs.Label[]
   indexedAt: string
   moderation: ModerationDetail
   repo: RepoView
-  [k: string]: unknown
 }
 
-export function isRecordViewDetail(v: unknown): v is RecordViewDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordViewDetail'
-  )
+const hashRecordViewDetail = 'recordViewDetail'
+
+export function isRecordViewDetail<V>(v: V) {
+  return is$typed(v, id, hashRecordViewDetail)
 }
 
-export function validateRecordViewDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordViewDetail', v)
+export function validateRecordViewDetail<V>(v: V) {
+  return validate<RecordViewDetail & V>(v, id, hashRecordViewDetail)
 }
 
 export interface RecordViewNotFound {
+  $type?: 'tools.ozone.moderation.defs#recordViewNotFound'
   uri: string
-  [k: string]: unknown
 }
 
-export function isRecordViewNotFound(v: unknown): v is RecordViewNotFound {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordViewNotFound'
-  )
+const hashRecordViewNotFound = 'recordViewNotFound'
+
+export function isRecordViewNotFound<V>(v: V) {
+  return is$typed(v, id, hashRecordViewNotFound)
 }
 
-export function validateRecordViewNotFound(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordViewNotFound', v)
+export function validateRecordViewNotFound<V>(v: V) {
+  return validate<RecordViewNotFound & V>(v, id, hashRecordViewNotFound)
 }
 
 export interface Moderation {
+  $type?: 'tools.ozone.moderation.defs#moderation'
   subjectStatus?: SubjectStatusView
-  [k: string]: unknown
 }
 
-export function isModeration(v: unknown): v is Moderation {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#moderation'
-  )
+const hashModeration = 'moderation'
+
+export function isModeration<V>(v: V) {
+  return is$typed(v, id, hashModeration)
 }
 
-export function validateModeration(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#moderation', v)
+export function validateModeration<V>(v: V) {
+  return validate<Moderation & V>(v, id, hashModeration)
 }
 
 export interface ModerationDetail {
+  $type?: 'tools.ozone.moderation.defs#moderationDetail'
   subjectStatus?: SubjectStatusView
-  [k: string]: unknown
 }
 
-export function isModerationDetail(v: unknown): v is ModerationDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#moderationDetail'
-  )
+const hashModerationDetail = 'moderationDetail'
+
+export function isModerationDetail<V>(v: V) {
+  return is$typed(v, id, hashModerationDetail)
 }
 
-export function validateModerationDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#moderationDetail', v)
+export function validateModerationDetail<V>(v: V) {
+  return validate<ModerationDetail & V>(v, id, hashModerationDetail)
 }
 
 export interface BlobView {
+  $type?: 'tools.ozone.moderation.defs#blobView'
   cid: string
   mimeType: string
   size: number
   createdAt: string
-  details?:
-    | ImageDetails
-    | VideoDetails
-    | { $type: string; [k: string]: unknown }
+  details?: $Typed<ImageDetails> | $Typed<VideoDetails> | { $type: string }
   moderation?: Moderation
-  [k: string]: unknown
 }
 
-export function isBlobView(v: unknown): v is BlobView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#blobView'
-  )
+const hashBlobView = 'blobView'
+
+export function isBlobView<V>(v: V) {
+  return is$typed(v, id, hashBlobView)
 }
 
-export function validateBlobView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#blobView', v)
+export function validateBlobView<V>(v: V) {
+  return validate<BlobView & V>(v, id, hashBlobView)
 }
 
 export interface ImageDetails {
+  $type?: 'tools.ozone.moderation.defs#imageDetails'
   width: number
   height: number
-  [k: string]: unknown
 }
 
-export function isImageDetails(v: unknown): v is ImageDetails {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#imageDetails'
-  )
+const hashImageDetails = 'imageDetails'
+
+export function isImageDetails<V>(v: V) {
+  return is$typed(v, id, hashImageDetails)
 }
 
-export function validateImageDetails(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#imageDetails', v)
+export function validateImageDetails<V>(v: V) {
+  return validate<ImageDetails & V>(v, id, hashImageDetails)
 }
 
 export interface VideoDetails {
+  $type?: 'tools.ozone.moderation.defs#videoDetails'
   width: number
   height: number
   length: number
-  [k: string]: unknown
 }
 
-export function isVideoDetails(v: unknown): v is VideoDetails {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#videoDetails'
-  )
+const hashVideoDetails = 'videoDetails'
+
+export function isVideoDetails<V>(v: V) {
+  return is$typed(v, id, hashVideoDetails)
 }
 
-export function validateVideoDetails(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#videoDetails', v)
+export function validateVideoDetails<V>(v: V) {
+  return validate<VideoDetails & V>(v, id, hashVideoDetails)
 }
 
 export interface AccountHosting {
+  $type?: 'tools.ozone.moderation.defs#accountHosting'
   status:
     | 'takendown'
     | 'suspended'
@@ -897,37 +807,32 @@ export interface AccountHosting {
   deletedAt?: string
   deactivatedAt?: string
   reactivatedAt?: string
-  [k: string]: unknown
 }
 
-export function isAccountHosting(v: unknown): v is AccountHosting {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#accountHosting'
-  )
+const hashAccountHosting = 'accountHosting'
+
+export function isAccountHosting<V>(v: V) {
+  return is$typed(v, id, hashAccountHosting)
 }
 
-export function validateAccountHosting(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#accountHosting', v)
+export function validateAccountHosting<V>(v: V) {
+  return validate<AccountHosting & V>(v, id, hashAccountHosting)
 }
 
 export interface RecordHosting {
+  $type?: 'tools.ozone.moderation.defs#recordHosting'
   status: 'deleted' | 'unknown' | (string & {})
   updatedAt?: string
   createdAt?: string
   deletedAt?: string
-  [k: string]: unknown
 }
 
-export function isRecordHosting(v: unknown): v is RecordHosting {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordHosting'
-  )
+const hashRecordHosting = 'recordHosting'
+
+export function isRecordHosting<V>(v: V) {
+  return is$typed(v, id, hashRecordHosting)
 }
 
-export function validateRecordHosting(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordHosting', v)
+export function validateRecordHosting<V>(v: V) {
+  return validate<RecordHosting & V>(v, id, hashRecordHosting)
 }
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/emitEvent.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
index 8f0f00e98f8..1fa8d586491 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
@@ -3,44 +3,47 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
-import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import type * as ToolsOzoneModerationDefs from './defs.js'
+import type * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs.js'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.emitEvent'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   event:
-    | ToolsOzoneModerationDefs.ModEventTakedown
-    | ToolsOzoneModerationDefs.ModEventAcknowledge
-    | ToolsOzoneModerationDefs.ModEventEscalate
-    | ToolsOzoneModerationDefs.ModEventComment
-    | ToolsOzoneModerationDefs.ModEventLabel
-    | ToolsOzoneModerationDefs.ModEventReport
-    | ToolsOzoneModerationDefs.ModEventMute
-    | ToolsOzoneModerationDefs.ModEventUnmute
-    | ToolsOzoneModerationDefs.ModEventMuteReporter
-    | ToolsOzoneModerationDefs.ModEventUnmuteReporter
-    | ToolsOzoneModerationDefs.ModEventReverseTakedown
-    | ToolsOzoneModerationDefs.ModEventResolveAppeal
-    | ToolsOzoneModerationDefs.ModEventEmail
-    | ToolsOzoneModerationDefs.ModEventTag
-    | ToolsOzoneModerationDefs.AccountEvent
-    | ToolsOzoneModerationDefs.IdentityEvent
-    | ToolsOzoneModerationDefs.RecordEvent
-    | ToolsOzoneModerationDefs.ModEventPriorityScore
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ToolsOzoneModerationDefs.ModEventTakedown>
+    | $Typed<ToolsOzoneModerationDefs.ModEventAcknowledge>
+    | $Typed<ToolsOzoneModerationDefs.ModEventEscalate>
+    | $Typed<ToolsOzoneModerationDefs.ModEventComment>
+    | $Typed<ToolsOzoneModerationDefs.ModEventLabel>
+    | $Typed<ToolsOzoneModerationDefs.ModEventReport>
+    | $Typed<ToolsOzoneModerationDefs.ModEventMute>
+    | $Typed<ToolsOzoneModerationDefs.ModEventUnmute>
+    | $Typed<ToolsOzoneModerationDefs.ModEventMuteReporter>
+    | $Typed<ToolsOzoneModerationDefs.ModEventUnmuteReporter>
+    | $Typed<ToolsOzoneModerationDefs.ModEventReverseTakedown>
+    | $Typed<ToolsOzoneModerationDefs.ModEventResolveAppeal>
+    | $Typed<ToolsOzoneModerationDefs.ModEventEmail>
+    | $Typed<ToolsOzoneModerationDefs.ModEventTag>
+    | $Typed<ToolsOzoneModerationDefs.AccountEvent>
+    | $Typed<ToolsOzoneModerationDefs.IdentityEvent>
+    | $Typed<ToolsOzoneModerationDefs.RecordEvent>
+    | $Typed<ToolsOzoneModerationDefs.ModEventPriorityScore>
+    | { $type: string }
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | { $type: string }
   subjectBlobCids?: string[]
   createdBy: string
-  [k: string]: unknown
 }
 
 export type OutputSchema = ToolsOzoneModerationDefs.ModEventView
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getEvent.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getEvent.ts
index c7e1b5943f3..fc89a911503 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getEvent.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getEvent.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
+import type * as ToolsOzoneModerationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.getEvent'
 
 export interface QueryParams {
   id: number
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecord.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecord.ts
index 67eca72d05f..f11d70fdb65 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecord.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecord.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
+import type * as ToolsOzoneModerationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.getRecord'
 
 export interface QueryParams {
   uri: string
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecords.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecords.ts
index 46e11ef48e3..b6f214ccaee 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecords.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecords.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
+import type * as ToolsOzoneModerationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.getRecords'
 
 export interface QueryParams {
   uris: string[]
@@ -17,11 +21,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   records: (
-    | ToolsOzoneModerationDefs.RecordViewDetail
-    | ToolsOzoneModerationDefs.RecordViewNotFound
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ToolsOzoneModerationDefs.RecordViewDetail>
+    | $Typed<ToolsOzoneModerationDefs.RecordViewNotFound>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepo.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepo.ts
index ff675e577dc..123ae28b45c 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepo.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepo.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
+import type * as ToolsOzoneModerationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.getRepo'
 
 export interface QueryParams {
   did: string
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepos.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepos.ts
index f113ef4395c..c1788f74877 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepos.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepos.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
+import type * as ToolsOzoneModerationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.getRepos'
 
 export interface QueryParams {
   dids: string[]
@@ -17,11 +21,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   repos: (
-    | ToolsOzoneModerationDefs.RepoViewDetail
-    | ToolsOzoneModerationDefs.RepoViewNotFound
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ToolsOzoneModerationDefs.RepoViewDetail>
+    | $Typed<ToolsOzoneModerationDefs.RepoViewNotFound>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryEvents.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryEvents.ts
index c29249690d4..aab72d7e27b 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryEvents.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryEvents.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
+import type * as ToolsOzoneModerationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.queryEvents'
 
 export interface QueryParams {
   /** The types of events (fully qualified string in the format of tools.ozone.moderation.defs#modEvent<name>) to filter by. If not specified, all events are returned. */
@@ -49,7 +53,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   events: ToolsOzoneModerationDefs.ModEventView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
index 8e79b023c4c..118da702a56 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
+import type * as ToolsOzoneModerationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.queryStatuses'
 
 export interface QueryParams {
   /** Number of queues being used by moderators. Subjects will be split among all queues. */
@@ -83,7 +87,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   subjectStatuses: ToolsOzoneModerationDefs.SubjectStatusView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/searchRepos.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/searchRepos.ts
index 2aca4ee5a97..fcfd429463d 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/searchRepos.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/searchRepos.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
+import type * as ToolsOzoneModerationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.searchRepos'
 
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead */
@@ -22,7 +26,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   repos: ToolsOzoneModerationDefs.RepoView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/server/getConfig.ts b/packages/ozone/src/lexicon/types/tools/ozone/server/getConfig.ts
index 78ac5c2fb85..7e17aecae6e 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/server/getConfig.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/server/getConfig.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.server.getConfig'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -18,7 +22,6 @@ export interface OutputSchema {
   blobDivert?: ServiceConfig
   chat?: ServiceConfig
   viewer?: ViewerConfig
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -48,39 +51,35 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface ServiceConfig {
+  $type?: 'tools.ozone.server.getConfig#serviceConfig'
   url?: string
-  [k: string]: unknown
 }
 
-export function isServiceConfig(v: unknown): v is ServiceConfig {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.server.getConfig#serviceConfig'
-  )
+const hashServiceConfig = 'serviceConfig'
+
+export function isServiceConfig<V>(v: V) {
+  return is$typed(v, id, hashServiceConfig)
 }
 
-export function validateServiceConfig(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.server.getConfig#serviceConfig', v)
+export function validateServiceConfig<V>(v: V) {
+  return validate<ServiceConfig & V>(v, id, hashServiceConfig)
 }
 
 export interface ViewerConfig {
+  $type?: 'tools.ozone.server.getConfig#viewerConfig'
   role?:
     | 'tools.ozone.team.defs#roleAdmin'
     | 'tools.ozone.team.defs#roleModerator'
     | 'tools.ozone.team.defs#roleTriage'
     | (string & {})
-  [k: string]: unknown
 }
 
-export function isViewerConfig(v: unknown): v is ViewerConfig {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.server.getConfig#viewerConfig'
-  )
+const hashViewerConfig = 'viewerConfig'
+
+export function isViewerConfig<V>(v: V) {
+  return is$typed(v, id, hashViewerConfig)
 }
 
-export function validateViewerConfig(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.server.getConfig#viewerConfig', v)
+export function validateViewerConfig<V>(v: V) {
+  return validate<ViewerConfig & V>(v, id, hashViewerConfig)
 }
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/set/addValues.ts b/packages/ozone/src/lexicon/types/tools/ozone/set/addValues.ts
index 41ae9830f30..3d98cb52514 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/addValues.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/addValues.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.set.addValues'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -15,7 +19,6 @@ export interface InputSchema {
   name: string
   /** Array of string values to add to the set */
   values: string[]
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/set/defs.ts b/packages/ozone/src/lexicon/types/tools/ozone/set/defs.ts
index 4256bf8a90f..ac1db2d6ada 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/defs.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/defs.ts
@@ -2,43 +2,45 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.set.defs'
 
 export interface Set {
+  $type?: 'tools.ozone.set.defs#set'
   name: string
   description?: string
-  [k: string]: unknown
 }
 
-export function isSet(v: unknown): v is Set {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'tools.ozone.set.defs#set'
-  )
+const hashSet = 'set'
+
+export function isSet<V>(v: V) {
+  return is$typed(v, id, hashSet)
 }
 
-export function validateSet(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.set.defs#set', v)
+export function validateSet<V>(v: V) {
+  return validate<Set & V>(v, id, hashSet)
 }
 
 export interface SetView {
+  $type?: 'tools.ozone.set.defs#setView'
   name: string
   description?: string
   setSize: number
   createdAt: string
   updatedAt: string
-  [k: string]: unknown
 }
 
-export function isSetView(v: unknown): v is SetView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.set.defs#setView'
-  )
+const hashSetView = 'setView'
+
+export function isSetView<V>(v: V) {
+  return is$typed(v, id, hashSetView)
 }
 
-export function validateSetView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.set.defs#setView', v)
+export function validateSetView<V>(v: V) {
+  return validate<SetView & V>(v, id, hashSetView)
 }
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/set/deleteSet.ts b/packages/ozone/src/lexicon/types/tools/ozone/set/deleteSet.ts
index 4612b73d044..51d6d2043a4 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/deleteSet.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/deleteSet.ts
@@ -3,22 +3,23 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.set.deleteSet'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   /** Name of the set to delete */
   name: string
-  [k: string]: unknown
 }
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export interface HandlerInput {
   encoding: 'application/json'
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/set/deleteValues.ts b/packages/ozone/src/lexicon/types/tools/ozone/set/deleteValues.ts
index f0a18ff3b26..219a9591eab 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/deleteValues.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/deleteValues.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.set.deleteValues'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -15,7 +19,6 @@ export interface InputSchema {
   name: string
   /** Array of string values to delete from the set */
   values: string[]
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/set/getValues.ts b/packages/ozone/src/lexicon/types/tools/ozone/set/getValues.ts
index d6f3af9e43e..0f360892b77 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/getValues.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/getValues.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneSetDefs from './defs'
+import type * as ToolsOzoneSetDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.set.getValues'
 
 export interface QueryParams {
   name: string
@@ -21,7 +25,6 @@ export interface OutputSchema {
   set: ToolsOzoneSetDefs.SetView
   values: string[]
   cursor?: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/set/querySets.ts b/packages/ozone/src/lexicon/types/tools/ozone/set/querySets.ts
index a1fe230268e..4bb0d21030e 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/querySets.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/querySets.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneSetDefs from './defs'
+import type * as ToolsOzoneSetDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.set.querySets'
 
 export interface QueryParams {
   limit: number
@@ -23,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   sets: ToolsOzoneSetDefs.SetView[]
   cursor?: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/set/upsertSet.ts b/packages/ozone/src/lexicon/types/tools/ozone/set/upsertSet.ts
index 843ad1029db..a50e25e2549 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/upsertSet.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/upsertSet.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneSetDefs from './defs'
+import type * as ToolsOzoneSetDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.set.upsertSet'
 
 export interface QueryParams {}
 
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/setting/defs.ts b/packages/ozone/src/lexicon/types/tools/ozone/setting/defs.ts
index 8a87cbb0e24..a17c778d26c 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/setting/defs.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/setting/defs.ts
@@ -2,14 +2,19 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.setting.defs'
 
 export interface Option {
+  $type?: 'tools.ozone.setting.defs#option'
   key: string
   did: string
-  value: {}
+  value: { [_ in string]: unknown }
   description?: string
   createdAt?: string
   updatedAt?: string
@@ -21,17 +26,14 @@ export interface Option {
   scope: 'instance' | 'personal' | (string & {})
   createdBy: string
   lastUpdatedBy: string
-  [k: string]: unknown
 }
 
-export function isOption(v: unknown): v is Option {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.setting.defs#option'
-  )
+const hashOption = 'option'
+
+export function isOption<V>(v: V) {
+  return is$typed(v, id, hashOption)
 }
 
-export function validateOption(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.setting.defs#option', v)
+export function validateOption<V>(v: V) {
+  return validate<Option & V>(v, id, hashOption)
 }
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/setting/listOptions.ts b/packages/ozone/src/lexicon/types/tools/ozone/setting/listOptions.ts
index 464cdf7c50b..f2b736a459f 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/setting/listOptions.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/setting/listOptions.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneSettingDefs from './defs'
+import type * as ToolsOzoneSettingDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.setting.listOptions'
 
 export interface QueryParams {
   limit: number
@@ -24,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   options: ToolsOzoneSettingDefs.Option[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/setting/removeOptions.ts b/packages/ozone/src/lexicon/types/tools/ozone/setting/removeOptions.ts
index 3aa323a7fa6..98192dd3498 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/setting/removeOptions.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/setting/removeOptions.ts
@@ -3,22 +3,23 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.setting.removeOptions'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   keys: string[]
   scope: 'instance' | 'personal' | (string & {})
-  [k: string]: unknown
 }
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export interface HandlerInput {
   encoding: 'application/json'
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/setting/upsertOption.ts b/packages/ozone/src/lexicon/types/tools/ozone/setting/upsertOption.ts
index ee541ffe817..b57934bb8bc 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/setting/upsertOption.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/setting/upsertOption.ts
@@ -3,30 +3,32 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneSettingDefs from './defs'
+import type * as ToolsOzoneSettingDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.setting.upsertOption'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   key: string
   scope: 'instance' | 'personal' | (string & {})
-  value: {}
+  value: { [_ in string]: unknown }
   description?: string
   managerRole?:
     | 'tools.ozone.team.defs#roleModerator'
     | 'tools.ozone.team.defs#roleTriage'
     | 'tools.ozone.team.defs#roleAdmin'
     | (string & {})
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   option: ToolsOzoneSettingDefs.Option
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/signature/defs.ts b/packages/ozone/src/lexicon/types/tools/ozone/signature/defs.ts
index 2c9d9604aaa..bc862a6f312 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/signature/defs.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/signature/defs.ts
@@ -2,24 +2,26 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.signature.defs'
 
 export interface SigDetail {
+  $type?: 'tools.ozone.signature.defs#sigDetail'
   property: string
   value: string
-  [k: string]: unknown
 }
 
-export function isSigDetail(v: unknown): v is SigDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.signature.defs#sigDetail'
-  )
+const hashSigDetail = 'sigDetail'
+
+export function isSigDetail<V>(v: V) {
+  return is$typed(v, id, hashSigDetail)
 }
 
-export function validateSigDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.signature.defs#sigDetail', v)
+export function validateSigDetail<V>(v: V) {
+  return validate<SigDetail & V>(v, id, hashSigDetail)
 }
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/signature/findCorrelation.ts b/packages/ozone/src/lexicon/types/tools/ozone/signature/findCorrelation.ts
index f12bdf6a04f..7387912d7db 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/signature/findCorrelation.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/signature/findCorrelation.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneSignatureDefs from './defs'
+import type * as ToolsOzoneSignatureDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.signature.findCorrelation'
 
 export interface QueryParams {
   dids: string[]
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   details: ToolsOzoneSignatureDefs.SigDetail[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts b/packages/ozone/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts
index b4773ac2e20..47eaca37c23 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts
@@ -3,12 +3,16 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
-import * as ToolsOzoneSignatureDefs from './defs'
+import type * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs.js'
+import type * as ToolsOzoneSignatureDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.signature.findRelatedAccounts'
 
 export interface QueryParams {
   did: string
@@ -21,7 +25,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   accounts: RelatedAccount[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -51,22 +54,17 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface RelatedAccount {
+  $type?: 'tools.ozone.signature.findRelatedAccounts#relatedAccount'
   account: ComAtprotoAdminDefs.AccountView
   similarities?: ToolsOzoneSignatureDefs.SigDetail[]
-  [k: string]: unknown
 }
 
-export function isRelatedAccount(v: unknown): v is RelatedAccount {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.signature.findRelatedAccounts#relatedAccount'
-  )
+const hashRelatedAccount = 'relatedAccount'
+
+export function isRelatedAccount<V>(v: V) {
+  return is$typed(v, id, hashRelatedAccount)
 }
 
-export function validateRelatedAccount(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'tools.ozone.signature.findRelatedAccounts#relatedAccount',
-    v,
-  )
+export function validateRelatedAccount<V>(v: V) {
+  return validate<RelatedAccount & V>(v, id, hashRelatedAccount)
 }
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/signature/searchAccounts.ts b/packages/ozone/src/lexicon/types/tools/ozone/signature/searchAccounts.ts
index ad1f3f3c3b8..d75bf7db15c 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/signature/searchAccounts.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/signature/searchAccounts.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
+import type * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.signature.searchAccounts'
 
 export interface QueryParams {
   values: string[]
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   accounts: ComAtprotoAdminDefs.AccountView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/team/addMember.ts b/packages/ozone/src/lexicon/types/tools/ozone/team/addMember.ts
index ad33479adcf..a1250fee4a0 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/team/addMember.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/team/addMember.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneTeamDefs from './defs'
+import type * as ToolsOzoneTeamDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.team.addMember'
 
 export interface QueryParams {}
 
@@ -18,7 +22,6 @@ export interface InputSchema {
     | 'tools.ozone.team.defs#roleModerator'
     | 'tools.ozone.team.defs#roleTriage'
     | (string & {})
-  [k: string]: unknown
 }
 
 export type OutputSchema = ToolsOzoneTeamDefs.Member
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/team/defs.ts b/packages/ozone/src/lexicon/types/tools/ozone/team/defs.ts
index b670ecc0a70..19c81550218 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/team/defs.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/team/defs.ts
@@ -2,12 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../../../app/bsky/actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.team.defs'
 
 export interface Member {
+  $type?: 'tools.ozone.team.defs#member'
   did: string
   disabled?: boolean
   profile?: AppBskyActorDefs.ProfileViewDetailed
@@ -19,24 +24,21 @@ export interface Member {
     | 'lex:tools.ozone.team.defs#roleModerator'
     | 'lex:tools.ozone.team.defs#roleTriage'
     | (string & {})
-  [k: string]: unknown
 }
 
-export function isMember(v: unknown): v is Member {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.team.defs#member'
-  )
+const hashMember = 'member'
+
+export function isMember<V>(v: V) {
+  return is$typed(v, id, hashMember)
 }
 
-export function validateMember(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.team.defs#member', v)
+export function validateMember<V>(v: V) {
+  return validate<Member & V>(v, id, hashMember)
 }
 
 /** Admin role. Highest level of access, can perform all actions. */
-export const ROLEADMIN = 'tools.ozone.team.defs#roleAdmin'
+export const ROLEADMIN = `${id}#roleAdmin`
 /** Moderator role. Can perform most actions. */
-export const ROLEMODERATOR = 'tools.ozone.team.defs#roleModerator'
+export const ROLEMODERATOR = `${id}#roleModerator`
 /** Triage role. Mostly intended for monitoring and escalating issues. */
-export const ROLETRIAGE = 'tools.ozone.team.defs#roleTriage'
+export const ROLETRIAGE = `${id}#roleTriage`
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/team/deleteMember.ts b/packages/ozone/src/lexicon/types/tools/ozone/team/deleteMember.ts
index 14f0265fd6f..6f4722168d8 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/team/deleteMember.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/team/deleteMember.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.team.deleteMember'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   did: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/team/listMembers.ts b/packages/ozone/src/lexicon/types/tools/ozone/team/listMembers.ts
index 813e86e9b16..8488cb9b54c 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/team/listMembers.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/team/listMembers.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneTeamDefs from './defs'
+import type * as ToolsOzoneTeamDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.team.listMembers'
 
 export interface QueryParams {
   limit: number
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   members: ToolsOzoneTeamDefs.Member[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/team/updateMember.ts b/packages/ozone/src/lexicon/types/tools/ozone/team/updateMember.ts
index 4c343144a1b..d2175d3c97d 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/team/updateMember.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/team/updateMember.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneTeamDefs from './defs'
+import type * as ToolsOzoneTeamDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.team.updateMember'
 
 export interface QueryParams {}
 
@@ -19,7 +23,6 @@ export interface InputSchema {
     | 'tools.ozone.team.defs#roleModerator'
     | 'tools.ozone.team.defs#roleTriage'
     | (string & {})
-  [k: string]: unknown
 }
 
 export type OutputSchema = ToolsOzoneTeamDefs.Member
diff --git a/packages/ozone/src/lexicon/util.ts b/packages/ozone/src/lexicon/util.ts
index d7e70440d6e..7f88b6a6ef3 100644
--- a/packages/ozone/src/lexicon/util.ts
+++ b/packages/ozone/src/lexicon/util.ts
@@ -1,13 +1,82 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
-export function isObj(v: unknown): v is Record<string, unknown> {
-  return typeof v === 'object' && v !== null
+
+import { 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 function hasProp<K extends PropertyKey>(
-  data: object,
-  prop: K,
-): data is Record<K, unknown> {
-  return prop in data
+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/packages/ozone/src/mod-service/index.ts b/packages/ozone/src/mod-service/index.ts
index 59e9588223d..03a43f0b9b6 100644
--- a/packages/ozone/src/mod-service/index.ts
+++ b/packages/ozone/src/mod-service/index.ts
@@ -21,6 +21,7 @@ import { ImageInvalidator } from '../image-invalidator'
 import { ids } from '../lexicon/lexicons'
 import { RepoBlobRef, RepoRef } from '../lexicon/types/com/atproto/admin/defs'
 import { Label } from '../lexicon/types/com/atproto/label/defs'
+import { ReasonType } from '../lexicon/types/com/atproto/moderation/defs'
 import { Main as StrongRef } from '../lexicon/types/com/atproto/repo/strongRef'
 import {
   REVIEWESCALATED,
@@ -471,7 +472,11 @@ export class ModerationService {
     const modEvent = await this.db.db
       .insertInto('moderation_event')
       .values({
-        comment: event.comment ? `${event.comment}` : null,
+        comment:
+          ('comment' in event &&
+            typeof event.comment === 'string' &&
+            event.comment) ||
+          null,
         action: event.$type as ModerationEvent['action'],
         createdAt: createdAt.toISOString(),
         createdBy,
@@ -479,9 +484,10 @@ export class ModerationService {
         negateLabelVals,
         addedTags,
         removedTags,
-        durationInHours: event.durationInHours
-          ? Number(event.durationInHours)
-          : null,
+        durationInHours:
+          'durationInHours' in event && event.durationInHours
+            ? Number(event.durationInHours)
+            : null,
         meta: Object.assign(meta, subjectInfo.meta),
         expiresAt:
           (isModEventTakedown(event) || isModEventMute(event)) &&
@@ -783,7 +789,7 @@ export class ModerationService {
   }
 
   async report(info: {
-    reasonType: NonNullable<ModerationEventRow['meta']>['reportType']
+    reasonType: ReasonType
     reason?: string
     subject: ModSubject
     reportedBy: string
diff --git a/packages/ozone/src/mod-service/subject.ts b/packages/ozone/src/mod-service/subject.ts
index 5a46a567e9c..66c0dc2eb60 100644
--- a/packages/ozone/src/mod-service/subject.ts
+++ b/packages/ozone/src/mod-service/subject.ts
@@ -1,44 +1,50 @@
 import { AtUri } from '@atproto/syntax'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { MessageRef } from '../lexicon/types/chat/bsky/convo/defs'
-import { RepoRef } from '../lexicon/types/com/atproto/admin/defs'
+import * as ChatBskyConvoDefs from '../lexicon/types/chat/bsky/convo/defs'
+import { RepoRef, isRepoRef } from '../lexicon/types/com/atproto/admin/defs'
 import { InputSchema as ReportInput } from '../lexicon/types/com/atproto/moderation/createReport'
-import { Main as StrongRef } from '../lexicon/types/com/atproto/repo/strongRef'
+import * as ComAtprotoRepoStrongRef from '../lexicon/types/com/atproto/repo/strongRef'
 import { InputSchema as ActionInput } from '../lexicon/types/tools/ozone/moderation/emitEvent'
+import { $Typed, asPredicate } from '../lexicon/util'
 import { ModerationEventRow, ModerationSubjectStatusRow } from './types'
 
 type SubjectInput = ReportInput['subject'] | ActionInput['subject']
 
+type StrongRef = ComAtprotoRepoStrongRef.Main
+const isStrongRef = asPredicate(ComAtprotoRepoStrongRef.validateMain)
+
+type MessageRef = ChatBskyConvoDefs.MessageRef
+const isValidMessageRef = asPredicate(ChatBskyConvoDefs.validateMessageRef)
+
+const isMessageRefWithoutConvoId = (
+  subject: unknown,
+): subject is $Typed<Omit<MessageRef, 'convoId'> & { convoId?: string }> =>
+  subject != null &&
+  typeof subject === 'object' &&
+  isValidMessageRef({ convoId: '', ...subject })
+
 export const subjectFromInput = (
   subject: SubjectInput,
   blobs?: string[],
 ): ModSubject => {
-  if (
-    subject.$type === 'com.atproto.admin.defs#repoRef' &&
-    typeof subject.did === 'string'
-  ) {
+  if (isRepoRef(subject)) {
     if (blobs && blobs.length > 0) {
       throw new InvalidRequestError('Blobs do not apply to repo subjects')
     }
     return new RepoSubject(subject.did)
   }
-  if (
-    subject.$type === 'com.atproto.repo.strongRef' &&
-    typeof subject.uri === 'string' &&
-    typeof subject.cid === 'string'
-  ) {
+  if (isStrongRef(subject)) {
     return new RecordSubject(subject.uri, subject.cid, blobs)
   }
   // @NOTE #messageRef is not a report input for com.atproto.moderation.createReport.
   // we are taking advantage of the open union in order for bsky.chat to interoperate here.
-  if (
-    subject.$type === 'chat.bsky.convo.defs#messageRef' &&
-    typeof subject.did === 'string' &&
-    (typeof subject.convoId === 'string' || subject.convoId === undefined) &&
-    typeof subject.messageId === 'string'
-  ) {
-    // @TODO we should start to require subject.convoId is a string in order to properly validate
-    // the #messageRef. temporarily allowing it to be optional as a stopgap for rollout.
+  if (isValidMessageRef(subject)) {
+    return new MessageSubject(subject.did, subject.convoId, subject.messageId)
+  }
+  // @TODO we should start to require subject.convoId is a string in order to properly validate
+  // the #messageRef. temporarily allowing it to be optional as a stopgap for rollout.
+  // The next "if" can be removed once convoId is consistently provided.
+  if (isMessageRefWithoutConvoId(subject)) {
     return new MessageSubject(
       subject.did,
       subject.convoId ?? '',
@@ -106,7 +112,7 @@ export interface ModSubject {
   isRecord(): this is RecordSubject
   isMessage(): this is MessageSubject
   info(): SubjectInfo
-  lex(): RepoRef | StrongRef | MessageRef
+  lex(): $Typed<RepoRef> | $Typed<StrongRef> | $Typed<MessageRef>
 }
 
 export class RepoSubject implements ModSubject {
@@ -133,7 +139,7 @@ export class RepoSubject implements ModSubject {
       meta: null,
     }
   }
-  lex(): RepoRef {
+  lex(): $Typed<RepoRef> {
     return {
       $type: 'com.atproto.admin.defs#repoRef',
       did: this.did,
@@ -174,7 +180,7 @@ export class RecordSubject implements ModSubject {
       meta: null,
     }
   }
-  lex(): StrongRef {
+  lex(): $Typed<StrongRef> {
     return {
       $type: 'com.atproto.repo.strongRef',
       uri: this.uri,
@@ -211,7 +217,7 @@ export class MessageSubject implements ModSubject {
       meta: { convoId: this.convoId || undefined },
     }
   }
-  lex(): MessageRef {
+  lex(): $Typed<MessageRef> {
     return {
       $type: 'chat.bsky.convo.defs#messageRef',
       did: this.did,
diff --git a/packages/ozone/src/mod-service/types.ts b/packages/ozone/src/mod-service/types.ts
index 6e620307f45..4941768c40f 100644
--- a/packages/ozone/src/mod-service/types.ts
+++ b/packages/ozone/src/mod-service/types.ts
@@ -1,7 +1,7 @@
 import { type Selectable } from 'kysely'
-import { ToolsOzoneModerationDefs } from '@atproto/api'
 import { ModerationEvent } from '../db/schema/moderation_event'
 import { ModerationSubjectStatus } from '../db/schema/moderation_subject_status'
+import { ModEventView } from '../lexicon/types/tools/ozone/moderation/defs'
 import { ModSubject } from './subject'
 
 export type ModerationEventRow = Selectable<ModerationEvent>
@@ -42,20 +42,7 @@ export type ModerationSubjectStatusRowWithStats = ModerationSubjectStatusRow & {
 export type ModerationSubjectStatusRowWithHandle =
   ModerationSubjectStatusRowWithStats & { handle: string | null }
 
-export type ModEventType =
-  | ToolsOzoneModerationDefs.ModEventTakedown
-  | ToolsOzoneModerationDefs.ModEventAcknowledge
-  | ToolsOzoneModerationDefs.ModEventEscalate
-  | ToolsOzoneModerationDefs.ModEventComment
-  | ToolsOzoneModerationDefs.ModEventLabel
-  | ToolsOzoneModerationDefs.ModEventReport
-  | ToolsOzoneModerationDefs.ModEventMute
-  | ToolsOzoneModerationDefs.ModEventReverseTakedown
-  | ToolsOzoneModerationDefs.ModEventTag
-  | ToolsOzoneModerationDefs.AccountEvent
-  | ToolsOzoneModerationDefs.IdentityEvent
-  | ToolsOzoneModerationDefs.RecordEvent
-  | ToolsOzoneModerationDefs.ModEventPriorityScore
+export type ModEventType = ModEventView['event']
 
 type AccountHostingView = {
   $type: 'tools.ozone.moderation.defs#accountHosting'
diff --git a/packages/ozone/src/mod-service/util.ts b/packages/ozone/src/mod-service/util.ts
index c07ce48de8c..4c2e61969f7 100644
--- a/packages/ozone/src/mod-service/util.ts
+++ b/packages/ozone/src/mod-service/util.ts
@@ -16,7 +16,7 @@ export const formatLabel = (row: LabelRow): Label => {
     cts: row.cts,
     exp: row.exp ?? undefined,
     sig: row.sig ? new Uint8Array(row.sig) : undefined,
-  }) as Label
+  } satisfies Label) as unknown as Label
 }
 
 export const formatLabelRow = (
@@ -50,7 +50,7 @@ export const signLabel = async (
     neg: neg === true ? true : undefined,
     cts,
     exp,
-  }) as Label
+  } satisfies Label) as unknown as Label
 
   const bytes = cborEncode(reformatted)
   const sig = await signingKey.sign(bytes)
diff --git a/packages/ozone/src/mod-service/views.ts b/packages/ozone/src/mod-service/views.ts
index 7cf7e4775e2..57451298ee2 100644
--- a/packages/ozone/src/mod-service/views.ts
+++ b/packages/ozone/src/mod-service/views.ts
@@ -1,5 +1,5 @@
 import { sql } from 'kysely'
-import { AppBskyFeedDefs, AtpAgent } from '@atproto/api'
+import { AtpAgent } from '@atproto/api'
 import { dedupeStrs } from '@atproto/common'
 import { Keypair } from '@atproto/crypto'
 import { BlobRef } from '@atproto/lexicon'
@@ -7,8 +7,12 @@ import { AtUri, INVALID_HANDLE, normalizeDatetimeAlways } from '@atproto/syntax'
 import { Database } from '../db'
 import { LabelRow } from '../db/schema/label'
 import { ids } from '../lexicon/lexicons'
+import { FeedViewPost } from '../lexicon/types/app/bsky/feed/defs'
 import { AccountView } from '../lexicon/types/com/atproto/admin/defs'
-import { Label, isSelfLabels } from '../lexicon/types/com/atproto/label/defs'
+import {
+  Label,
+  validateSelfLabels,
+} from '../lexicon/types/com/atproto/label/defs'
 import { OutputSchema as ReportOutput } from '../lexicon/types/com/atproto/moderation/createReport'
 import { REASONOTHER } from '../lexicon/types/com/atproto/moderation/defs'
 import {
@@ -19,7 +23,22 @@ import {
   RecordViewDetail,
   RepoView,
   SubjectStatusView,
+  isAccountEvent,
+  isIdentityEvent,
+  isModEventAcknowledge,
+  isModEventComment,
+  isModEventEmail,
+  isModEventEscalate,
+  isModEventLabel,
+  isModEventMute,
+  isModEventMuteReporter,
+  isModEventPriorityScore,
+  isModEventReport,
+  isModEventTag,
+  isModEventTakedown,
+  isRecordEvent,
 } from '../lexicon/types/tools/ozone/moderation/defs'
+import { Un$Typed, asPredicate } from '../lexicon/util'
 import { dbLogger, httpLogger } from '../logger'
 import { ParsedLabelers } from '../util'
 import { moderationSubjectStatusQueryBuilder } from './status'
@@ -30,6 +49,15 @@ import {
 } from './types'
 import { formatLabel, signLabel } from './util'
 
+const isValidSelfLabels = asPredicate(validateSelfLabels)
+
+const ifString = (val: unknown): string | undefined =>
+  typeof val === 'string' ? val : undefined
+const ifBoolean = (val: unknown): boolean | undefined =>
+  typeof val === 'boolean' ? val : undefined
+const ifNumber = (val: unknown): number | undefined =>
+  typeof val === 'number' ? val : undefined
+
 export type AuthHeaders = {
   headers: {
     authorization: string
@@ -93,145 +121,116 @@ export class ModerationViews {
     }, new Map<string, RepoView>())
   }
 
-  formatEvent(event: ModerationEventRowWithHandle): ModEventView {
-    const eventView: ModEventView = {
-      id: event.id,
+  formatEvent(row: ModerationEventRowWithHandle): Un$Typed<ModEventView> {
+    const eventView: Un$Typed<ModEventView> = {
+      id: row.id,
       event: {
-        $type: event.action,
-        comment: event.comment ?? undefined,
+        $type: row.action,
+        comment: row.comment ?? undefined,
       },
-      subject: subjectFromEventRow(event).lex(),
-      subjectBlobCids: event.subjectBlobCids ?? [],
-      createdBy: event.createdBy,
-      createdAt: event.createdAt,
-      subjectHandle: event.subjectHandle ?? undefined,
-      creatorHandle: event.creatorHandle ?? undefined,
-    }
-
-    if (
-      [
-        'tools.ozone.moderation.defs#modEventMuteReporter',
-        'tools.ozone.moderation.defs#modEventTakedown',
-        'tools.ozone.moderation.defs#modEventLabel',
-        'tools.ozone.moderation.defs#modEventMute',
-        'tools.ozone.moderation.defs#modEventPriorityScore',
-      ].includes(event.action)
-    ) {
-      eventView.event = {
-        ...eventView.event,
-        durationInHours: event.durationInHours ?? undefined,
-      }
+      subject: subjectFromEventRow(row).lex(),
+      subjectBlobCids: row.subjectBlobCids ?? [],
+      createdBy: row.createdBy,
+      createdAt: row.createdAt,
+      subjectHandle: row.subjectHandle ?? undefined,
+      creatorHandle: row.creatorHandle ?? undefined,
     }
 
-    if (event.action === 'tools.ozone.moderation.defs#modEventPriorityScore') {
-      eventView.event = {
-        ...eventView.event,
-        score: event.meta?.priorityScore ?? 0,
-      }
-    }
+    const { event } = eventView
+    const meta = row.meta || {}
 
     if (
-      (event.action === 'tools.ozone.moderation.defs#modEventTakedown' ||
-        event.action === 'tools.ozone.moderation.defs#modEventAcknowledge') &&
-      event.meta?.acknowledgeAccountSubjects
+      isModEventMuteReporter(event) ||
+      isModEventTakedown(event) ||
+      isModEventLabel(event) ||
+      isModEventMute(event)
     ) {
-      eventView.event = {
-        ...eventView.event,
-        acknowledgeAccountSubjects: event.meta.acknowledgeAccountSubjects,
-      }
+      event.durationInHours = row.durationInHours ?? undefined
     }
 
     if (
-      event.action === 'tools.ozone.moderation.defs#modEventTakedown' &&
-      typeof event.meta?.policies === 'string' &&
-      event.meta.policies.length > 0
+      (isModEventTakedown(event) || isModEventAcknowledge(event)) &&
+      meta.acknowledgeAccountSubjects
     ) {
-      eventView.event = {
-        ...eventView.event,
-        policies: event.meta.policies.split(','),
-      }
+      event.acknowledgeAccountSubjects = ifBoolean(
+        meta.acknowledgeAccountSubjects,
+      )!
     }
 
-    if (event.action === 'tools.ozone.moderation.defs#modEventLabel') {
-      eventView.event = {
-        ...eventView.event,
-        createLabelVals: event.createLabelVals?.length
-          ? event.createLabelVals.split(' ')
-          : [],
-        negateLabelVals: event.negateLabelVals?.length
-          ? event.negateLabelVals.split(' ')
-          : [],
-      }
+    if (isModEventPriorityScore(event)) {
+      event.score = ifNumber(meta?.priorityScore) ?? 0
     }
 
-    // This is for legacy data only, for new events, these types of events won't have labels attached
     if (
-      [
-        'tools.ozone.moderation.defs#modEventAcknowledge',
-        'tools.ozone.moderation.defs#modEventTakedown',
-        'tools.ozone.moderation.defs#modEventEscalate',
-      ].includes(event.action)
+      isModEventTakedown(event) &&
+      typeof meta.policies === 'string' &&
+      meta.policies.length > 0
     ) {
-      if (event.createLabelVals?.length) {
-        eventView.event = {
-          ...eventView.event,
-          createLabelVals: event.createLabelVals.split(' '),
-        }
+      event.policies = meta.policies.split(',')
+    }
+
+    if (isModEventLabel(event)) {
+      event.createLabelVals = row.createLabelVals?.length
+        ? row.createLabelVals.split(' ')
+        : []
+      event.negateLabelVals = row.negateLabelVals?.length
+        ? row.negateLabelVals.split(' ')
+        : []
+    } else if (
+      isModEventAcknowledge(event) ||
+      isModEventTakedown(event) ||
+      isModEventEscalate(event)
+    ) {
+      // This is for legacy data only, for new events, these types of events
+      // won't have labels attached:
+
+      if (row.createLabelVals?.length) {
+        // @ts-expect-error legacy
+        event.createLabelVals = row.createLabelVals.split(' ')
       }
 
-      if (event.negateLabelVals?.length) {
-        eventView.event = {
-          ...eventView.event,
-          negateLabelVals: event.negateLabelVals.split(' '),
-        }
+      if (row.negateLabelVals?.length) {
+        // @ts-expect-error legacy
+        event.negateLabelVals = row.negateLabelVals.split(' ')
       }
     }
 
-    if (event.action === 'tools.ozone.moderation.defs#modEventReport') {
-      eventView.event = {
-        ...eventView.event,
-        reportType: event.meta?.reportType ?? undefined,
-        isReporterMuted: !!event.meta?.isReporterMuted,
-      }
+    if (isModEventReport(event)) {
+      event.isReporterMuted = !!meta.isReporterMuted
+      event.reportType = ifString(meta.reportType)!
     }
 
-    if (event.action === 'tools.ozone.moderation.defs#modEventEmail') {
-      eventView.event = {
-        ...eventView.event,
-        subjectLine: event.meta?.subjectLine ?? '',
-        content: event.meta?.content,
-      }
+    if (isModEventEmail(event)) {
+      event.content = ifString(meta.content)!
+      event.subjectLine = ifString(meta.subjectLine)!
     }
 
-    if (
-      event.action === 'tools.ozone.moderation.defs#modEventComment' &&
-      event.meta?.sticky
-    ) {
-      eventView.event.sticky = true
+    if (isModEventComment(event) && meta.sticky) {
+      event.sticky = true
     }
 
-    if (event.action === 'tools.ozone.moderation.defs#modEventTag') {
-      eventView.event.add = event.addedTags || []
-      eventView.event.remove = event.removedTags || []
+    if (isModEventTag(event)) {
+      event.add = row.addedTags || []
+      event.remove = row.removedTags || []
     }
 
-    if (event.action === 'tools.ozone.moderation.defs#accountEvent') {
-      eventView.event.active = !!event.meta?.active
-      eventView.event.timestamp = event.meta?.timestamp
-      eventView.event.status = event.meta?.status
+    if (isAccountEvent(event)) {
+      event.active = !!meta.active
+      event.timestamp = ifString(meta.timestamp)!
+      event.status = ifString(meta.status)!
     }
 
-    if (event.action === 'tools.ozone.moderation.defs#identityEvent') {
-      eventView.event.timestamp = event.meta?.timestamp
-      eventView.event.handle = event.meta?.handle
-      eventView.event.pdsHost = event.meta?.pdsHost
-      eventView.event.tombstone = !!event.meta?.tombstone
+    if (isIdentityEvent(event)) {
+      event.timestamp = ifString(meta.timestamp)!
+      event.handle = ifString(meta.handle)!
+      event.pdsHost = ifString(meta.pdsHost)!
+      event.tombstone = !!meta.tombstone
     }
 
-    if (event.action === 'tools.ozone.moderation.defs#recordEvent') {
-      eventView.event.op = event.meta?.op
-      eventView.event.cid = event.meta?.cid
-      eventView.event.timestamp = event.meta?.timestamp
+    if (isRecordEvent(event)) {
+      event.op = ifString(meta.op)!
+      event.cid = ifString(meta.cid)!
+      event.timestamp = ifString(meta.timestamp)!
     }
 
     return eventView
@@ -249,7 +248,7 @@ export class ModerationViews {
     }
     const subject = await this.subject(subjectId)
     const eventView = this.formatEvent(result)
-    const allBlobs = findBlobRefs(subject.value)
+    const allBlobs = 'value' in subject ? findBlobRefs(subject.value) : []
     const subjectBlobs = await this.blob(
       allBlobs.filter((blob) =>
         eventView.subjectBlobCids.includes(blob.ref.toString()),
@@ -323,7 +322,7 @@ export class ModerationViews {
     }, new Map<string, RecordInfo>())
   }
 
-  async records(subjects: RecordSubject[]): Promise<Map<string, RecordView>> {
+  async records(subjects: RecordSubject[]) {
     const uris = subjects.map((record) => new AtUri(record.uri))
     const dids = uris.map((u) => u.hostname)
 
@@ -333,13 +332,26 @@ export class ModerationViews {
       this.fetchRecords(subjects),
     ])
 
-    return uris.reduce((acc, uri) => {
+    const map = new Map<
+      string,
+      // Because the result of this function is used to build RecordViewDetail,
+      // we explicitly type the result without the $type field, so can be used
+      // as both RecordView and RecordViewDetail, without having to cast or
+      // override the $type field.
+      RecordView & {
+        $type?: undefined
+        moderation: { $type?: undefined; subjectStatus?: SubjectStatusView }
+      }
+    >()
+
+    for (const uri of uris) {
       const repo = repos.get(uri.hostname)
-      if (!repo) return acc
+      if (!repo) continue
       const record = records.get(uri.toString())
-      if (!record) return acc
+      if (!record) continue
       const subjectStatus = subjectStatuses.get(uri.toString())
-      return acc.set(uri.toString(), {
+
+      map.set(uri.toString(), {
         uri: uri.toString(),
         cid: record.cid,
         value: record.value,
@@ -352,7 +364,9 @@ export class ModerationViews {
             : undefined,
         },
       })
-    }, new Map<string, RecordView>())
+    }
+
+    return map
   }
 
   async recordDetails(
@@ -443,7 +457,7 @@ export class ModerationViews {
         : REASONOTHER,
       reason: report.comment ?? undefined,
       reportedBy: report.createdBy,
-      subject: subjectFromEventRow(report).lex(),
+      subject: subjectFromEventRow(report).lex() as ReportOutput['subject'],
     }
   }
   // Partial view for subjects
@@ -454,12 +468,12 @@ export class ModerationViews {
       const repo = repos.get(subject)
       if (repo) {
         return {
-          $type: 'com.atproto.admin.defs#repoView',
           ...repo,
+          $type: 'tools.ozone.moderation.defs#repoView',
         }
       } else {
         return {
-          $type: 'com.atproto.admin.defs#repoViewNotFound',
+          $type: 'tools.ozone.moderation.defs#repoViewNotFound',
           did: subject,
         }
       }
@@ -468,12 +482,12 @@ export class ModerationViews {
       const record = records.get(subject)
       if (record) {
         return {
-          $type: 'com.atproto.admin.defs#recordView',
           ...record,
+          $type: 'tools.ozone.moderation.defs#recordView',
         }
       } else {
         return {
-          $type: 'com.atproto.admin.defs#recordViewNotFound',
+          $type: 'tools.ozone.moderation.defs#recordViewNotFound',
           uri: subject,
         }
       }
@@ -621,7 +635,9 @@ export class ModerationViews {
       subjectBlobCids: status.blobCids || [],
       tags: status.tags || [],
       priorityScore: status.priorityScore,
-      subject: subjectFromStatusRow(status).lex(),
+      subject: subjectFromStatusRow(
+        status,
+      ).lex() as SubjectStatusView['subject'],
 
       accountStats: {
         // Explicitly typing to allow for easy manipulation (e.g. to strip from tests snapshots)
@@ -674,9 +690,7 @@ export class ModerationViews {
     return statusView
   }
 
-  async fetchAuthorFeed(
-    actor: string,
-  ): Promise<AppBskyFeedDefs.FeedViewPost[]> {
+  async fetchAuthorFeed(actor: string): Promise<FeedViewPost[]> {
     const auth = await this.appviewAuth(ids.AppBskyFeedGetAuthorFeed)
     if (!auth) return []
     const {
@@ -730,7 +744,7 @@ export function getSelfLabels(details: {
 }): Label[] {
   const { uri, cid, record } = details
   if (!uri || !cid || !record) return []
-  if (!isSelfLabels(record.labels)) return []
+  if (!isValidSelfLabels(record.labels)) return []
   const src = new AtUri(uri).host // record creator
   const cts =
     typeof record.createdAt === 'string'
diff --git a/packages/ozone/src/tag-service/embed-tagger.ts b/packages/ozone/src/tag-service/embed-tagger.ts
index 5f8161f295e..cd7d5a19f0d 100644
--- a/packages/ozone/src/tag-service/embed-tagger.ts
+++ b/packages/ozone/src/tag-service/embed-tagger.ts
@@ -28,12 +28,14 @@ export class EmbedTagger extends ContentTagger {
         return []
       }
       const tags: string[] = []
-      if (AppBskyFeedPost.isRecord(recordValue)) {
+      const result = AppBskyFeedPost.validateRecord(recordValue)
+
+      if (result.success) {
         const embedContent = AppBskyEmbedRecordWithMedia.isMain(
-          recordValue.embed,
+          result.value.embed,
         )
-          ? recordValue.embed.media
-          : recordValue.embed
+          ? result.value.embed.media
+          : result.value.embed
 
         if (AppBskyEmbedImages.isMain(embedContent)) {
           tags.push(`${this.tagPrefix}image`)
diff --git a/packages/ozone/src/tag-service/language-tagger.ts b/packages/ozone/src/tag-service/language-tagger.ts
index 9d461d3f35c..7c0099ed224 100644
--- a/packages/ozone/src/tag-service/language-tagger.ts
+++ b/packages/ozone/src/tag-service/language-tagger.ts
@@ -8,6 +8,11 @@ import { langLogger as log } from '../logger'
 import { ContentTagger } from './content-tagger'
 import { code3ToCode2 } from './language-data'
 
+const ifString = (value: unknown): string | undefined =>
+  typeof value === 'string' ? value : undefined
+const isStringProp = (obj: object, prop: string): string | undefined =>
+  prop in obj ? ifString(obj[prop]) : undefined
+
 export class LanguageTagger extends ContentTagger {
   tagPrefix = 'lang:'
 
@@ -27,18 +32,22 @@ export class LanguageTagger extends ContentTagger {
     }
   }
 
-  getTextFromRecord(recordValue?: Record<string, unknown>): string | undefined {
+  getTextFromRecord(recordValue: Record<string, unknown>): string | undefined {
     let text: string | undefined
 
     if (AppBskyGraphList.isRecord(recordValue)) {
-      text = recordValue.description || recordValue.name
+      text =
+        isStringProp(recordValue, 'description') ||
+        isStringProp(recordValue, 'name')
     } else if (
       AppBskyFeedGenerator.isRecord(recordValue) ||
       AppBskyActorProfile.isRecord(recordValue)
     ) {
-      text = recordValue.description || recordValue.displayName
+      text =
+        isStringProp(recordValue, 'description') ||
+        isStringProp(recordValue, 'displayName')
     } else if (AppBskyFeedPost.isRecord(recordValue)) {
-      text = recordValue.text
+      text = isStringProp(recordValue, 'text')
     }
 
     return text?.trim()
@@ -70,7 +79,9 @@ export class LanguageTagger extends ContentTagger {
       ])
       const record = recordByUri.get(this.subject.uri)
       const recordLang = record?.value.langs as string[] | null
-      const recordText = this.getTextFromRecord(record?.value)
+      const recordText = record
+        ? this.getTextFromRecord(record.value)
+        : undefined
       if (recordLang?.length) {
         recordLang
           .map((lang) => lang.split('-')[0])
diff --git a/packages/ozone/tests/__snapshots__/moderation-events.test.ts.snap b/packages/ozone/tests/__snapshots__/moderation-events.test.ts.snap
index d4988121159..595a9b9e151 100644
--- a/packages/ozone/tests/__snapshots__/moderation-events.test.ts.snap
+++ b/packages/ozone/tests/__snapshots__/moderation-events.test.ts.snap
@@ -12,7 +12,7 @@ Object {
   },
   "id": 1,
   "subject": Object {
-    "$type": "com.atproto.admin.defs#repoView",
+    "$type": "tools.ozone.moderation.defs#repoView",
     "did": "user(0)",
     "handle": "alice.test",
     "indexedAt": "1970-01-01T00:00:00.000Z",
diff --git a/packages/ozone/tests/_util.ts b/packages/ozone/tests/_util.ts
index 144d26940a5..6aa2e8be483 100644
--- a/packages/ozone/tests/_util.ts
+++ b/packages/ozone/tests/_util.ts
@@ -4,14 +4,22 @@ import { type Express } from 'express'
 import { CID } from 'multiformats/cid'
 import { lexToJson } from '@atproto/lexicon'
 import { AtUri } from '@atproto/syntax'
-import { isViewRecord } from '../src/lexicon/types/app/bsky/embed/record'
+import {
+  isView as isEmbedRecordView,
+  isViewRecord,
+} from '../src/lexicon/types/app/bsky/embed/record'
+import { isView as isEmbedRecordWithMediaView } from '../src/lexicon/types/app/bsky/embed/recordWithMedia'
 import {
   FeedViewPost,
   PostView,
+  ThreadViewPost,
   isPostView,
+  isReasonRepost,
   isThreadViewPost,
 } from '../src/lexicon/types/app/bsky/feed/defs'
 
+export const identity = <T>(x: T) => x
+
 // Swap out identifiers and dates with stable
 // values for the purpose of snapshot testing
 export const forSnapshot = (obj: unknown) => {
@@ -86,10 +94,10 @@ export const forSnapshot = (obj: unknown) => {
 // Feed testing utils
 
 export const getOriginator = (item: FeedViewPost) => {
-  if (!item.reason) {
-    return item.post.author.did
+  if (isReasonRepost(item.reason)) {
+    return item.reason.by.did
   } else {
-    return (item.reason.by as { [did: string]: string }).did
+    return item.post.author.did
   }
 }
 
@@ -149,34 +157,35 @@ export const paginateAll = async <T extends { cursor?: string }>(
 }
 
 // @NOTE mutates
-export const stripViewer = <T extends { viewer?: Record<string, unknown> }>(
-  val: T,
-): T => {
+export const stripViewer = <T extends { viewer?: unknown }>(val: T): T => {
   delete val.viewer
   return val
 }
 
+const extractRecordEmbed = (embed: PostView['embed']) =>
+  isEmbedRecordView(embed)
+    ? isViewRecord(embed.record)
+      ? embed.record
+      : undefined
+    : isEmbedRecordWithMediaView(embed)
+      ? isViewRecord(embed.record.record)
+        ? embed.record.record
+        : undefined
+      : undefined
+
 // @NOTE mutates
-export const stripViewerFromPost = (postUnknown: unknown): PostView => {
-  if (postUnknown?.['$type'] && !isPostView(postUnknown)) {
+export const stripViewerFromPost = (postUnknown: object): PostView => {
+  if ('$type' in postUnknown && !isPostView(postUnknown)) {
     throw new Error('Expected post view')
   }
   const post = postUnknown as PostView
   post.author = stripViewer(post.author)
-  const recordEmbed =
-    post.embed && isViewRecord(post.embed.record)
-      ? post.embed.record // Record from record embed
-      : post.embed?.['record'] && isViewRecord(post.embed['record']['record'])
-        ? post.embed['record']['record'] // Record from record-with-media embed
-        : undefined
+
+  const recordEmbed = extractRecordEmbed(post.embed)
   if (recordEmbed) {
     recordEmbed.author = stripViewer(recordEmbed.author)
     recordEmbed.embeds?.forEach((deepEmbed) => {
-      const deepRecordEmbed = isViewRecord(deepEmbed.record)
-        ? deepEmbed.record // Record from record embed
-        : deepEmbed['record'] && isViewRecord(deepEmbed['record']['record'])
-          ? deepEmbed['record']['record'] // Record from record-with-media embed
-          : undefined
+      const deepRecordEmbed = extractRecordEmbed(deepEmbed)
       if (deepRecordEmbed) {
         deepRecordEmbed.author = stripViewer(deepRecordEmbed.author)
       }
@@ -186,15 +195,20 @@ export const stripViewerFromPost = (postUnknown: unknown): PostView => {
 }
 
 // @NOTE mutates
-export const stripViewerFromThread = <T>(thread: T): T => {
+export const stripViewerFromThread = <T extends ThreadViewPost>(
+  thread: T,
+): Omit<T, 'viewer'> => {
   if (!isThreadViewPost(thread)) return thread
+  // @ts-expect-error
   delete thread.viewer
   thread.post = stripViewerFromPost(thread.post)
   if (isThreadViewPost(thread.parent)) {
     thread.parent = stripViewerFromThread(thread.parent)
   }
   if (thread.replies) {
-    thread.replies = thread.replies.map(stripViewerFromThread)
+    thread.replies = thread.replies.map((r) =>
+      isThreadViewPost(r) ? stripViewerFromThread(r) : r,
+    )
   }
   return thread
 }
diff --git a/packages/ozone/tests/blob-divert.test.ts b/packages/ozone/tests/blob-divert.test.ts
index 4637f3bc420..04a3578af26 100644
--- a/packages/ozone/tests/blob-divert.test.ts
+++ b/packages/ozone/tests/blob-divert.test.ts
@@ -1,4 +1,5 @@
 import assert from 'node:assert'
+import { ToolsOzoneModerationDefs } from '@atproto/api'
 import {
   ModeratorClient,
   SeedClient,
@@ -6,7 +7,7 @@ import {
   basicSeed,
 } from '@atproto/dev-env'
 import { ResponseType, XRPCError } from '@atproto/xrpc'
-import { forSnapshot } from './_util'
+import { forSnapshot, identity } from './_util'
 
 describe('blob divert', () => {
   let network: TestNetwork
@@ -56,10 +57,11 @@ describe('blob divert', () => {
     modClient.emitEvent(
       {
         subject: getSubject(),
-        event: {
+        // @ts-expect-error "tools.ozone.moderation.defs#modEventDivert" is not part of the event open union
+        event: identity<ToolsOzoneModerationDefs.ModEventDivert>({
           $type: 'tools.ozone.moderation.defs#modEventDivert',
           comment: 'Diverting for test',
-        },
+        }),
         createdBy: sc.dids.alice,
         subjectBlobCids: getImages().map((img) => img.image.ref.toString()),
       },
diff --git a/packages/ozone/tests/moderation-appeals.test.ts b/packages/ozone/tests/moderation-appeals.test.ts
index e1b8731598b..d81b0be425e 100644
--- a/packages/ozone/tests/moderation-appeals.test.ts
+++ b/packages/ozone/tests/moderation-appeals.test.ts
@@ -98,6 +98,7 @@ describe('moderation-appeals', () => {
 
       // Verify that appeal status changed when appeal report was emitted by moderator
       const status = await assertBobsPostStatus(REVIEWESCALATED, true)
+      // @ts-expect-error unspecced ?
       expect(status?.appealedAt).not.toBeNull()
 
       // Create a report as normal user for carol's post
diff --git a/packages/ozone/tests/moderation-events.test.ts b/packages/ozone/tests/moderation-events.test.ts
index af671e4e70a..288e821f5b6 100644
--- a/packages/ozone/tests/moderation-events.test.ts
+++ b/packages/ozone/tests/moderation-events.test.ts
@@ -7,11 +7,13 @@ import {
   TestNetwork,
   basicSeed,
 } from '@atproto/dev-env'
+import { isRepoRef } from '../src/lexicon/types/com/atproto/admin/defs'
 import {
   REASONAPPEAL,
   REASONMISLEADING,
   REASONSPAM,
 } from '../src/lexicon/types/com/atproto/moderation/defs'
+import { isMain as isStrongRef } from '../src/lexicon/types/com/atproto/repo/strongRef'
 import { forSnapshot } from './_util'
 
 describe('moderation-events', () => {
@@ -361,6 +363,7 @@ describe('moderation-events', () => {
 
       expect(addAndRemoveEvent.id).toEqual(addAndRemoveFinder.events[0].id)
       expect(addAndRemoveEvent.id).toEqual(addAndRemoveFinder.events[0].id)
+      assert(ToolsOzoneModerationDefs.isModEventTag(addAndRemoveEvent.event))
       expect(addAndRemoveEvent.event.add).toEqual(['L3'])
       expect(addAndRemoveEvent.event.remove).toEqual(['L2'])
     })
@@ -411,11 +414,13 @@ describe('moderation-events', () => {
       ])
 
       expect(onlyStarterPackReports.events.length).toEqual(1)
+      assert(isStrongRef(onlyStarterPackReports.events[0].subject))
       expect(onlyStarterPackReports.events[0].subject.uri).toContain(
         'app.bsky.graph.starterpack',
       )
 
       expect(onlyAlicesStarterPackReports.events.length).toEqual(1)
+      assert(isStrongRef(onlyAlicesStarterPackReports.events[0].subject))
       expect(onlyAlicesStarterPackReports.events[0].subject.uri).toContain(
         sp.uriStr,
       )
@@ -441,20 +446,24 @@ describe('moderation-events', () => {
           }),
         ])
 
-      // only account reports are returned, no event has a uri
-      expect(
-        onlyAccountReports.events.every((e) => !e.subject.uri),
-      ).toBeTruthy()
+      assert(
+        onlyAccountReports.events.every((e) => !isStrongRef(e.subject)),
+        'only account reports are returned, no event has a uri',
+      )
 
-      // only record reports are returned, all events have a uri
-      expect(onlyRecordReports.events.every((e) => e.subject.uri)).toBeTruthy()
+      assert(
+        onlyRecordReports.events.every(
+          (e) => isStrongRef(e.subject) && e.subject.uri,
+        ),
+        'only record reports are returned, all events have a uri',
+      )
 
-      // only bob's account reports are returned, no events have a URI even though the subjectType is record
-      expect(
+      assert(
         onlyReportsOnBobsAccount.events.every(
-          (e) => !e.subject.uri && e.subject.did === sc.dids.bob,
+          (e) => isRepoRef(e.subject) && e.subject.did === sc.dids.bob,
         ),
-      ).toBeTruthy()
+        "only bob's account reports are returned, no events have a URI even though the subjectType is record",
+      )
     })
   })
 
diff --git a/packages/ozone/tests/moderation-status-tags.test.ts b/packages/ozone/tests/moderation-status-tags.test.ts
index 532a87a77c2..f28566ed084 100644
--- a/packages/ozone/tests/moderation-status-tags.test.ts
+++ b/packages/ozone/tests/moderation-status-tags.test.ts
@@ -1,3 +1,5 @@
+import assert from 'node:assert'
+import { ComAtprotoAdminDefs } from '@atproto/api'
 import {
   ModeratorClient,
   SeedClient,
@@ -96,14 +98,17 @@ describe('moderation-status-tags', () => {
 
       // Verify that the queue only contains 1 item with both en and ja tags which is alice's account
       expect(englishAndJapaneseQueue.subjectStatuses.length).toEqual(1)
-      expect(englishAndJapaneseQueue.subjectStatuses[0].subject.did).toEqual(
-        sc.dids.alice,
-      )
+      const { subject } = englishAndJapaneseQueue.subjectStatuses[0]
+      assert(ComAtprotoAdminDefs.isRepoRef(subject))
+      expect(subject.did).toEqual(sc.dids.alice)
 
       // Verify that when querying for either en or ja tags, both alice and bob are returned
       expect(englishOrJapaneseQueue.subjectStatuses.length).toEqual(2)
       const englishOrJapaneseDids = englishOrJapaneseQueue.subjectStatuses.map(
-        ({ subject }) => subject.did,
+        ({ subject }) => {
+          assert(ComAtprotoAdminDefs.isRepoRef(subject))
+          return subject.did
+        },
       )
       expect(englishOrJapaneseDids).toContain(sc.dids.alice)
       expect(englishOrJapaneseDids).toContain(sc.dids.bob)
diff --git a/packages/ozone/tests/moderation-statuses.test.ts b/packages/ozone/tests/moderation-statuses.test.ts
index b50f68606da..c8d17b60cf7 100644
--- a/packages/ozone/tests/moderation-statuses.test.ts
+++ b/packages/ozone/tests/moderation-statuses.test.ts
@@ -9,10 +9,12 @@ import {
   TestNetwork,
   basicSeed,
 } from '@atproto/dev-env'
+import { isRepoRef } from '../src/lexicon/types/com/atproto/admin/defs'
 import {
   REASONMISLEADING,
   REASONSPAM,
 } from '../src/lexicon/types/com/atproto/moderation/defs'
+import { isMain as isStrongRef } from '../src/lexicon/types/com/atproto/repo/strongRef'
 import {
   REVIEWNONE,
   REVIEWOPEN,
@@ -220,10 +222,14 @@ describe('moderation-statuses', () => {
       ])
 
       expect(onlyStarterPackStatuses.subjectStatuses.length).toEqual(1)
+      assert(isStrongRef(onlyStarterPackStatuses.subjectStatuses[0].subject))
       expect(onlyStarterPackStatuses.subjectStatuses[0].subject.uri).toContain(
         'app.bsky.graph.starterpack',
       )
       expect(onlyAlicesStarterPackStatuses.subjectStatuses.length).toEqual(1)
+      assert(
+        isStrongRef(onlyAlicesStarterPackStatuses.subjectStatuses[0].subject),
+      )
       expect(
         onlyAlicesStarterPackStatuses.subjectStatuses[0].subject.uri,
       ).toEqual(sp.uriStr)
@@ -249,22 +255,26 @@ describe('moderation-statuses', () => {
         }),
       ])
 
-      // only account statuses are returned, no event has a uri
-      expect(
-        onlyAccountStatuses.subjectStatuses.every((e) => !e.subject.uri),
-      ).toBeTruthy()
+      assert(
+        onlyAccountStatuses.subjectStatuses.every(
+          (e) => !isStrongRef(e.subject),
+        ),
+        'only account statuses are returned, no event has a uri',
+      )
 
-      // only record statuses are returned, all events have a uri
-      expect(
-        onlyRecordStatuses.subjectStatuses.every((e) => e.subject.uri),
-      ).toBeTruthy()
+      assert(
+        onlyRecordStatuses.subjectStatuses.every(
+          (e) => isStrongRef(e.subject) && e.subject.uri,
+        ),
+        'only record statuses are returned, all events have a uri',
+      )
 
-      // only bob's account statuses are returned, no events have a URI even though the subjectType is record
-      expect(
+      assert(
         onlyStatusesOnBobsAccount.subjectStatuses.every(
-          (e) => !e.subject.uri && e.subject.did === sc.dids.bob,
+          (e) => isRepoRef(e.subject) && e.subject.did === sc.dids.bob,
         ),
-      ).toBeTruthy()
+        "only bob's account statuses are returned, no events have a URI even though the subjectType is record",
+      )
     })
   })
 
diff --git a/packages/ozone/tests/moderation.test.ts b/packages/ozone/tests/moderation.test.ts
index e029017e83d..f9f82e3e1e5 100644
--- a/packages/ozone/tests/moderation.test.ts
+++ b/packages/ozone/tests/moderation.test.ts
@@ -1,4 +1,8 @@
-import { AtpAgent, ToolsOzoneModerationEmitEvent } from '@atproto/api'
+import {
+  AtpAgent,
+  ChatBskyConvoDefs,
+  ToolsOzoneModerationEmitEvent,
+} from '@atproto/api'
 import { HOUR } from '@atproto/common'
 import {
   ImageRef,
@@ -24,7 +28,7 @@ import {
   REVIEWESCALATED,
 } from '../src/lexicon/types/tools/ozone/moderation/defs'
 import { TAKEDOWN_LABEL } from '../src/mod-service'
-import { forSnapshot } from './_util'
+import { forSnapshot, identity } from './_util'
 
 describe('moderation', () => {
   let network: TestNetwork
@@ -158,23 +162,26 @@ describe('moderation', () => {
       const reportA = await sc.createReport({
         reportedBy: sc.dids.alice,
         reasonType: REASONSPAM,
-        subject: {
+        // @ts-expect-error "chat.bsky.convo.defs#messageRef" is not spec'd as subject
+        subject: identity<ChatBskyConvoDefs.MessageRef>({
           $type: 'chat.bsky.convo.defs#messageRef',
           did: sc.dids.carol,
           messageId: messageId1,
           convoId: 'testconvoid1',
-        },
+        }),
       })
       const reportB = await sc.createReport({
         reportedBy: sc.dids.carol,
         reasonType: REASONOTHER,
         reason: 'defamation',
-        subject: {
+        // @ts-expect-error "chat.bsky.convo.defs#messageRef" is not spec'd as subject
+        subject: identity<ChatBskyConvoDefs.MessageRef>({
           $type: 'chat.bsky.convo.defs#messageRef',
           did: sc.dids.carol,
           messageId: messageId2,
-          // @TODO convoId intentionally missing, restore once this behavior is deprecated
-        },
+          // @ts-expect-error convoId intentionally missing, restore once this behavior is deprecated
+          convoId: undefined,
+        }),
       })
       expect(forSnapshot([reportA, reportB])).toMatchSnapshot()
       const events = await ozone.ctx.db.db
@@ -731,7 +738,7 @@ describe('moderation', () => {
       },
     ) {
       const { createLabelVals, negateLabelVals, durationInHours } = opts
-      const result = await modClient.emitEvent({
+      const event = await modClient.emitEvent({
         event: {
           $type: 'tools.ozone.moderation.defs#modEventLabel',
           createLabelVals,
@@ -742,7 +749,7 @@ describe('moderation', () => {
         reason: 'Y',
         ...opts,
       })
-      return result.data
+      return event
     }
 
     async function reverse(
diff --git a/packages/ozone/tests/protected-tags.test.ts b/packages/ozone/tests/protected-tags.test.ts
index dfdb3279e3a..60e814f5d36 100644
--- a/packages/ozone/tests/protected-tags.test.ts
+++ b/packages/ozone/tests/protected-tags.test.ts
@@ -50,6 +50,7 @@ describe('protected-tags', () => {
         modClient.upsertSettingOption({
           ...basicSetting,
           managerRole: ROLEADMIN,
+          // @ts-expect-error testing invalid value here
           value: ['test'],
         }),
       ).rejects.toThrow('Invalid configuration')
diff --git a/packages/ozone/tests/record-and-account-events.test.ts b/packages/ozone/tests/record-and-account-events.test.ts
index 669031bb2ac..f98b18794cf 100644
--- a/packages/ozone/tests/record-and-account-events.test.ts
+++ b/packages/ozone/tests/record-and-account-events.test.ts
@@ -1,15 +1,20 @@
-import {
-  ComAtprotoModerationDefs,
-  ToolsOzoneModerationDefs,
-  ToolsOzoneModerationEmitEvent as EmitModerationEvent,
-} from '@atproto/api'
+import assert from 'node:assert'
 import {
   ModeratorClient,
   SeedClient,
   TestNetwork,
   basicSeed,
 } from '@atproto/dev-env'
-import { REVIEWOPEN } from '../src/lexicon/types/tools/ozone/moderation/defs'
+import { isRepoRef } from '../src/lexicon/types/com/atproto/admin/defs'
+import { REASONMISLEADING } from '../src/lexicon/types/com/atproto/moderation/defs'
+import { isMain as isStrongRef } from '../src/lexicon/types/com/atproto/repo/strongRef'
+import {
+  REVIEWOPEN,
+  SubjectStatusView,
+  isAccountHosting,
+  isRecordHosting,
+} from '../src/lexicon/types/tools/ozone/moderation/defs'
+import { InputSchema } from '../src/lexicon/types/tools/ozone/moderation/emitEvent'
 
 describe('record and account events on moderation subjects', () => {
   let network: TestNetwork
@@ -32,7 +37,7 @@ describe('record and account events on moderation subjects', () => {
 
   const getSubjectStatus = async (
     subject: string,
-  ): Promise<ToolsOzoneModerationDefs.SubjectStatusView | undefined> => {
+  ): Promise<SubjectStatusView | undefined> => {
     const res = await modClient.queryStatuses({
       subject,
     })
@@ -41,7 +46,7 @@ describe('record and account events on moderation subjects', () => {
 
   describe('record events', () => {
     const emitRecordEvent = async (
-      subject: EmitModerationEvent.InputSchema['subject'],
+      subject: InputSchema['subject'],
       op: 'create' | 'update' | 'delete',
     ) => {
       return await modClient.emitEvent(
@@ -67,26 +72,28 @@ describe('record and account events on moderation subjects', () => {
 
       await sc.createReport({
         reportedBy: sc.dids.carol,
-        reasonType: ComAtprotoModerationDefs.REASONMISLEADING,
+        reasonType: REASONMISLEADING,
         reason: 'misleading',
         subject: bobsPostSubject,
       })
 
       await emitRecordEvent(bobsPostSubject, 'update')
       const statusAfterUpdate = await getSubjectStatus(bobsPostSubject.uri)
-      expect(statusAfterUpdate?.hosting?.updatedAt).toBeTruthy()
+      assert(isRecordHosting(statusAfterUpdate?.hosting))
+      expect(statusAfterUpdate.hosting?.updatedAt).toBeTruthy()
 
       await emitRecordEvent(bobsPostSubject, 'delete')
       const statusAfterDelete = await getSubjectStatus(bobsPostSubject.uri)
-      expect(statusAfterDelete?.hosting?.deletedAt).toBeTruthy()
-      expect(statusAfterDelete?.hosting?.status).toEqual('deleted')
+      assert(isRecordHosting(statusAfterDelete?.hosting))
+      expect(statusAfterDelete.hosting?.deletedAt).toBeTruthy()
+      expect(statusAfterDelete.hosting?.status).toEqual('deleted')
       // Ensure that due to delete or update event, review state does not change
-      expect(statusAfterDelete?.reviewState).toEqual(REVIEWOPEN)
+      expect(statusAfterDelete.reviewState).toEqual(REVIEWOPEN)
     })
   })
   describe('account/identity events', () => {
     const emitAccountEvent = async (
-      subject: EmitModerationEvent.InputSchema['subject'],
+      subject: InputSchema['subject'],
       active: boolean,
       status?: 'takendown' | 'deleted' | 'deactivated' | 'suspended',
     ) => {
@@ -113,7 +120,7 @@ describe('record and account events on moderation subjects', () => {
 
       await sc.createReport({
         reportedBy: sc.dids.carol,
-        reasonType: ComAtprotoModerationDefs.REASONMISLEADING,
+        reasonType: REASONMISLEADING,
         reason: 'misleading',
         subject: carolsAccountSubject,
       })
@@ -122,17 +129,19 @@ describe('record and account events on moderation subjects', () => {
       const statusAfterDeactivation = await getSubjectStatus(
         carolsAccountSubject.did,
       )
-      expect(statusAfterDeactivation?.hosting?.deactivatedAt).toBeTruthy()
-      expect(statusAfterDeactivation?.hosting?.status).toEqual('deactivated')
-      expect(statusAfterDeactivation?.reviewState).toEqual(REVIEWOPEN)
+      assert(isAccountHosting(statusAfterDeactivation?.hosting))
+      expect(statusAfterDeactivation.hosting.deactivatedAt).toBeTruthy()
+      expect(statusAfterDeactivation.hosting.status).toEqual('deactivated')
+      expect(statusAfterDeactivation.reviewState).toEqual(REVIEWOPEN)
 
       await emitAccountEvent(carolsAccountSubject, true)
       const statusAfterReactivation = await getSubjectStatus(
         carolsAccountSubject.did,
       )
-      expect(statusAfterReactivation?.hosting?.updatedAt).toBeTruthy()
-      expect(statusAfterReactivation?.hosting?.status).toEqual('active')
-      expect(statusAfterReactivation?.hosting?.deletedAt).toBeFalsy()
+      assert(isAccountHosting(statusAfterReactivation?.hosting))
+      expect(statusAfterReactivation.hosting.updatedAt).toBeTruthy()
+      expect(statusAfterReactivation.hosting.status).toEqual('active')
+      expect(statusAfterReactivation.hosting.deletedAt).toBeFalsy()
     })
 
     it('gets statuses by hosting properties', async () => {
@@ -176,9 +185,11 @@ describe('record and account events on moderation subjects', () => {
 
       expect(deactivatedOrDeletedStatuses.length).toEqual(3)
       expect(deletedStatusesInPastDay.length).toEqual(2)
+      assert(isStrongRef(deletedStatusesInPastDay[0]?.subject))
       expect(deletedStatusesInPastDay[0]?.subject.uri).toEqual(
         sc.posts[sc.dids.bob][1].ref.uriStr,
       )
+      assert(isRepoRef(deletedStatusesInPastDay[1]?.subject))
       expect(deletedStatusesInPastDay[1]?.subject.did).toEqual(sc.dids.bob)
       expect(deletedStatusesBeforeYesterday.length).toEqual(0)
     })
diff --git a/packages/ozone/tests/takedown.test.ts b/packages/ozone/tests/takedown.test.ts
index fa5c4f2dc84..4e95902457f 100644
--- a/packages/ozone/tests/takedown.test.ts
+++ b/packages/ozone/tests/takedown.test.ts
@@ -1,3 +1,5 @@
+import assert from 'node:assert'
+import { ComAtprotoAdminDefs, ToolsOzoneModerationDefs } from '@atproto/api'
 import {
   ModeratorClient,
   SeedClient,
@@ -37,12 +39,15 @@ describe('moderation', () => {
     })
 
     // Verify that that the takedown even exposes the policy specified for it
-    const { events } = await modClient.queryEvents({
+    const { events: eventViews } = await modClient.queryEvents({
       subject: sc.dids.bob,
       types: ['tools.ozone.moderation.defs#modEventTakedown'],
     })
 
-    expect(events[0].event.policies?.[0]).toEqual('trolling')
+    const { event } = eventViews[0]
+
+    assert(ToolsOzoneModerationDefs.isModEventTakedown(event))
+    expect(event.policies?.[0]).toEqual('trolling')
 
     // Verify that event stream can be filtered by policy
     const { events: filteredEvents } = await modClient.queryEvents({
@@ -50,6 +55,9 @@ describe('moderation', () => {
       policies: ['trolling'],
     })
 
-    expect(filteredEvents[0].subject.did).toEqual(sc.dids.bob)
+    const { subject } = filteredEvents[0]
+
+    assert(ComAtprotoAdminDefs.isRepoRef(subject))
+    expect(subject.did).toEqual(sc.dids.bob)
   })
 })
diff --git a/packages/pds/jest.config.js b/packages/pds/jest.config.js
index 0b9836b23cd..5e6f9c6f3f7 100644
--- a/packages/pds/jest.config.js
+++ b/packages/pds/jest.config.js
@@ -9,4 +9,5 @@ module.exports = {
   ],
   testTimeout: 60000,
   setupFiles: ['<rootDir>/../../jest.setup.ts'],
+  moduleNameMapper: { '^(\\.\\.?\\/.+)\\.js$': ['$1.ts', '$1.js'] },
 }
diff --git a/packages/pds/src/actor-store/record/reader.ts b/packages/pds/src/actor-store/record/reader.ts
index c9b36c31cad..ae95dbbe4f4 100644
--- a/packages/pds/src/actor-store/record/reader.ts
+++ b/packages/pds/src/actor-store/record/reader.ts
@@ -70,7 +70,7 @@ export class RecordReader {
     rkeyStart?: string
     rkeyEnd?: string
     includeSoftDeleted?: boolean
-  }): Promise<{ uri: string; cid: string; value: object }[]> {
+  }): Promise<{ uri: string; cid: string; value: Record<string, unknown> }[]> {
     const {
       collection,
       limit,
@@ -125,7 +125,7 @@ export class RecordReader {
   ): Promise<{
     uri: string
     cid: string
-    value: object
+    value: Record<string, unknown>
     indexedAt: string
     takedownRef: string | null
   } | null> {
diff --git a/packages/pds/src/api/app/bsky/feed/getActorLikes.ts b/packages/pds/src/api/app/bsky/feed/getActorLikes.ts
index f5133c92428..2069e7b1736 100644
--- a/packages/pds/src/api/app/bsky/feed/getActorLikes.ts
+++ b/packages/pds/src/api/app/bsky/feed/getActorLikes.ts
@@ -1,6 +1,6 @@
 import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import { OutputSchema } from '../../../../lexicon/types/app/bsky/feed/getAuthorFeed'
+import { OutputSchema } from '../../../../lexicon/types/app/bsky/feed/getActorLikes'
 import {
   LocalRecords,
   LocalViewer,
diff --git a/packages/pds/src/api/app/bsky/feed/getPostThread.ts b/packages/pds/src/api/app/bsky/feed/getPostThread.ts
index 07da7194f31..a21d207233b 100644
--- a/packages/pds/src/api/app/bsky/feed/getPostThread.ts
+++ b/packages/pds/src/api/app/bsky/feed/getPostThread.ts
@@ -13,6 +13,7 @@ import {
   QueryParams,
 } from '../../../../lexicon/types/app/bsky/feed/getPostThread'
 import { Record as PostRecord } from '../../../../lexicon/types/app/bsky/feed/post'
+import { $Typed } from '../../../../lexicon/util'
 import {
   LocalRecords,
   LocalViewer,
@@ -98,12 +99,12 @@ const getPostThreadMunge = async (
 
 const addPostsToThread = async (
   localViewer: LocalViewer,
-  original: ThreadViewPost,
+  original: $Typed<ThreadViewPost>,
   posts: RecordDescript<PostRecord>[],
 ) => {
   const inThread = findPostsInThread(original, posts)
   if (inThread.length === 0) return original
-  let thread: ThreadViewPost = original
+  let thread: $Typed<ThreadViewPost> = original
   for (const record of inThread) {
     thread = await insertIntoThreadReplies(localViewer, thread, record)
   }
@@ -124,9 +125,9 @@ const findPostsInThread = (
 
 const insertIntoThreadReplies = async (
   localViewer: LocalViewer,
-  view: ThreadViewPost,
+  view: $Typed<ThreadViewPost>,
   descript: RecordDescript<PostRecord>,
-): Promise<ThreadViewPost> => {
+): Promise<$Typed<ThreadViewPost>> => {
   if (descript.record.reply?.parent.uri === view.post.uri) {
     const postView = await threadPostView(localViewer, descript)
     if (!postView) return view
@@ -153,7 +154,7 @@ const insertIntoThreadReplies = async (
 const threadPostView = async (
   localViewer: LocalViewer,
   descript: RecordDescript<PostRecord>,
-): Promise<ThreadViewPost | null> => {
+): Promise<$Typed<ThreadViewPost> | null> => {
   const postView = await localViewer.getPost(descript)
   if (!postView) return null
   return {
diff --git a/packages/pds/src/api/com/atproto/identity/signPlcOperation.ts b/packages/pds/src/api/com/atproto/identity/signPlcOperation.ts
index 01f9b613d1c..ecfd7882a3d 100644
--- a/packages/pds/src/api/com/atproto/identity/signPlcOperation.ts
+++ b/packages/pds/src/api/com/atproto/identity/signPlcOperation.ts
@@ -50,8 +50,16 @@ export default function (server: Server, ctx: AppContext) {
           rotationKeys: input.body.rotationKeys ?? lastOp.rotationKeys,
           alsoKnownAs: input.body.alsoKnownAs ?? lastOp.alsoKnownAs,
           verificationMethods:
-            input.body.verificationMethods ?? lastOp.verificationMethods,
-          services: input.body.services ?? lastOp.services,
+            // @TODO: actually validate instead of type casting
+            (input.body.verificationMethods as
+              | undefined
+              | Record<string, string>) ?? lastOp.verificationMethods,
+          services:
+            // @TODO: actually validate instead of type casting
+            (input.body.services as
+              | undefined
+              | Record<string, { type: string; endpoint: string }>) ??
+            lastOp.services,
         }),
       )
       return {
diff --git a/packages/pds/src/api/com/atproto/identity/updateHandle.ts b/packages/pds/src/api/com/atproto/identity/updateHandle.ts
index 7af0a0929cf..b2058c92f29 100644
--- a/packages/pds/src/api/com/atproto/identity/updateHandle.ts
+++ b/packages/pds/src/api/com/atproto/identity/updateHandle.ts
@@ -32,6 +32,7 @@ export default function (server: Server, ctx: AppContext) {
         // -> entryway(identity.updateHandle) [update handle, submit plc op]
         // -> pds(admin.updateAccountHandle)  [track handle, sequence handle update]
         await ctx.entrywayAgent.com.atproto.identity.updateHandle(
+          // @ts-expect-error "did" is not in the schema
           { did: requester, handle: input.body.handle },
           await ctx.serviceAuthHeaders(
             auth.credentials.did,
diff --git a/packages/pds/src/api/com/atproto/repo/putRecord.ts b/packages/pds/src/api/com/atproto/repo/putRecord.ts
index d6d8f6019c8..3b72e255e7b 100644
--- a/packages/pds/src/api/com/atproto/repo/putRecord.ts
+++ b/packages/pds/src/api/com/atproto/repo/putRecord.ts
@@ -147,7 +147,7 @@ export default function (server: Server, ctx: AppContext) {
 // WARNING: mutates object
 const updateProfileLegacyBlobRef = async (
   actorStore: ActorStoreTransactor,
-  record: ProfileRecord,
+  record: Partial<ProfileRecord>,
 ) => {
   if (record.avatar && !record.avatar.original['$type']) {
     const blob = await actorStore.repo.blob.getBlobMetadata(record.avatar.ref)
diff --git a/packages/pds/src/lexicon/index.ts b/packages/pds/src/lexicon/index.ts
index dc68082677f..972f1a14a3f 100644
--- a/packages/pds/src/lexicon/index.ts
+++ b/packages/pds/src/lexicon/index.ts
@@ -8,192 +8,192 @@ import {
   AuthVerifier,
   StreamAuthVerifier,
 } from '@atproto/xrpc-server'
-import { schemas } from './lexicons'
-import * as ComAtprotoAdminDeleteAccount from './types/com/atproto/admin/deleteAccount'
-import * as ComAtprotoAdminDisableAccountInvites from './types/com/atproto/admin/disableAccountInvites'
-import * as ComAtprotoAdminDisableInviteCodes from './types/com/atproto/admin/disableInviteCodes'
-import * as ComAtprotoAdminEnableAccountInvites from './types/com/atproto/admin/enableAccountInvites'
-import * as ComAtprotoAdminGetAccountInfo from './types/com/atproto/admin/getAccountInfo'
-import * as ComAtprotoAdminGetAccountInfos from './types/com/atproto/admin/getAccountInfos'
-import * as ComAtprotoAdminGetInviteCodes from './types/com/atproto/admin/getInviteCodes'
-import * as ComAtprotoAdminGetSubjectStatus from './types/com/atproto/admin/getSubjectStatus'
-import * as ComAtprotoAdminSearchAccounts from './types/com/atproto/admin/searchAccounts'
-import * as ComAtprotoAdminSendEmail from './types/com/atproto/admin/sendEmail'
-import * as ComAtprotoAdminUpdateAccountEmail from './types/com/atproto/admin/updateAccountEmail'
-import * as ComAtprotoAdminUpdateAccountHandle from './types/com/atproto/admin/updateAccountHandle'
-import * as ComAtprotoAdminUpdateAccountPassword from './types/com/atproto/admin/updateAccountPassword'
-import * as ComAtprotoAdminUpdateSubjectStatus from './types/com/atproto/admin/updateSubjectStatus'
-import * as ComAtprotoIdentityGetRecommendedDidCredentials from './types/com/atproto/identity/getRecommendedDidCredentials'
-import * as ComAtprotoIdentityRequestPlcOperationSignature from './types/com/atproto/identity/requestPlcOperationSignature'
-import * as ComAtprotoIdentityResolveHandle from './types/com/atproto/identity/resolveHandle'
-import * as ComAtprotoIdentitySignPlcOperation from './types/com/atproto/identity/signPlcOperation'
-import * as ComAtprotoIdentitySubmitPlcOperation from './types/com/atproto/identity/submitPlcOperation'
-import * as ComAtprotoIdentityUpdateHandle from './types/com/atproto/identity/updateHandle'
-import * as ComAtprotoLabelQueryLabels from './types/com/atproto/label/queryLabels'
-import * as ComAtprotoLabelSubscribeLabels from './types/com/atproto/label/subscribeLabels'
-import * as ComAtprotoModerationCreateReport from './types/com/atproto/moderation/createReport'
-import * as ComAtprotoRepoApplyWrites from './types/com/atproto/repo/applyWrites'
-import * as ComAtprotoRepoCreateRecord from './types/com/atproto/repo/createRecord'
-import * as ComAtprotoRepoDeleteRecord from './types/com/atproto/repo/deleteRecord'
-import * as ComAtprotoRepoDescribeRepo from './types/com/atproto/repo/describeRepo'
-import * as ComAtprotoRepoGetRecord from './types/com/atproto/repo/getRecord'
-import * as ComAtprotoRepoImportRepo from './types/com/atproto/repo/importRepo'
-import * as ComAtprotoRepoListMissingBlobs from './types/com/atproto/repo/listMissingBlobs'
-import * as ComAtprotoRepoListRecords from './types/com/atproto/repo/listRecords'
-import * as ComAtprotoRepoPutRecord from './types/com/atproto/repo/putRecord'
-import * as ComAtprotoRepoUploadBlob from './types/com/atproto/repo/uploadBlob'
-import * as ComAtprotoServerActivateAccount from './types/com/atproto/server/activateAccount'
-import * as ComAtprotoServerCheckAccountStatus from './types/com/atproto/server/checkAccountStatus'
-import * as ComAtprotoServerConfirmEmail from './types/com/atproto/server/confirmEmail'
-import * as ComAtprotoServerCreateAccount from './types/com/atproto/server/createAccount'
-import * as ComAtprotoServerCreateAppPassword from './types/com/atproto/server/createAppPassword'
-import * as ComAtprotoServerCreateInviteCode from './types/com/atproto/server/createInviteCode'
-import * as ComAtprotoServerCreateInviteCodes from './types/com/atproto/server/createInviteCodes'
-import * as ComAtprotoServerCreateSession from './types/com/atproto/server/createSession'
-import * as ComAtprotoServerDeactivateAccount from './types/com/atproto/server/deactivateAccount'
-import * as ComAtprotoServerDeleteAccount from './types/com/atproto/server/deleteAccount'
-import * as ComAtprotoServerDeleteSession from './types/com/atproto/server/deleteSession'
-import * as ComAtprotoServerDescribeServer from './types/com/atproto/server/describeServer'
-import * as ComAtprotoServerGetAccountInviteCodes from './types/com/atproto/server/getAccountInviteCodes'
-import * as ComAtprotoServerGetServiceAuth from './types/com/atproto/server/getServiceAuth'
-import * as ComAtprotoServerGetSession from './types/com/atproto/server/getSession'
-import * as ComAtprotoServerListAppPasswords from './types/com/atproto/server/listAppPasswords'
-import * as ComAtprotoServerRefreshSession from './types/com/atproto/server/refreshSession'
-import * as ComAtprotoServerRequestAccountDelete from './types/com/atproto/server/requestAccountDelete'
-import * as ComAtprotoServerRequestEmailConfirmation from './types/com/atproto/server/requestEmailConfirmation'
-import * as ComAtprotoServerRequestEmailUpdate from './types/com/atproto/server/requestEmailUpdate'
-import * as ComAtprotoServerRequestPasswordReset from './types/com/atproto/server/requestPasswordReset'
-import * as ComAtprotoServerReserveSigningKey from './types/com/atproto/server/reserveSigningKey'
-import * as ComAtprotoServerResetPassword from './types/com/atproto/server/resetPassword'
-import * as ComAtprotoServerRevokeAppPassword from './types/com/atproto/server/revokeAppPassword'
-import * as ComAtprotoServerUpdateEmail from './types/com/atproto/server/updateEmail'
-import * as ComAtprotoSyncGetBlob from './types/com/atproto/sync/getBlob'
-import * as ComAtprotoSyncGetBlocks from './types/com/atproto/sync/getBlocks'
-import * as ComAtprotoSyncGetCheckout from './types/com/atproto/sync/getCheckout'
-import * as ComAtprotoSyncGetHead from './types/com/atproto/sync/getHead'
-import * as ComAtprotoSyncGetLatestCommit from './types/com/atproto/sync/getLatestCommit'
-import * as ComAtprotoSyncGetRecord from './types/com/atproto/sync/getRecord'
-import * as ComAtprotoSyncGetRepo from './types/com/atproto/sync/getRepo'
-import * as ComAtprotoSyncGetRepoStatus from './types/com/atproto/sync/getRepoStatus'
-import * as ComAtprotoSyncListBlobs from './types/com/atproto/sync/listBlobs'
-import * as ComAtprotoSyncListRepos from './types/com/atproto/sync/listRepos'
-import * as ComAtprotoSyncNotifyOfUpdate from './types/com/atproto/sync/notifyOfUpdate'
-import * as ComAtprotoSyncRequestCrawl from './types/com/atproto/sync/requestCrawl'
-import * as ComAtprotoSyncSubscribeRepos from './types/com/atproto/sync/subscribeRepos'
-import * as ComAtprotoTempAddReservedHandle from './types/com/atproto/temp/addReservedHandle'
-import * as ComAtprotoTempCheckSignupQueue from './types/com/atproto/temp/checkSignupQueue'
-import * as ComAtprotoTempFetchLabels from './types/com/atproto/temp/fetchLabels'
-import * as ComAtprotoTempRequestPhoneVerification from './types/com/atproto/temp/requestPhoneVerification'
-import * as AppBskyActorGetPreferences from './types/app/bsky/actor/getPreferences'
-import * as AppBskyActorGetProfile from './types/app/bsky/actor/getProfile'
-import * as AppBskyActorGetProfiles from './types/app/bsky/actor/getProfiles'
-import * as AppBskyActorGetSuggestions from './types/app/bsky/actor/getSuggestions'
-import * as AppBskyActorPutPreferences from './types/app/bsky/actor/putPreferences'
-import * as AppBskyActorSearchActors from './types/app/bsky/actor/searchActors'
-import * as AppBskyActorSearchActorsTypeahead from './types/app/bsky/actor/searchActorsTypeahead'
-import * as AppBskyFeedDescribeFeedGenerator from './types/app/bsky/feed/describeFeedGenerator'
-import * as AppBskyFeedGetActorFeeds from './types/app/bsky/feed/getActorFeeds'
-import * as AppBskyFeedGetActorLikes from './types/app/bsky/feed/getActorLikes'
-import * as AppBskyFeedGetAuthorFeed from './types/app/bsky/feed/getAuthorFeed'
-import * as AppBskyFeedGetFeed from './types/app/bsky/feed/getFeed'
-import * as AppBskyFeedGetFeedGenerator from './types/app/bsky/feed/getFeedGenerator'
-import * as AppBskyFeedGetFeedGenerators from './types/app/bsky/feed/getFeedGenerators'
-import * as AppBskyFeedGetFeedSkeleton from './types/app/bsky/feed/getFeedSkeleton'
-import * as AppBskyFeedGetLikes from './types/app/bsky/feed/getLikes'
-import * as AppBskyFeedGetListFeed from './types/app/bsky/feed/getListFeed'
-import * as AppBskyFeedGetPostThread from './types/app/bsky/feed/getPostThread'
-import * as AppBskyFeedGetPosts from './types/app/bsky/feed/getPosts'
-import * as AppBskyFeedGetQuotes from './types/app/bsky/feed/getQuotes'
-import * as AppBskyFeedGetRepostedBy from './types/app/bsky/feed/getRepostedBy'
-import * as AppBskyFeedGetSuggestedFeeds from './types/app/bsky/feed/getSuggestedFeeds'
-import * as AppBskyFeedGetTimeline from './types/app/bsky/feed/getTimeline'
-import * as AppBskyFeedSearchPosts from './types/app/bsky/feed/searchPosts'
-import * as AppBskyFeedSendInteractions from './types/app/bsky/feed/sendInteractions'
-import * as AppBskyGraphGetActorStarterPacks from './types/app/bsky/graph/getActorStarterPacks'
-import * as AppBskyGraphGetBlocks from './types/app/bsky/graph/getBlocks'
-import * as AppBskyGraphGetFollowers from './types/app/bsky/graph/getFollowers'
-import * as AppBskyGraphGetFollows from './types/app/bsky/graph/getFollows'
-import * as AppBskyGraphGetKnownFollowers from './types/app/bsky/graph/getKnownFollowers'
-import * as AppBskyGraphGetList from './types/app/bsky/graph/getList'
-import * as AppBskyGraphGetListBlocks from './types/app/bsky/graph/getListBlocks'
-import * as AppBskyGraphGetListMutes from './types/app/bsky/graph/getListMutes'
-import * as AppBskyGraphGetLists from './types/app/bsky/graph/getLists'
-import * as AppBskyGraphGetMutes from './types/app/bsky/graph/getMutes'
-import * as AppBskyGraphGetRelationships from './types/app/bsky/graph/getRelationships'
-import * as AppBskyGraphGetStarterPack from './types/app/bsky/graph/getStarterPack'
-import * as AppBskyGraphGetStarterPacks from './types/app/bsky/graph/getStarterPacks'
-import * as AppBskyGraphGetSuggestedFollowsByActor from './types/app/bsky/graph/getSuggestedFollowsByActor'
-import * as AppBskyGraphMuteActor from './types/app/bsky/graph/muteActor'
-import * as AppBskyGraphMuteActorList from './types/app/bsky/graph/muteActorList'
-import * as AppBskyGraphMuteThread from './types/app/bsky/graph/muteThread'
-import * as AppBskyGraphSearchStarterPacks from './types/app/bsky/graph/searchStarterPacks'
-import * as AppBskyGraphUnmuteActor from './types/app/bsky/graph/unmuteActor'
-import * as AppBskyGraphUnmuteActorList from './types/app/bsky/graph/unmuteActorList'
-import * as AppBskyGraphUnmuteThread from './types/app/bsky/graph/unmuteThread'
-import * as AppBskyLabelerGetServices from './types/app/bsky/labeler/getServices'
-import * as AppBskyNotificationGetUnreadCount from './types/app/bsky/notification/getUnreadCount'
-import * as AppBskyNotificationListNotifications from './types/app/bsky/notification/listNotifications'
-import * as AppBskyNotificationPutPreferences from './types/app/bsky/notification/putPreferences'
-import * as AppBskyNotificationRegisterPush from './types/app/bsky/notification/registerPush'
-import * as AppBskyNotificationUpdateSeen from './types/app/bsky/notification/updateSeen'
-import * as AppBskyUnspeccedGetConfig from './types/app/bsky/unspecced/getConfig'
-import * as AppBskyUnspeccedGetPopularFeedGenerators from './types/app/bsky/unspecced/getPopularFeedGenerators'
-import * as AppBskyUnspeccedGetSuggestionsSkeleton from './types/app/bsky/unspecced/getSuggestionsSkeleton'
-import * as AppBskyUnspeccedGetTaggedSuggestions from './types/app/bsky/unspecced/getTaggedSuggestions'
-import * as AppBskyUnspeccedGetTrendingTopics from './types/app/bsky/unspecced/getTrendingTopics'
-import * as AppBskyUnspeccedSearchActorsSkeleton from './types/app/bsky/unspecced/searchActorsSkeleton'
-import * as AppBskyUnspeccedSearchPostsSkeleton from './types/app/bsky/unspecced/searchPostsSkeleton'
-import * as AppBskyUnspeccedSearchStarterPacksSkeleton from './types/app/bsky/unspecced/searchStarterPacksSkeleton'
-import * as AppBskyVideoGetJobStatus from './types/app/bsky/video/getJobStatus'
-import * as AppBskyVideoGetUploadLimits from './types/app/bsky/video/getUploadLimits'
-import * as AppBskyVideoUploadVideo from './types/app/bsky/video/uploadVideo'
-import * as ChatBskyActorDeleteAccount from './types/chat/bsky/actor/deleteAccount'
-import * as ChatBskyActorExportAccountData from './types/chat/bsky/actor/exportAccountData'
-import * as ChatBskyConvoDeleteMessageForSelf from './types/chat/bsky/convo/deleteMessageForSelf'
-import * as ChatBskyConvoGetConvo from './types/chat/bsky/convo/getConvo'
-import * as ChatBskyConvoGetConvoForMembers from './types/chat/bsky/convo/getConvoForMembers'
-import * as ChatBskyConvoGetLog from './types/chat/bsky/convo/getLog'
-import * as ChatBskyConvoGetMessages from './types/chat/bsky/convo/getMessages'
-import * as ChatBskyConvoLeaveConvo from './types/chat/bsky/convo/leaveConvo'
-import * as ChatBskyConvoListConvos from './types/chat/bsky/convo/listConvos'
-import * as ChatBskyConvoMuteConvo from './types/chat/bsky/convo/muteConvo'
-import * as ChatBskyConvoSendMessage from './types/chat/bsky/convo/sendMessage'
-import * as ChatBskyConvoSendMessageBatch from './types/chat/bsky/convo/sendMessageBatch'
-import * as ChatBskyConvoUnmuteConvo from './types/chat/bsky/convo/unmuteConvo'
-import * as ChatBskyConvoUpdateRead from './types/chat/bsky/convo/updateRead'
-import * as ChatBskyModerationGetActorMetadata from './types/chat/bsky/moderation/getActorMetadata'
-import * as ChatBskyModerationGetMessageContext from './types/chat/bsky/moderation/getMessageContext'
-import * as ChatBskyModerationUpdateActorAccess from './types/chat/bsky/moderation/updateActorAccess'
-import * as ToolsOzoneCommunicationCreateTemplate from './types/tools/ozone/communication/createTemplate'
-import * as ToolsOzoneCommunicationDeleteTemplate from './types/tools/ozone/communication/deleteTemplate'
-import * as ToolsOzoneCommunicationListTemplates from './types/tools/ozone/communication/listTemplates'
-import * as ToolsOzoneCommunicationUpdateTemplate from './types/tools/ozone/communication/updateTemplate'
-import * as ToolsOzoneModerationEmitEvent from './types/tools/ozone/moderation/emitEvent'
-import * as ToolsOzoneModerationGetEvent from './types/tools/ozone/moderation/getEvent'
-import * as ToolsOzoneModerationGetRecord from './types/tools/ozone/moderation/getRecord'
-import * as ToolsOzoneModerationGetRecords from './types/tools/ozone/moderation/getRecords'
-import * as ToolsOzoneModerationGetRepo from './types/tools/ozone/moderation/getRepo'
-import * as ToolsOzoneModerationGetRepos from './types/tools/ozone/moderation/getRepos'
-import * as ToolsOzoneModerationQueryEvents from './types/tools/ozone/moderation/queryEvents'
-import * as ToolsOzoneModerationQueryStatuses from './types/tools/ozone/moderation/queryStatuses'
-import * as ToolsOzoneModerationSearchRepos from './types/tools/ozone/moderation/searchRepos'
-import * as ToolsOzoneServerGetConfig from './types/tools/ozone/server/getConfig'
-import * as ToolsOzoneSetAddValues from './types/tools/ozone/set/addValues'
-import * as ToolsOzoneSetDeleteSet from './types/tools/ozone/set/deleteSet'
-import * as ToolsOzoneSetDeleteValues from './types/tools/ozone/set/deleteValues'
-import * as ToolsOzoneSetGetValues from './types/tools/ozone/set/getValues'
-import * as ToolsOzoneSetQuerySets from './types/tools/ozone/set/querySets'
-import * as ToolsOzoneSetUpsertSet from './types/tools/ozone/set/upsertSet'
-import * as ToolsOzoneSettingListOptions from './types/tools/ozone/setting/listOptions'
-import * as ToolsOzoneSettingRemoveOptions from './types/tools/ozone/setting/removeOptions'
-import * as ToolsOzoneSettingUpsertOption from './types/tools/ozone/setting/upsertOption'
-import * as ToolsOzoneSignatureFindCorrelation from './types/tools/ozone/signature/findCorrelation'
-import * as ToolsOzoneSignatureFindRelatedAccounts from './types/tools/ozone/signature/findRelatedAccounts'
-import * as ToolsOzoneSignatureSearchAccounts from './types/tools/ozone/signature/searchAccounts'
-import * as ToolsOzoneTeamAddMember from './types/tools/ozone/team/addMember'
-import * as ToolsOzoneTeamDeleteMember from './types/tools/ozone/team/deleteMember'
-import * as ToolsOzoneTeamListMembers from './types/tools/ozone/team/listMembers'
-import * as ToolsOzoneTeamUpdateMember from './types/tools/ozone/team/updateMember'
+import { schemas } from './lexicons.js'
+import * as ComAtprotoAdminDeleteAccount from './types/com/atproto/admin/deleteAccount.js'
+import * as ComAtprotoAdminDisableAccountInvites from './types/com/atproto/admin/disableAccountInvites.js'
+import * as ComAtprotoAdminDisableInviteCodes from './types/com/atproto/admin/disableInviteCodes.js'
+import * as ComAtprotoAdminEnableAccountInvites from './types/com/atproto/admin/enableAccountInvites.js'
+import * as ComAtprotoAdminGetAccountInfo from './types/com/atproto/admin/getAccountInfo.js'
+import * as ComAtprotoAdminGetAccountInfos from './types/com/atproto/admin/getAccountInfos.js'
+import * as ComAtprotoAdminGetInviteCodes from './types/com/atproto/admin/getInviteCodes.js'
+import * as ComAtprotoAdminGetSubjectStatus from './types/com/atproto/admin/getSubjectStatus.js'
+import * as ComAtprotoAdminSearchAccounts from './types/com/atproto/admin/searchAccounts.js'
+import * as ComAtprotoAdminSendEmail from './types/com/atproto/admin/sendEmail.js'
+import * as ComAtprotoAdminUpdateAccountEmail from './types/com/atproto/admin/updateAccountEmail.js'
+import * as ComAtprotoAdminUpdateAccountHandle from './types/com/atproto/admin/updateAccountHandle.js'
+import * as ComAtprotoAdminUpdateAccountPassword from './types/com/atproto/admin/updateAccountPassword.js'
+import * as ComAtprotoAdminUpdateSubjectStatus from './types/com/atproto/admin/updateSubjectStatus.js'
+import * as ComAtprotoIdentityGetRecommendedDidCredentials from './types/com/atproto/identity/getRecommendedDidCredentials.js'
+import * as ComAtprotoIdentityRequestPlcOperationSignature from './types/com/atproto/identity/requestPlcOperationSignature.js'
+import * as ComAtprotoIdentityResolveHandle from './types/com/atproto/identity/resolveHandle.js'
+import * as ComAtprotoIdentitySignPlcOperation from './types/com/atproto/identity/signPlcOperation.js'
+import * as ComAtprotoIdentitySubmitPlcOperation from './types/com/atproto/identity/submitPlcOperation.js'
+import * as ComAtprotoIdentityUpdateHandle from './types/com/atproto/identity/updateHandle.js'
+import * as ComAtprotoLabelQueryLabels from './types/com/atproto/label/queryLabels.js'
+import * as ComAtprotoLabelSubscribeLabels from './types/com/atproto/label/subscribeLabels.js'
+import * as ComAtprotoModerationCreateReport from './types/com/atproto/moderation/createReport.js'
+import * as ComAtprotoRepoApplyWrites from './types/com/atproto/repo/applyWrites.js'
+import * as ComAtprotoRepoCreateRecord from './types/com/atproto/repo/createRecord.js'
+import * as ComAtprotoRepoDeleteRecord from './types/com/atproto/repo/deleteRecord.js'
+import * as ComAtprotoRepoDescribeRepo from './types/com/atproto/repo/describeRepo.js'
+import * as ComAtprotoRepoGetRecord from './types/com/atproto/repo/getRecord.js'
+import * as ComAtprotoRepoImportRepo from './types/com/atproto/repo/importRepo.js'
+import * as ComAtprotoRepoListMissingBlobs from './types/com/atproto/repo/listMissingBlobs.js'
+import * as ComAtprotoRepoListRecords from './types/com/atproto/repo/listRecords.js'
+import * as ComAtprotoRepoPutRecord from './types/com/atproto/repo/putRecord.js'
+import * as ComAtprotoRepoUploadBlob from './types/com/atproto/repo/uploadBlob.js'
+import * as ComAtprotoServerActivateAccount from './types/com/atproto/server/activateAccount.js'
+import * as ComAtprotoServerCheckAccountStatus from './types/com/atproto/server/checkAccountStatus.js'
+import * as ComAtprotoServerConfirmEmail from './types/com/atproto/server/confirmEmail.js'
+import * as ComAtprotoServerCreateAccount from './types/com/atproto/server/createAccount.js'
+import * as ComAtprotoServerCreateAppPassword from './types/com/atproto/server/createAppPassword.js'
+import * as ComAtprotoServerCreateInviteCode from './types/com/atproto/server/createInviteCode.js'
+import * as ComAtprotoServerCreateInviteCodes from './types/com/atproto/server/createInviteCodes.js'
+import * as ComAtprotoServerCreateSession from './types/com/atproto/server/createSession.js'
+import * as ComAtprotoServerDeactivateAccount from './types/com/atproto/server/deactivateAccount.js'
+import * as ComAtprotoServerDeleteAccount from './types/com/atproto/server/deleteAccount.js'
+import * as ComAtprotoServerDeleteSession from './types/com/atproto/server/deleteSession.js'
+import * as ComAtprotoServerDescribeServer from './types/com/atproto/server/describeServer.js'
+import * as ComAtprotoServerGetAccountInviteCodes from './types/com/atproto/server/getAccountInviteCodes.js'
+import * as ComAtprotoServerGetServiceAuth from './types/com/atproto/server/getServiceAuth.js'
+import * as ComAtprotoServerGetSession from './types/com/atproto/server/getSession.js'
+import * as ComAtprotoServerListAppPasswords from './types/com/atproto/server/listAppPasswords.js'
+import * as ComAtprotoServerRefreshSession from './types/com/atproto/server/refreshSession.js'
+import * as ComAtprotoServerRequestAccountDelete from './types/com/atproto/server/requestAccountDelete.js'
+import * as ComAtprotoServerRequestEmailConfirmation from './types/com/atproto/server/requestEmailConfirmation.js'
+import * as ComAtprotoServerRequestEmailUpdate from './types/com/atproto/server/requestEmailUpdate.js'
+import * as ComAtprotoServerRequestPasswordReset from './types/com/atproto/server/requestPasswordReset.js'
+import * as ComAtprotoServerReserveSigningKey from './types/com/atproto/server/reserveSigningKey.js'
+import * as ComAtprotoServerResetPassword from './types/com/atproto/server/resetPassword.js'
+import * as ComAtprotoServerRevokeAppPassword from './types/com/atproto/server/revokeAppPassword.js'
+import * as ComAtprotoServerUpdateEmail from './types/com/atproto/server/updateEmail.js'
+import * as ComAtprotoSyncGetBlob from './types/com/atproto/sync/getBlob.js'
+import * as ComAtprotoSyncGetBlocks from './types/com/atproto/sync/getBlocks.js'
+import * as ComAtprotoSyncGetCheckout from './types/com/atproto/sync/getCheckout.js'
+import * as ComAtprotoSyncGetHead from './types/com/atproto/sync/getHead.js'
+import * as ComAtprotoSyncGetLatestCommit from './types/com/atproto/sync/getLatestCommit.js'
+import * as ComAtprotoSyncGetRecord from './types/com/atproto/sync/getRecord.js'
+import * as ComAtprotoSyncGetRepo from './types/com/atproto/sync/getRepo.js'
+import * as ComAtprotoSyncGetRepoStatus from './types/com/atproto/sync/getRepoStatus.js'
+import * as ComAtprotoSyncListBlobs from './types/com/atproto/sync/listBlobs.js'
+import * as ComAtprotoSyncListRepos from './types/com/atproto/sync/listRepos.js'
+import * as ComAtprotoSyncNotifyOfUpdate from './types/com/atproto/sync/notifyOfUpdate.js'
+import * as ComAtprotoSyncRequestCrawl from './types/com/atproto/sync/requestCrawl.js'
+import * as ComAtprotoSyncSubscribeRepos from './types/com/atproto/sync/subscribeRepos.js'
+import * as ComAtprotoTempAddReservedHandle from './types/com/atproto/temp/addReservedHandle.js'
+import * as ComAtprotoTempCheckSignupQueue from './types/com/atproto/temp/checkSignupQueue.js'
+import * as ComAtprotoTempFetchLabels from './types/com/atproto/temp/fetchLabels.js'
+import * as ComAtprotoTempRequestPhoneVerification from './types/com/atproto/temp/requestPhoneVerification.js'
+import * as AppBskyActorGetPreferences from './types/app/bsky/actor/getPreferences.js'
+import * as AppBskyActorGetProfile from './types/app/bsky/actor/getProfile.js'
+import * as AppBskyActorGetProfiles from './types/app/bsky/actor/getProfiles.js'
+import * as AppBskyActorGetSuggestions from './types/app/bsky/actor/getSuggestions.js'
+import * as AppBskyActorPutPreferences from './types/app/bsky/actor/putPreferences.js'
+import * as AppBskyActorSearchActors from './types/app/bsky/actor/searchActors.js'
+import * as AppBskyActorSearchActorsTypeahead from './types/app/bsky/actor/searchActorsTypeahead.js'
+import * as AppBskyFeedDescribeFeedGenerator from './types/app/bsky/feed/describeFeedGenerator.js'
+import * as AppBskyFeedGetActorFeeds from './types/app/bsky/feed/getActorFeeds.js'
+import * as AppBskyFeedGetActorLikes from './types/app/bsky/feed/getActorLikes.js'
+import * as AppBskyFeedGetAuthorFeed from './types/app/bsky/feed/getAuthorFeed.js'
+import * as AppBskyFeedGetFeed from './types/app/bsky/feed/getFeed.js'
+import * as AppBskyFeedGetFeedGenerator from './types/app/bsky/feed/getFeedGenerator.js'
+import * as AppBskyFeedGetFeedGenerators from './types/app/bsky/feed/getFeedGenerators.js'
+import * as AppBskyFeedGetFeedSkeleton from './types/app/bsky/feed/getFeedSkeleton.js'
+import * as AppBskyFeedGetLikes from './types/app/bsky/feed/getLikes.js'
+import * as AppBskyFeedGetListFeed from './types/app/bsky/feed/getListFeed.js'
+import * as AppBskyFeedGetPostThread from './types/app/bsky/feed/getPostThread.js'
+import * as AppBskyFeedGetPosts from './types/app/bsky/feed/getPosts.js'
+import * as AppBskyFeedGetQuotes from './types/app/bsky/feed/getQuotes.js'
+import * as AppBskyFeedGetRepostedBy from './types/app/bsky/feed/getRepostedBy.js'
+import * as AppBskyFeedGetSuggestedFeeds from './types/app/bsky/feed/getSuggestedFeeds.js'
+import * as AppBskyFeedGetTimeline from './types/app/bsky/feed/getTimeline.js'
+import * as AppBskyFeedSearchPosts from './types/app/bsky/feed/searchPosts.js'
+import * as AppBskyFeedSendInteractions from './types/app/bsky/feed/sendInteractions.js'
+import * as AppBskyGraphGetActorStarterPacks from './types/app/bsky/graph/getActorStarterPacks.js'
+import * as AppBskyGraphGetBlocks from './types/app/bsky/graph/getBlocks.js'
+import * as AppBskyGraphGetFollowers from './types/app/bsky/graph/getFollowers.js'
+import * as AppBskyGraphGetFollows from './types/app/bsky/graph/getFollows.js'
+import * as AppBskyGraphGetKnownFollowers from './types/app/bsky/graph/getKnownFollowers.js'
+import * as AppBskyGraphGetList from './types/app/bsky/graph/getList.js'
+import * as AppBskyGraphGetListBlocks from './types/app/bsky/graph/getListBlocks.js'
+import * as AppBskyGraphGetListMutes from './types/app/bsky/graph/getListMutes.js'
+import * as AppBskyGraphGetLists from './types/app/bsky/graph/getLists.js'
+import * as AppBskyGraphGetMutes from './types/app/bsky/graph/getMutes.js'
+import * as AppBskyGraphGetRelationships from './types/app/bsky/graph/getRelationships.js'
+import * as AppBskyGraphGetStarterPack from './types/app/bsky/graph/getStarterPack.js'
+import * as AppBskyGraphGetStarterPacks from './types/app/bsky/graph/getStarterPacks.js'
+import * as AppBskyGraphGetSuggestedFollowsByActor from './types/app/bsky/graph/getSuggestedFollowsByActor.js'
+import * as AppBskyGraphMuteActor from './types/app/bsky/graph/muteActor.js'
+import * as AppBskyGraphMuteActorList from './types/app/bsky/graph/muteActorList.js'
+import * as AppBskyGraphMuteThread from './types/app/bsky/graph/muteThread.js'
+import * as AppBskyGraphSearchStarterPacks from './types/app/bsky/graph/searchStarterPacks.js'
+import * as AppBskyGraphUnmuteActor from './types/app/bsky/graph/unmuteActor.js'
+import * as AppBskyGraphUnmuteActorList from './types/app/bsky/graph/unmuteActorList.js'
+import * as AppBskyGraphUnmuteThread from './types/app/bsky/graph/unmuteThread.js'
+import * as AppBskyLabelerGetServices from './types/app/bsky/labeler/getServices.js'
+import * as AppBskyNotificationGetUnreadCount from './types/app/bsky/notification/getUnreadCount.js'
+import * as AppBskyNotificationListNotifications from './types/app/bsky/notification/listNotifications.js'
+import * as AppBskyNotificationPutPreferences from './types/app/bsky/notification/putPreferences.js'
+import * as AppBskyNotificationRegisterPush from './types/app/bsky/notification/registerPush.js'
+import * as AppBskyNotificationUpdateSeen from './types/app/bsky/notification/updateSeen.js'
+import * as AppBskyUnspeccedGetConfig from './types/app/bsky/unspecced/getConfig.js'
+import * as AppBskyUnspeccedGetPopularFeedGenerators from './types/app/bsky/unspecced/getPopularFeedGenerators.js'
+import * as AppBskyUnspeccedGetSuggestionsSkeleton from './types/app/bsky/unspecced/getSuggestionsSkeleton.js'
+import * as AppBskyUnspeccedGetTaggedSuggestions from './types/app/bsky/unspecced/getTaggedSuggestions.js'
+import * as AppBskyUnspeccedGetTrendingTopics from './types/app/bsky/unspecced/getTrendingTopics.js'
+import * as AppBskyUnspeccedSearchActorsSkeleton from './types/app/bsky/unspecced/searchActorsSkeleton.js'
+import * as AppBskyUnspeccedSearchPostsSkeleton from './types/app/bsky/unspecced/searchPostsSkeleton.js'
+import * as AppBskyUnspeccedSearchStarterPacksSkeleton from './types/app/bsky/unspecced/searchStarterPacksSkeleton.js'
+import * as AppBskyVideoGetJobStatus from './types/app/bsky/video/getJobStatus.js'
+import * as AppBskyVideoGetUploadLimits from './types/app/bsky/video/getUploadLimits.js'
+import * as AppBskyVideoUploadVideo from './types/app/bsky/video/uploadVideo.js'
+import * as ChatBskyActorDeleteAccount from './types/chat/bsky/actor/deleteAccount.js'
+import * as ChatBskyActorExportAccountData from './types/chat/bsky/actor/exportAccountData.js'
+import * as ChatBskyConvoDeleteMessageForSelf from './types/chat/bsky/convo/deleteMessageForSelf.js'
+import * as ChatBskyConvoGetConvo from './types/chat/bsky/convo/getConvo.js'
+import * as ChatBskyConvoGetConvoForMembers from './types/chat/bsky/convo/getConvoForMembers.js'
+import * as ChatBskyConvoGetLog from './types/chat/bsky/convo/getLog.js'
+import * as ChatBskyConvoGetMessages from './types/chat/bsky/convo/getMessages.js'
+import * as ChatBskyConvoLeaveConvo from './types/chat/bsky/convo/leaveConvo.js'
+import * as ChatBskyConvoListConvos from './types/chat/bsky/convo/listConvos.js'
+import * as ChatBskyConvoMuteConvo from './types/chat/bsky/convo/muteConvo.js'
+import * as ChatBskyConvoSendMessage from './types/chat/bsky/convo/sendMessage.js'
+import * as ChatBskyConvoSendMessageBatch from './types/chat/bsky/convo/sendMessageBatch.js'
+import * as ChatBskyConvoUnmuteConvo from './types/chat/bsky/convo/unmuteConvo.js'
+import * as ChatBskyConvoUpdateRead from './types/chat/bsky/convo/updateRead.js'
+import * as ChatBskyModerationGetActorMetadata from './types/chat/bsky/moderation/getActorMetadata.js'
+import * as ChatBskyModerationGetMessageContext from './types/chat/bsky/moderation/getMessageContext.js'
+import * as ChatBskyModerationUpdateActorAccess from './types/chat/bsky/moderation/updateActorAccess.js'
+import * as ToolsOzoneCommunicationCreateTemplate from './types/tools/ozone/communication/createTemplate.js'
+import * as ToolsOzoneCommunicationDeleteTemplate from './types/tools/ozone/communication/deleteTemplate.js'
+import * as ToolsOzoneCommunicationListTemplates from './types/tools/ozone/communication/listTemplates.js'
+import * as ToolsOzoneCommunicationUpdateTemplate from './types/tools/ozone/communication/updateTemplate.js'
+import * as ToolsOzoneModerationEmitEvent from './types/tools/ozone/moderation/emitEvent.js'
+import * as ToolsOzoneModerationGetEvent from './types/tools/ozone/moderation/getEvent.js'
+import * as ToolsOzoneModerationGetRecord from './types/tools/ozone/moderation/getRecord.js'
+import * as ToolsOzoneModerationGetRecords from './types/tools/ozone/moderation/getRecords.js'
+import * as ToolsOzoneModerationGetRepo from './types/tools/ozone/moderation/getRepo.js'
+import * as ToolsOzoneModerationGetRepos from './types/tools/ozone/moderation/getRepos.js'
+import * as ToolsOzoneModerationQueryEvents from './types/tools/ozone/moderation/queryEvents.js'
+import * as ToolsOzoneModerationQueryStatuses from './types/tools/ozone/moderation/queryStatuses.js'
+import * as ToolsOzoneModerationSearchRepos from './types/tools/ozone/moderation/searchRepos.js'
+import * as ToolsOzoneServerGetConfig from './types/tools/ozone/server/getConfig.js'
+import * as ToolsOzoneSetAddValues from './types/tools/ozone/set/addValues.js'
+import * as ToolsOzoneSetDeleteSet from './types/tools/ozone/set/deleteSet.js'
+import * as ToolsOzoneSetDeleteValues from './types/tools/ozone/set/deleteValues.js'
+import * as ToolsOzoneSetGetValues from './types/tools/ozone/set/getValues.js'
+import * as ToolsOzoneSetQuerySets from './types/tools/ozone/set/querySets.js'
+import * as ToolsOzoneSetUpsertSet from './types/tools/ozone/set/upsertSet.js'
+import * as ToolsOzoneSettingListOptions from './types/tools/ozone/setting/listOptions.js'
+import * as ToolsOzoneSettingRemoveOptions from './types/tools/ozone/setting/removeOptions.js'
+import * as ToolsOzoneSettingUpsertOption from './types/tools/ozone/setting/upsertOption.js'
+import * as ToolsOzoneSignatureFindCorrelation from './types/tools/ozone/signature/findCorrelation.js'
+import * as ToolsOzoneSignatureFindRelatedAccounts from './types/tools/ozone/signature/findRelatedAccounts.js'
+import * as ToolsOzoneSignatureSearchAccounts from './types/tools/ozone/signature/searchAccounts.js'
+import * as ToolsOzoneTeamAddMember from './types/tools/ozone/team/addMember.js'
+import * as ToolsOzoneTeamDeleteMember from './types/tools/ozone/team/deleteMember.js'
+import * as ToolsOzoneTeamListMembers from './types/tools/ozone/team/listMembers.js'
+import * as ToolsOzoneTeamUpdateMember from './types/tools/ozone/team/updateMember.js'
 
 export const COM_ATPROTO_MODERATION = {
   DefsReasonSpam: 'com.atproto.moderation.defs#reasonSpam',
diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
index 6e709774761..c2bfa933c42 100644
--- a/packages/pds/src/lexicon/lexicons.ts
+++ b/packages/pds/src/lexicon/lexicons.ts
@@ -1,7 +1,13 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
-import { LexiconDoc, Lexicons } from '@atproto/lexicon'
+import {
+  LexiconDoc,
+  Lexicons,
+  ValidationError,
+  ValidationResult,
+} from '@atproto/lexicon'
+import { $Typed, is$typed, maybe$typed } from './util.js'
 
 export const schemaDict = {
   ComAtprotoAdminDefs: {
@@ -13871,8 +13877,37 @@ export const schemaDict = {
   },
 } as const satisfies Record<string, LexiconDoc>
 
-export const schemas = Object.values(schemaDict)
+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 = {
   ComAtprotoAdminDefs: 'com.atproto.admin.defs',
   ComAtprotoAdminDeleteAccount: 'com.atproto.admin.deleteAccount',
@@ -14124,4 +14159,4 @@ export const ids = {
   ToolsOzoneTeamDeleteMember: 'tools.ozone.team.deleteMember',
   ToolsOzoneTeamListMembers: 'tools.ozone.team.listMembers',
   ToolsOzoneTeamUpdateMember: 'tools.ozone.team.updateMember',
-}
+} as const
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/defs.ts b/packages/pds/src/lexicon/types/app/bsky/actor/defs.ts
index 730b979dcea..d905d955114 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/defs.ts
@@ -2,16 +2,21 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as AppBskyGraphDefs from '../graph/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
-import * as AppBskyFeedThreadgate from '../feed/threadgate'
-import * as AppBskyFeedPostgate from '../feed/postgate'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as AppBskyGraphDefs from '../graph/defs.js'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
+import type * as AppBskyFeedThreadgate from '../feed/threadgate.js'
+import type * as AppBskyFeedPostgate from '../feed/postgate.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.defs'
 
 export interface ProfileViewBasic {
+  $type?: 'app.bsky.actor.defs#profileViewBasic'
   did: string
   handle: string
   displayName?: string
@@ -20,22 +25,20 @@ export interface ProfileViewBasic {
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
   createdAt?: string
-  [k: string]: unknown
 }
 
-export function isProfileViewBasic(v: unknown): v is ProfileViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileViewBasic'
-  )
+const hashProfileViewBasic = 'profileViewBasic'
+
+export function isProfileViewBasic<V>(v: V) {
+  return is$typed(v, id, hashProfileViewBasic)
 }
 
-export function validateProfileViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileViewBasic', v)
+export function validateProfileViewBasic<V>(v: V) {
+  return validate<ProfileViewBasic & V>(v, id, hashProfileViewBasic)
 }
 
 export interface ProfileView {
+  $type?: 'app.bsky.actor.defs#profileView'
   did: string
   handle: string
   displayName?: string
@@ -46,22 +49,20 @@ export interface ProfileView {
   createdAt?: string
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isProfileView(v: unknown): v is ProfileView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileView'
-  )
+const hashProfileView = 'profileView'
+
+export function isProfileView<V>(v: V) {
+  return is$typed(v, id, hashProfileView)
 }
 
-export function validateProfileView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileView', v)
+export function validateProfileView<V>(v: V) {
+  return validate<ProfileView & V>(v, id, hashProfileView)
 }
 
 export interface ProfileViewDetailed {
+  $type?: 'app.bsky.actor.defs#profileViewDetailed'
   did: string
   handle: string
   displayName?: string
@@ -78,63 +79,55 @@ export interface ProfileViewDetailed {
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
   pinnedPost?: ComAtprotoRepoStrongRef.Main
-  [k: string]: unknown
 }
 
-export function isProfileViewDetailed(v: unknown): v is ProfileViewDetailed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileViewDetailed'
-  )
+const hashProfileViewDetailed = 'profileViewDetailed'
+
+export function isProfileViewDetailed<V>(v: V) {
+  return is$typed(v, id, hashProfileViewDetailed)
 }
 
-export function validateProfileViewDetailed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileViewDetailed', v)
+export function validateProfileViewDetailed<V>(v: V) {
+  return validate<ProfileViewDetailed & V>(v, id, hashProfileViewDetailed)
 }
 
 export interface ProfileAssociated {
+  $type?: 'app.bsky.actor.defs#profileAssociated'
   lists?: number
   feedgens?: number
   starterPacks?: number
   labeler?: boolean
   chat?: ProfileAssociatedChat
-  [k: string]: unknown
 }
 
-export function isProfileAssociated(v: unknown): v is ProfileAssociated {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileAssociated'
-  )
+const hashProfileAssociated = 'profileAssociated'
+
+export function isProfileAssociated<V>(v: V) {
+  return is$typed(v, id, hashProfileAssociated)
 }
 
-export function validateProfileAssociated(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileAssociated', v)
+export function validateProfileAssociated<V>(v: V) {
+  return validate<ProfileAssociated & V>(v, id, hashProfileAssociated)
 }
 
 export interface ProfileAssociatedChat {
+  $type?: 'app.bsky.actor.defs#profileAssociatedChat'
   allowIncoming: 'all' | 'none' | 'following' | (string & {})
-  [k: string]: unknown
 }
 
-export function isProfileAssociatedChat(
-  v: unknown,
-): v is ProfileAssociatedChat {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileAssociatedChat'
-  )
+const hashProfileAssociatedChat = 'profileAssociatedChat'
+
+export function isProfileAssociatedChat<V>(v: V) {
+  return is$typed(v, id, hashProfileAssociatedChat)
 }
 
-export function validateProfileAssociatedChat(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileAssociatedChat', v)
+export function validateProfileAssociatedChat<V>(v: V) {
+  return validate<ProfileAssociatedChat & V>(v, id, hashProfileAssociatedChat)
 }
 
 /** Metadata about the requesting account's relationship with the subject account. Only has meaningful content for authed requests. */
 export interface ViewerState {
+  $type?: 'app.bsky.actor.defs#viewerState'
   muted?: boolean
   mutedByList?: AppBskyGraphDefs.ListViewBasic
   blockedBy?: boolean
@@ -143,169 +136,153 @@ export interface ViewerState {
   following?: string
   followedBy?: string
   knownFollowers?: KnownFollowers
-  [k: string]: unknown
 }
 
-export function isViewerState(v: unknown): v is ViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#viewerState'
-  )
+const hashViewerState = 'viewerState'
+
+export function isViewerState<V>(v: V) {
+  return is$typed(v, id, hashViewerState)
 }
 
-export function validateViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#viewerState', v)
+export function validateViewerState<V>(v: V) {
+  return validate<ViewerState & V>(v, id, hashViewerState)
 }
 
 /** The subject's followers whom you also follow */
 export interface KnownFollowers {
+  $type?: 'app.bsky.actor.defs#knownFollowers'
   count: number
   followers: ProfileViewBasic[]
-  [k: string]: unknown
 }
 
-export function isKnownFollowers(v: unknown): v is KnownFollowers {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#knownFollowers'
-  )
+const hashKnownFollowers = 'knownFollowers'
+
+export function isKnownFollowers<V>(v: V) {
+  return is$typed(v, id, hashKnownFollowers)
 }
 
-export function validateKnownFollowers(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#knownFollowers', v)
+export function validateKnownFollowers<V>(v: V) {
+  return validate<KnownFollowers & V>(v, id, hashKnownFollowers)
 }
 
 export type Preferences = (
-  | AdultContentPref
-  | ContentLabelPref
-  | SavedFeedsPref
-  | SavedFeedsPrefV2
-  | PersonalDetailsPref
-  | FeedViewPref
-  | ThreadViewPref
-  | InterestsPref
-  | MutedWordsPref
-  | HiddenPostsPref
-  | BskyAppStatePref
-  | LabelersPref
-  | PostInteractionSettingsPref
-  | { $type: string; [k: string]: unknown }
+  | $Typed<AdultContentPref>
+  | $Typed<ContentLabelPref>
+  | $Typed<SavedFeedsPref>
+  | $Typed<SavedFeedsPrefV2>
+  | $Typed<PersonalDetailsPref>
+  | $Typed<FeedViewPref>
+  | $Typed<ThreadViewPref>
+  | $Typed<InterestsPref>
+  | $Typed<MutedWordsPref>
+  | $Typed<HiddenPostsPref>
+  | $Typed<BskyAppStatePref>
+  | $Typed<LabelersPref>
+  | $Typed<PostInteractionSettingsPref>
+  | { $type: string }
 )[]
 
 export interface AdultContentPref {
+  $type?: 'app.bsky.actor.defs#adultContentPref'
   enabled: boolean
-  [k: string]: unknown
 }
 
-export function isAdultContentPref(v: unknown): v is AdultContentPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#adultContentPref'
-  )
+const hashAdultContentPref = 'adultContentPref'
+
+export function isAdultContentPref<V>(v: V) {
+  return is$typed(v, id, hashAdultContentPref)
 }
 
-export function validateAdultContentPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#adultContentPref', v)
+export function validateAdultContentPref<V>(v: V) {
+  return validate<AdultContentPref & V>(v, id, hashAdultContentPref)
 }
 
 export interface ContentLabelPref {
+  $type?: 'app.bsky.actor.defs#contentLabelPref'
   /** Which labeler does this preference apply to? If undefined, applies globally. */
   labelerDid?: string
   label: string
   visibility: 'ignore' | 'show' | 'warn' | 'hide' | (string & {})
-  [k: string]: unknown
 }
 
-export function isContentLabelPref(v: unknown): v is ContentLabelPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#contentLabelPref'
-  )
+const hashContentLabelPref = 'contentLabelPref'
+
+export function isContentLabelPref<V>(v: V) {
+  return is$typed(v, id, hashContentLabelPref)
 }
 
-export function validateContentLabelPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#contentLabelPref', v)
+export function validateContentLabelPref<V>(v: V) {
+  return validate<ContentLabelPref & V>(v, id, hashContentLabelPref)
 }
 
 export interface SavedFeed {
+  $type?: 'app.bsky.actor.defs#savedFeed'
   id: string
   type: 'feed' | 'list' | 'timeline' | (string & {})
   value: string
   pinned: boolean
-  [k: string]: unknown
 }
 
-export function isSavedFeed(v: unknown): v is SavedFeed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeed'
-  )
+const hashSavedFeed = 'savedFeed'
+
+export function isSavedFeed<V>(v: V) {
+  return is$typed(v, id, hashSavedFeed)
 }
 
-export function validateSavedFeed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeed', v)
+export function validateSavedFeed<V>(v: V) {
+  return validate<SavedFeed & V>(v, id, hashSavedFeed)
 }
 
 export interface SavedFeedsPrefV2 {
+  $type?: 'app.bsky.actor.defs#savedFeedsPrefV2'
   items: SavedFeed[]
-  [k: string]: unknown
 }
 
-export function isSavedFeedsPrefV2(v: unknown): v is SavedFeedsPrefV2 {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeedsPrefV2'
-  )
+const hashSavedFeedsPrefV2 = 'savedFeedsPrefV2'
+
+export function isSavedFeedsPrefV2<V>(v: V) {
+  return is$typed(v, id, hashSavedFeedsPrefV2)
 }
 
-export function validateSavedFeedsPrefV2(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeedsPrefV2', v)
+export function validateSavedFeedsPrefV2<V>(v: V) {
+  return validate<SavedFeedsPrefV2 & V>(v, id, hashSavedFeedsPrefV2)
 }
 
 export interface SavedFeedsPref {
+  $type?: 'app.bsky.actor.defs#savedFeedsPref'
   pinned: string[]
   saved: string[]
   timelineIndex?: number
-  [k: string]: unknown
 }
 
-export function isSavedFeedsPref(v: unknown): v is SavedFeedsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeedsPref'
-  )
+const hashSavedFeedsPref = 'savedFeedsPref'
+
+export function isSavedFeedsPref<V>(v: V) {
+  return is$typed(v, id, hashSavedFeedsPref)
 }
 
-export function validateSavedFeedsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeedsPref', v)
+export function validateSavedFeedsPref<V>(v: V) {
+  return validate<SavedFeedsPref & V>(v, id, hashSavedFeedsPref)
 }
 
 export interface PersonalDetailsPref {
+  $type?: 'app.bsky.actor.defs#personalDetailsPref'
   /** The birth date of account owner. */
   birthDate?: string
-  [k: string]: unknown
 }
 
-export function isPersonalDetailsPref(v: unknown): v is PersonalDetailsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#personalDetailsPref'
-  )
+const hashPersonalDetailsPref = 'personalDetailsPref'
+
+export function isPersonalDetailsPref<V>(v: V) {
+  return is$typed(v, id, hashPersonalDetailsPref)
 }
 
-export function validatePersonalDetailsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#personalDetailsPref', v)
+export function validatePersonalDetailsPref<V>(v: V) {
+  return validate<PersonalDetailsPref & V>(v, id, hashPersonalDetailsPref)
 }
 
 export interface FeedViewPref {
+  $type?: 'app.bsky.actor.defs#feedViewPref'
   /** The URI of the feed, or an identifier which describes the feed. */
   feed: string
   /** Hide replies in the feed. */
@@ -318,22 +295,20 @@ export interface FeedViewPref {
   hideReposts?: boolean
   /** Hide quote posts in the feed. */
   hideQuotePosts?: boolean
-  [k: string]: unknown
 }
 
-export function isFeedViewPref(v: unknown): v is FeedViewPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#feedViewPref'
-  )
+const hashFeedViewPref = 'feedViewPref'
+
+export function isFeedViewPref<V>(v: V) {
+  return is$typed(v, id, hashFeedViewPref)
 }
 
-export function validateFeedViewPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#feedViewPref', v)
+export function validateFeedViewPref<V>(v: V) {
+  return validate<FeedViewPref & V>(v, id, hashFeedViewPref)
 }
 
 export interface ThreadViewPref {
+  $type?: 'app.bsky.actor.defs#threadViewPref'
   /** Sorting mode for threads. */
   sort?:
     | 'oldest'
@@ -344,43 +319,39 @@ export interface ThreadViewPref {
     | (string & {})
   /** Show followed users at the top of all replies. */
   prioritizeFollowedUsers?: boolean
-  [k: string]: unknown
 }
 
-export function isThreadViewPref(v: unknown): v is ThreadViewPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#threadViewPref'
-  )
+const hashThreadViewPref = 'threadViewPref'
+
+export function isThreadViewPref<V>(v: V) {
+  return is$typed(v, id, hashThreadViewPref)
 }
 
-export function validateThreadViewPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#threadViewPref', v)
+export function validateThreadViewPref<V>(v: V) {
+  return validate<ThreadViewPref & V>(v, id, hashThreadViewPref)
 }
 
 export interface InterestsPref {
+  $type?: 'app.bsky.actor.defs#interestsPref'
   /** A list of tags which describe the account owner's interests gathered during onboarding. */
   tags: string[]
-  [k: string]: unknown
 }
 
-export function isInterestsPref(v: unknown): v is InterestsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#interestsPref'
-  )
+const hashInterestsPref = 'interestsPref'
+
+export function isInterestsPref<V>(v: V) {
+  return is$typed(v, id, hashInterestsPref)
 }
 
-export function validateInterestsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#interestsPref', v)
+export function validateInterestsPref<V>(v: V) {
+  return validate<InterestsPref & V>(v, id, hashInterestsPref)
 }
 
 export type MutedWordTarget = 'content' | 'tag' | (string & {})
 
 /** A word that the account owner has muted. */
 export interface MutedWord {
+  $type?: 'app.bsky.actor.defs#mutedWord'
   id?: string
   /** The muted word itself. */
   value: string
@@ -390,182 +361,165 @@ export interface MutedWord {
   actorTarget: 'all' | 'exclude-following' | (string & {})
   /** The date and time at which the muted word will expire and no longer be applied. */
   expiresAt?: string
-  [k: string]: unknown
 }
 
-export function isMutedWord(v: unknown): v is MutedWord {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#mutedWord'
-  )
+const hashMutedWord = 'mutedWord'
+
+export function isMutedWord<V>(v: V) {
+  return is$typed(v, id, hashMutedWord)
 }
 
-export function validateMutedWord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#mutedWord', v)
+export function validateMutedWord<V>(v: V) {
+  return validate<MutedWord & V>(v, id, hashMutedWord)
 }
 
 export interface MutedWordsPref {
+  $type?: 'app.bsky.actor.defs#mutedWordsPref'
   /** A list of words the account owner has muted. */
   items: MutedWord[]
-  [k: string]: unknown
 }
 
-export function isMutedWordsPref(v: unknown): v is MutedWordsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#mutedWordsPref'
-  )
+const hashMutedWordsPref = 'mutedWordsPref'
+
+export function isMutedWordsPref<V>(v: V) {
+  return is$typed(v, id, hashMutedWordsPref)
 }
 
-export function validateMutedWordsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#mutedWordsPref', v)
+export function validateMutedWordsPref<V>(v: V) {
+  return validate<MutedWordsPref & V>(v, id, hashMutedWordsPref)
 }
 
 export interface HiddenPostsPref {
+  $type?: 'app.bsky.actor.defs#hiddenPostsPref'
   /** A list of URIs of posts the account owner has hidden. */
   items: string[]
-  [k: string]: unknown
 }
 
-export function isHiddenPostsPref(v: unknown): v is HiddenPostsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#hiddenPostsPref'
-  )
+const hashHiddenPostsPref = 'hiddenPostsPref'
+
+export function isHiddenPostsPref<V>(v: V) {
+  return is$typed(v, id, hashHiddenPostsPref)
 }
 
-export function validateHiddenPostsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#hiddenPostsPref', v)
+export function validateHiddenPostsPref<V>(v: V) {
+  return validate<HiddenPostsPref & V>(v, id, hashHiddenPostsPref)
 }
 
 export interface LabelersPref {
+  $type?: 'app.bsky.actor.defs#labelersPref'
   labelers: LabelerPrefItem[]
-  [k: string]: unknown
 }
 
-export function isLabelersPref(v: unknown): v is LabelersPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#labelersPref'
-  )
+const hashLabelersPref = 'labelersPref'
+
+export function isLabelersPref<V>(v: V) {
+  return is$typed(v, id, hashLabelersPref)
 }
 
-export function validateLabelersPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#labelersPref', v)
+export function validateLabelersPref<V>(v: V) {
+  return validate<LabelersPref & V>(v, id, hashLabelersPref)
 }
 
 export interface LabelerPrefItem {
+  $type?: 'app.bsky.actor.defs#labelerPrefItem'
   did: string
-  [k: string]: unknown
 }
 
-export function isLabelerPrefItem(v: unknown): v is LabelerPrefItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#labelerPrefItem'
-  )
+const hashLabelerPrefItem = 'labelerPrefItem'
+
+export function isLabelerPrefItem<V>(v: V) {
+  return is$typed(v, id, hashLabelerPrefItem)
 }
 
-export function validateLabelerPrefItem(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#labelerPrefItem', v)
+export function validateLabelerPrefItem<V>(v: V) {
+  return validate<LabelerPrefItem & V>(v, id, hashLabelerPrefItem)
 }
 
 /** A grab bag of state that's specific to the bsky.app program. Third-party apps shouldn't use this. */
 export interface BskyAppStatePref {
+  $type?: 'app.bsky.actor.defs#bskyAppStatePref'
   activeProgressGuide?: BskyAppProgressGuide
   /** An array of tokens which identify nudges (modals, popups, tours, highlight dots) that should be shown to the user. */
   queuedNudges?: string[]
   /** Storage for NUXs the user has encountered. */
   nuxs?: Nux[]
-  [k: string]: unknown
 }
 
-export function isBskyAppStatePref(v: unknown): v is BskyAppStatePref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#bskyAppStatePref'
-  )
+const hashBskyAppStatePref = 'bskyAppStatePref'
+
+export function isBskyAppStatePref<V>(v: V) {
+  return is$typed(v, id, hashBskyAppStatePref)
 }
 
-export function validateBskyAppStatePref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#bskyAppStatePref', v)
+export function validateBskyAppStatePref<V>(v: V) {
+  return validate<BskyAppStatePref & V>(v, id, hashBskyAppStatePref)
 }
 
 /** If set, an active progress guide. Once completed, can be set to undefined. Should have unspecced fields tracking progress. */
 export interface BskyAppProgressGuide {
+  $type?: 'app.bsky.actor.defs#bskyAppProgressGuide'
   guide: string
-  [k: string]: unknown
 }
 
-export function isBskyAppProgressGuide(v: unknown): v is BskyAppProgressGuide {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#bskyAppProgressGuide'
-  )
+const hashBskyAppProgressGuide = 'bskyAppProgressGuide'
+
+export function isBskyAppProgressGuide<V>(v: V) {
+  return is$typed(v, id, hashBskyAppProgressGuide)
 }
 
-export function validateBskyAppProgressGuide(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#bskyAppProgressGuide', v)
+export function validateBskyAppProgressGuide<V>(v: V) {
+  return validate<BskyAppProgressGuide & V>(v, id, hashBskyAppProgressGuide)
 }
 
 /** A new user experiences (NUX) storage object */
 export interface Nux {
+  $type?: 'app.bsky.actor.defs#nux'
   id: string
   completed: boolean
   /** Arbitrary data for the NUX. The structure is defined by the NUX itself. Limited to 300 characters. */
   data?: string
   /** The date and time at which the NUX will expire and should be considered completed. */
   expiresAt?: string
-  [k: string]: unknown
 }
 
-export function isNux(v: unknown): v is Nux {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.actor.defs#nux'
-  )
+const hashNux = 'nux'
+
+export function isNux<V>(v: V) {
+  return is$typed(v, id, hashNux)
 }
 
-export function validateNux(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#nux', v)
+export function validateNux<V>(v: V) {
+  return validate<Nux & V>(v, id, hashNux)
 }
 
 /** Default post interaction settings for the account. These values should be applied as default values when creating new posts. These refs should mirror the threadgate and postgate records exactly. */
 export interface PostInteractionSettingsPref {
+  $type?: 'app.bsky.actor.defs#postInteractionSettingsPref'
   /** Matches threadgate record. List of rules defining who can reply to this users posts. If value is an empty array, no one can reply. If value is undefined, anyone can reply. */
   threadgateAllowRules?: (
-    | AppBskyFeedThreadgate.MentionRule
-    | AppBskyFeedThreadgate.FollowerRule
-    | AppBskyFeedThreadgate.FollowingRule
-    | AppBskyFeedThreadgate.ListRule
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyFeedThreadgate.MentionRule>
+    | $Typed<AppBskyFeedThreadgate.FollowerRule>
+    | $Typed<AppBskyFeedThreadgate.FollowingRule>
+    | $Typed<AppBskyFeedThreadgate.ListRule>
+    | { $type: string }
   )[]
   /** Matches postgate record. List of rules defining who can embed this users posts. If value is an empty array or is undefined, no particular rules apply and anyone can embed. */
   postgateEmbeddingRules?: (
-    | AppBskyFeedPostgate.DisableRule
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyFeedPostgate.DisableRule>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
-export function isPostInteractionSettingsPref(
-  v: unknown,
-): v is PostInteractionSettingsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#postInteractionSettingsPref'
-  )
+const hashPostInteractionSettingsPref = 'postInteractionSettingsPref'
+
+export function isPostInteractionSettingsPref<V>(v: V) {
+  return is$typed(v, id, hashPostInteractionSettingsPref)
 }
 
-export function validatePostInteractionSettingsPref(
-  v: unknown,
-): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#postInteractionSettingsPref', v)
+export function validatePostInteractionSettingsPref<V>(v: V) {
+  return validate<PostInteractionSettingsPref & V>(
+    v,
+    id,
+    hashPostInteractionSettingsPref,
+  )
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/getPreferences.ts b/packages/pds/src/lexicon/types/app/bsky/actor/getPreferences.ts
index f839ece0a4d..f81e927ac0d 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/getPreferences.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/getPreferences.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.getPreferences'
 
 export interface QueryParams {}
 
@@ -15,7 +19,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   preferences: AppBskyActorDefs.Preferences
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/getProfile.ts b/packages/pds/src/lexicon/types/app/bsky/actor/getProfile.ts
index f9163fcf168..4c83033afa4 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/getProfile.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/getProfile.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.getProfile'
 
 export interface QueryParams {
   /** Handle or DID of account to fetch profile of. */
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/getProfiles.ts b/packages/pds/src/lexicon/types/app/bsky/actor/getProfiles.ts
index 5c2ffb1f2cc..a520bb53a93 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/getProfiles.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/getProfiles.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.getProfiles'
 
 export interface QueryParams {
   actors: string[]
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   profiles: AppBskyActorDefs.ProfileViewDetailed[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/getSuggestions.ts b/packages/pds/src/lexicon/types/app/bsky/actor/getSuggestions.ts
index c7e254261a1..9001835fa2d 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/getSuggestions.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/getSuggestions.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.getSuggestions'
 
 export interface QueryParams {
   limit: number
@@ -21,7 +25,6 @@ export interface OutputSchema {
   actors: AppBskyActorDefs.ProfileView[]
   /** Snowflake for this recommendation, use when submitting recommendation events. */
   recId?: number
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/profile.ts b/packages/pds/src/lexicon/types/app/bsky/actor/profile.ts
index 617bdf2cd73..e5bb9da321b 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/profile.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/profile.ts
@@ -2,13 +2,18 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.profile'
 
 export interface Record {
+  $type: 'app.bsky.actor.profile'
   displayName?: string
   /** Free-form profile description text. */
   description?: string
@@ -16,24 +21,19 @@ export interface Record {
   avatar?: BlobRef
   /** Larger horizontal image to display behind profile view. */
   banner?: BlobRef
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   joinedViaStarterPack?: ComAtprotoRepoStrongRef.Main
   pinnedPost?: ComAtprotoRepoStrongRef.Main
   createdAt?: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.actor.profile#main' ||
-      v.$type === 'app.bsky.actor.profile')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.profile#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/putPreferences.ts b/packages/pds/src/lexicon/types/app/bsky/actor/putPreferences.ts
index 59aea81c2da..922fc9b2fdf 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/putPreferences.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/putPreferences.ts
@@ -3,17 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.putPreferences'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   preferences: AppBskyActorDefs.Preferences
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/searchActors.ts b/packages/pds/src/lexicon/types/app/bsky/actor/searchActors.ts
index ebd81ececc5..74a1fbb6d97 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/searchActors.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/searchActors.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.searchActors'
 
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead. */
@@ -23,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   actors: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts b/packages/pds/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
index b7e9831b21d..09e307aa2df 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from './defs'
+import type * as AppBskyActorDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.searchActorsTypeahead'
 
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead. */
@@ -21,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   actors: AppBskyActorDefs.ProfileViewBasic[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/embed/defs.ts b/packages/pds/src/lexicon/types/app/bsky/embed/defs.ts
index cc253f9e610..adf61115464 100644
--- a/packages/pds/src/lexicon/types/app/bsky/embed/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/embed/defs.ts
@@ -2,25 +2,27 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.embed.defs'
 
 /** width:height represents an aspect ratio. It may be approximate, and may not correspond to absolute dimensions in any given unit. */
 export interface AspectRatio {
+  $type?: 'app.bsky.embed.defs#aspectRatio'
   width: number
   height: number
-  [k: string]: unknown
 }
 
-export function isAspectRatio(v: unknown): v is AspectRatio {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.defs#aspectRatio'
-  )
+const hashAspectRatio = 'aspectRatio'
+
+export function isAspectRatio<V>(v: V) {
+  return is$typed(v, id, hashAspectRatio)
 }
 
-export function validateAspectRatio(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.defs#aspectRatio', v)
+export function validateAspectRatio<V>(v: V) {
+  return validate<AspectRatio & V>(v, id, hashAspectRatio)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/embed/external.ts b/packages/pds/src/lexicon/types/app/bsky/embed/external.ts
index b137ee4b6f5..5a38d1e3846 100644
--- a/packages/pds/src/lexicon/types/app/bsky/embed/external.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/embed/external.ts
@@ -2,82 +2,77 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.embed.external'
 
 /** A representation of some externally linked content (eg, a URL and 'card'), embedded in a Bluesky record (eg, a post). */
 export interface Main {
+  $type?: 'app.bsky.embed.external'
   external: External
-  [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.external#main' ||
-      v.$type === 'app.bsky.embed.external')
-  )
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#main', v)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
 export interface External {
+  $type?: 'app.bsky.embed.external#external'
   uri: string
   title: string
   description: string
   thumb?: BlobRef
-  [k: string]: unknown
 }
 
-export function isExternal(v: unknown): v is External {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#external'
-  )
+const hashExternal = 'external'
+
+export function isExternal<V>(v: V) {
+  return is$typed(v, id, hashExternal)
 }
 
-export function validateExternal(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#external', v)
+export function validateExternal<V>(v: V) {
+  return validate<External & V>(v, id, hashExternal)
 }
 
 export interface View {
+  $type?: 'app.bsky.embed.external#view'
   external: ViewExternal
-  [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#view'
-  )
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#view', v)
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
 
 export interface ViewExternal {
+  $type?: 'app.bsky.embed.external#viewExternal'
   uri: string
   title: string
   description: string
   thumb?: string
-  [k: string]: unknown
 }
 
-export function isViewExternal(v: unknown): v is ViewExternal {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#viewExternal'
-  )
+const hashViewExternal = 'viewExternal'
+
+export function isViewExternal<V>(v: V) {
+  return is$typed(v, id, hashViewExternal)
 }
 
-export function validateViewExternal(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#viewExternal', v)
+export function validateViewExternal<V>(v: V) {
+  return validate<ViewExternal & V>(v, id, hashViewExternal)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/embed/images.ts b/packages/pds/src/lexicon/types/app/bsky/embed/images.ts
index 1fddf42f8eb..26b6d965235 100644
--- a/packages/pds/src/lexicon/types/app/bsky/embed/images.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/embed/images.ts
@@ -2,63 +2,65 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyEmbedDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyEmbedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.embed.images'
 
 export interface Main {
+  $type?: 'app.bsky.embed.images'
   images: Image[]
-  [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.images#main' ||
-      v.$type === 'app.bsky.embed.images')
-  )
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#main', v)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
 export interface Image {
+  $type?: 'app.bsky.embed.images#image'
   image: BlobRef
   /** Alt text description of the image, for accessibility. */
   alt: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isImage(v: unknown): v is Image {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.images#image'
-  )
+const hashImage = 'image'
+
+export function isImage<V>(v: V) {
+  return is$typed(v, id, hashImage)
 }
 
-export function validateImage(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#image', v)
+export function validateImage<V>(v: V) {
+  return validate<Image & V>(v, id, hashImage)
 }
 
 export interface View {
+  $type?: 'app.bsky.embed.images#view'
   images: ViewImage[]
-  [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.images#view'
-  )
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#view', v)
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
 
 export interface ViewImage {
+  $type?: 'app.bsky.embed.images#viewImage'
   /** Fully-qualified URL where a thumbnail of the image can be fetched. For example, CDN location provided by the App View. */
   thumb: string
   /** Fully-qualified URL where a large version of the image can be fetched. May or may not be the exact original blob. For example, CDN location provided by the App View. */
@@ -66,17 +68,14 @@ export interface ViewImage {
   /** Alt text description of the image, for accessibility. */
   alt: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isViewImage(v: unknown): v is ViewImage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.images#viewImage'
-  )
+const hashViewImage = 'viewImage'
+
+export function isViewImage<V>(v: V) {
+  return is$typed(v, id, hashViewImage)
 }
 
-export function validateViewImage(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#viewImage', v)
+export function validateViewImage<V>(v: V) {
+  return validate<ViewImage & V>(v, id, hashViewImage)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/embed/record.ts b/packages/pds/src/lexicon/types/app/bsky/embed/record.ts
index 452c8fb7f71..9fd1aee2be3 100644
--- a/packages/pds/src/lexicon/types/app/bsky/embed/record.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/embed/record.ts
@@ -2,148 +2,141 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
-import * as AppBskyFeedDefs from '../feed/defs'
-import * as AppBskyGraphDefs from '../graph/defs'
-import * as AppBskyLabelerDefs from '../labeler/defs'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as AppBskyEmbedImages from './images'
-import * as AppBskyEmbedVideo from './video'
-import * as AppBskyEmbedExternal from './external'
-import * as AppBskyEmbedRecordWithMedia from './recordWithMedia'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
+import type * as AppBskyFeedDefs from '../feed/defs.js'
+import type * as AppBskyGraphDefs from '../graph/defs.js'
+import type * as AppBskyLabelerDefs from '../labeler/defs.js'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as AppBskyEmbedImages from './images.js'
+import type * as AppBskyEmbedVideo from './video.js'
+import type * as AppBskyEmbedExternal from './external.js'
+import type * as AppBskyEmbedRecordWithMedia from './recordWithMedia.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.embed.record'
 
 export interface Main {
+  $type?: 'app.bsky.embed.record'
   record: ComAtprotoRepoStrongRef.Main
-  [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.record#main' ||
-      v.$type === 'app.bsky.embed.record')
-  )
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#main', v)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
 export interface View {
+  $type?: 'app.bsky.embed.record#view'
   record:
-    | ViewRecord
-    | ViewNotFound
-    | ViewBlocked
-    | ViewDetached
-    | AppBskyFeedDefs.GeneratorView
-    | AppBskyGraphDefs.ListView
-    | AppBskyLabelerDefs.LabelerView
-    | AppBskyGraphDefs.StarterPackViewBasic
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<ViewRecord>
+    | $Typed<ViewNotFound>
+    | $Typed<ViewBlocked>
+    | $Typed<ViewDetached>
+    | $Typed<AppBskyFeedDefs.GeneratorView>
+    | $Typed<AppBskyGraphDefs.ListView>
+    | $Typed<AppBskyLabelerDefs.LabelerView>
+    | $Typed<AppBskyGraphDefs.StarterPackViewBasic>
+    | { $type: string }
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.record#view'
-  )
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#view', v)
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
 
 export interface ViewRecord {
+  $type?: 'app.bsky.embed.record#viewRecord'
   uri: string
   cid: string
   author: AppBskyActorDefs.ProfileViewBasic
   /** The record data itself. */
-  value: {}
+  value: { [_ in string]: unknown }
   labels?: ComAtprotoLabelDefs.Label[]
   replyCount?: number
   repostCount?: number
   likeCount?: number
   quoteCount?: number
   embeds?: (
-    | AppBskyEmbedImages.View
-    | AppBskyEmbedVideo.View
-    | AppBskyEmbedExternal.View
-    | View
-    | AppBskyEmbedRecordWithMedia.View
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyEmbedImages.View>
+    | $Typed<AppBskyEmbedVideo.View>
+    | $Typed<AppBskyEmbedExternal.View>
+    | $Typed<View>
+    | $Typed<AppBskyEmbedRecordWithMedia.View>
+    | { $type: string }
   )[]
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isViewRecord(v: unknown): v is ViewRecord {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewRecord'
-  )
+const hashViewRecord = 'viewRecord'
+
+export function isViewRecord<V>(v: V) {
+  return is$typed(v, id, hashViewRecord)
 }
 
-export function validateViewRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewRecord', v)
+export function validateViewRecord<V>(v: V) {
+  return validate<ViewRecord & V>(v, id, hashViewRecord)
 }
 
 export interface ViewNotFound {
+  $type?: 'app.bsky.embed.record#viewNotFound'
   uri: string
   notFound: true
-  [k: string]: unknown
 }
 
-export function isViewNotFound(v: unknown): v is ViewNotFound {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewNotFound'
-  )
+const hashViewNotFound = 'viewNotFound'
+
+export function isViewNotFound<V>(v: V) {
+  return is$typed(v, id, hashViewNotFound)
 }
 
-export function validateViewNotFound(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewNotFound', v)
+export function validateViewNotFound<V>(v: V) {
+  return validate<ViewNotFound & V>(v, id, hashViewNotFound)
 }
 
 export interface ViewBlocked {
+  $type?: 'app.bsky.embed.record#viewBlocked'
   uri: string
   blocked: true
   author: AppBskyFeedDefs.BlockedAuthor
-  [k: string]: unknown
 }
 
-export function isViewBlocked(v: unknown): v is ViewBlocked {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewBlocked'
-  )
+const hashViewBlocked = 'viewBlocked'
+
+export function isViewBlocked<V>(v: V) {
+  return is$typed(v, id, hashViewBlocked)
 }
 
-export function validateViewBlocked(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewBlocked', v)
+export function validateViewBlocked<V>(v: V) {
+  return validate<ViewBlocked & V>(v, id, hashViewBlocked)
 }
 
 export interface ViewDetached {
+  $type?: 'app.bsky.embed.record#viewDetached'
   uri: string
   detached: true
-  [k: string]: unknown
 }
 
-export function isViewDetached(v: unknown): v is ViewDetached {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewDetached'
-  )
+const hashViewDetached = 'viewDetached'
+
+export function isViewDetached<V>(v: V) {
+  return is$typed(v, id, hashViewDetached)
 }
 
-export function validateViewDetached(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewDetached', v)
+export function validateViewDetached<V>(v: V) {
+  return validate<ViewDetached & V>(v, id, hashViewDetached)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/embed/recordWithMedia.ts b/packages/pds/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
index 4df0ee5c2d7..2c36a988cc7 100644
--- a/packages/pds/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
@@ -2,55 +2,54 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyEmbedRecord from './record'
-import * as AppBskyEmbedImages from './images'
-import * as AppBskyEmbedVideo from './video'
-import * as AppBskyEmbedExternal from './external'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyEmbedRecord from './record.js'
+import type * as AppBskyEmbedImages from './images.js'
+import type * as AppBskyEmbedVideo from './video.js'
+import type * as AppBskyEmbedExternal from './external.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.embed.recordWithMedia'
 
 export interface Main {
+  $type?: 'app.bsky.embed.recordWithMedia'
   record: AppBskyEmbedRecord.Main
   media:
-    | AppBskyEmbedImages.Main
-    | AppBskyEmbedVideo.Main
-    | AppBskyEmbedExternal.Main
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<AppBskyEmbedImages.Main>
+    | $Typed<AppBskyEmbedVideo.Main>
+    | $Typed<AppBskyEmbedExternal.Main>
+    | { $type: string }
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.recordWithMedia#main' ||
-      v.$type === 'app.bsky.embed.recordWithMedia')
-  )
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.recordWithMedia#main', v)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
 export interface View {
+  $type?: 'app.bsky.embed.recordWithMedia#view'
   record: AppBskyEmbedRecord.View
   media:
-    | AppBskyEmbedImages.View
-    | AppBskyEmbedVideo.View
-    | AppBskyEmbedExternal.View
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<AppBskyEmbedImages.View>
+    | $Typed<AppBskyEmbedVideo.View>
+    | $Typed<AppBskyEmbedExternal.View>
+    | { $type: string }
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.recordWithMedia#view'
-  )
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.recordWithMedia#view', v)
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/embed/video.ts b/packages/pds/src/lexicon/types/app/bsky/embed/video.ts
index 50eb59aa038..10e59e37539 100644
--- a/packages/pds/src/lexicon/types/app/bsky/embed/video.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/embed/video.ts
@@ -2,66 +2,65 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyEmbedDefs from './defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyEmbedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.embed.video'
 
 export interface Main {
+  $type?: 'app.bsky.embed.video'
   video: BlobRef
   captions?: Caption[]
   /** Alt text description of the video, for accessibility. */
   alt?: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.video#main' ||
-      v.$type === 'app.bsky.embed.video')
-  )
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#main', v)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
 export interface Caption {
+  $type?: 'app.bsky.embed.video#caption'
   lang: string
   file: BlobRef
-  [k: string]: unknown
 }
 
-export function isCaption(v: unknown): v is Caption {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.video#caption'
-  )
+const hashCaption = 'caption'
+
+export function isCaption<V>(v: V) {
+  return is$typed(v, id, hashCaption)
 }
 
-export function validateCaption(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#caption', v)
+export function validateCaption<V>(v: V) {
+  return validate<Caption & V>(v, id, hashCaption)
 }
 
 export interface View {
+  $type?: 'app.bsky.embed.video#view'
   cid: string
   playlist: string
   thumbnail?: string
   alt?: string
   aspectRatio?: AppBskyEmbedDefs.AspectRatio
-  [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.video#view'
-  )
+const hashView = 'view'
+
+export function isView<V>(v: V) {
+  return is$typed(v, id, hashView)
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#view', v)
+export function validateView<V>(v: V) {
+  return validate<View & V>(v, id, hashView)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/defs.ts b/packages/pds/src/lexicon/types/app/bsky/feed/defs.ts
index fdf7e58c8a3..f94aaefa7e9 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/defs.ts
@@ -2,31 +2,36 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as AppBskyEmbedImages from '../embed/images'
-import * as AppBskyEmbedVideo from '../embed/video'
-import * as AppBskyEmbedExternal from '../embed/external'
-import * as AppBskyEmbedRecord from '../embed/record'
-import * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as AppBskyGraphDefs from '../graph/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+import type * as AppBskyEmbedImages from '../embed/images.js'
+import type * as AppBskyEmbedVideo from '../embed/video.js'
+import type * as AppBskyEmbedExternal from '../embed/external.js'
+import type * as AppBskyEmbedRecord from '../embed/record.js'
+import type * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as AppBskyRichtextFacet from '../richtext/facet.js'
+import type * as AppBskyGraphDefs from '../graph/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.defs'
 
 export interface PostView {
+  $type?: 'app.bsky.feed.defs#postView'
   uri: string
   cid: string
   author: AppBskyActorDefs.ProfileViewBasic
-  record: {}
+  record: { [_ in string]: unknown }
   embed?:
-    | AppBskyEmbedImages.View
-    | AppBskyEmbedVideo.View
-    | AppBskyEmbedExternal.View
-    | AppBskyEmbedRecord.View
-    | AppBskyEmbedRecordWithMedia.View
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyEmbedImages.View>
+    | $Typed<AppBskyEmbedVideo.View>
+    | $Typed<AppBskyEmbedExternal.View>
+    | $Typed<AppBskyEmbedRecord.View>
+    | $Typed<AppBskyEmbedRecordWithMedia.View>
+    | { $type: string }
   replyCount?: number
   repostCount?: number
   likeCount?: number
@@ -35,225 +40,207 @@ export interface PostView {
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
   threadgate?: ThreadgateView
-  [k: string]: unknown
 }
 
-export function isPostView(v: unknown): v is PostView {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.defs#postView'
-  )
+const hashPostView = 'postView'
+
+export function isPostView<V>(v: V) {
+  return is$typed(v, id, hashPostView)
 }
 
-export function validatePostView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#postView', v)
+export function validatePostView<V>(v: V) {
+  return validate<PostView & V>(v, id, hashPostView)
 }
 
 /** Metadata about the requesting account's relationship with the subject content. Only has meaningful content for authed requests. */
 export interface ViewerState {
+  $type?: 'app.bsky.feed.defs#viewerState'
   repost?: string
   like?: string
   threadMuted?: boolean
   replyDisabled?: boolean
   embeddingDisabled?: boolean
   pinned?: boolean
-  [k: string]: unknown
 }
 
-export function isViewerState(v: unknown): v is ViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#viewerState'
-  )
+const hashViewerState = 'viewerState'
+
+export function isViewerState<V>(v: V) {
+  return is$typed(v, id, hashViewerState)
 }
 
-export function validateViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#viewerState', v)
+export function validateViewerState<V>(v: V) {
+  return validate<ViewerState & V>(v, id, hashViewerState)
 }
 
 /** Metadata about this post within the context of the thread it is in. */
 export interface ThreadContext {
+  $type?: 'app.bsky.feed.defs#threadContext'
   rootAuthorLike?: string
-  [k: string]: unknown
 }
 
-export function isThreadContext(v: unknown): v is ThreadContext {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#threadContext'
-  )
+const hashThreadContext = 'threadContext'
+
+export function isThreadContext<V>(v: V) {
+  return is$typed(v, id, hashThreadContext)
 }
 
-export function validateThreadContext(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#threadContext', v)
+export function validateThreadContext<V>(v: V) {
+  return validate<ThreadContext & V>(v, id, hashThreadContext)
 }
 
 export interface FeedViewPost {
+  $type?: 'app.bsky.feed.defs#feedViewPost'
   post: PostView
   reply?: ReplyRef
-  reason?: ReasonRepost | ReasonPin | { $type: string; [k: string]: unknown }
+  reason?: $Typed<ReasonRepost> | $Typed<ReasonPin> | { $type: string }
   /** Context provided by feed generator that may be passed back alongside interactions. */
   feedContext?: string
-  [k: string]: unknown
 }
 
-export function isFeedViewPost(v: unknown): v is FeedViewPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#feedViewPost'
-  )
+const hashFeedViewPost = 'feedViewPost'
+
+export function isFeedViewPost<V>(v: V) {
+  return is$typed(v, id, hashFeedViewPost)
 }
 
-export function validateFeedViewPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#feedViewPost', v)
+export function validateFeedViewPost<V>(v: V) {
+  return validate<FeedViewPost & V>(v, id, hashFeedViewPost)
 }
 
 export interface ReplyRef {
+  $type?: 'app.bsky.feed.defs#replyRef'
   root:
-    | PostView
-    | NotFoundPost
-    | BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<PostView>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | { $type: string }
   parent:
-    | PostView
-    | NotFoundPost
-    | BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<PostView>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | { $type: string }
   grandparentAuthor?: AppBskyActorDefs.ProfileViewBasic
-  [k: string]: unknown
 }
 
-export function isReplyRef(v: unknown): v is ReplyRef {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.defs#replyRef'
-  )
+const hashReplyRef = 'replyRef'
+
+export function isReplyRef<V>(v: V) {
+  return is$typed(v, id, hashReplyRef)
 }
 
-export function validateReplyRef(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#replyRef', v)
+export function validateReplyRef<V>(v: V) {
+  return validate<ReplyRef & V>(v, id, hashReplyRef)
 }
 
 export interface ReasonRepost {
+  $type?: 'app.bsky.feed.defs#reasonRepost'
   by: AppBskyActorDefs.ProfileViewBasic
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isReasonRepost(v: unknown): v is ReasonRepost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#reasonRepost'
-  )
+const hashReasonRepost = 'reasonRepost'
+
+export function isReasonRepost<V>(v: V) {
+  return is$typed(v, id, hashReasonRepost)
 }
 
-export function validateReasonRepost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#reasonRepost', v)
+export function validateReasonRepost<V>(v: V) {
+  return validate<ReasonRepost & V>(v, id, hashReasonRepost)
 }
 
 export interface ReasonPin {
-  [k: string]: unknown
+  $type?: 'app.bsky.feed.defs#reasonPin'
 }
 
-export function isReasonPin(v: unknown): v is ReasonPin {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#reasonPin'
-  )
+const hashReasonPin = 'reasonPin'
+
+export function isReasonPin<V>(v: V) {
+  return is$typed(v, id, hashReasonPin)
 }
 
-export function validateReasonPin(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#reasonPin', v)
+export function validateReasonPin<V>(v: V) {
+  return validate<ReasonPin & V>(v, id, hashReasonPin)
 }
 
 export interface ThreadViewPost {
+  $type?: 'app.bsky.feed.defs#threadViewPost'
   post: PostView
   parent?:
-    | ThreadViewPost
-    | NotFoundPost
-    | BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ThreadViewPost>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | { $type: string }
   replies?: (
-    | ThreadViewPost
-    | NotFoundPost
-    | BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ThreadViewPost>
+    | $Typed<NotFoundPost>
+    | $Typed<BlockedPost>
+    | { $type: string }
   )[]
   threadContext?: ThreadContext
-  [k: string]: unknown
 }
 
-export function isThreadViewPost(v: unknown): v is ThreadViewPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#threadViewPost'
-  )
+const hashThreadViewPost = 'threadViewPost'
+
+export function isThreadViewPost<V>(v: V) {
+  return is$typed(v, id, hashThreadViewPost)
 }
 
-export function validateThreadViewPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#threadViewPost', v)
+export function validateThreadViewPost<V>(v: V) {
+  return validate<ThreadViewPost & V>(v, id, hashThreadViewPost)
 }
 
 export interface NotFoundPost {
+  $type?: 'app.bsky.feed.defs#notFoundPost'
   uri: string
   notFound: true
-  [k: string]: unknown
 }
 
-export function isNotFoundPost(v: unknown): v is NotFoundPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#notFoundPost'
-  )
+const hashNotFoundPost = 'notFoundPost'
+
+export function isNotFoundPost<V>(v: V) {
+  return is$typed(v, id, hashNotFoundPost)
 }
 
-export function validateNotFoundPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#notFoundPost', v)
+export function validateNotFoundPost<V>(v: V) {
+  return validate<NotFoundPost & V>(v, id, hashNotFoundPost)
 }
 
 export interface BlockedPost {
+  $type?: 'app.bsky.feed.defs#blockedPost'
   uri: string
   blocked: true
   author: BlockedAuthor
-  [k: string]: unknown
 }
 
-export function isBlockedPost(v: unknown): v is BlockedPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#blockedPost'
-  )
+const hashBlockedPost = 'blockedPost'
+
+export function isBlockedPost<V>(v: V) {
+  return is$typed(v, id, hashBlockedPost)
 }
 
-export function validateBlockedPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#blockedPost', v)
+export function validateBlockedPost<V>(v: V) {
+  return validate<BlockedPost & V>(v, id, hashBlockedPost)
 }
 
 export interface BlockedAuthor {
+  $type?: 'app.bsky.feed.defs#blockedAuthor'
   did: string
   viewer?: AppBskyActorDefs.ViewerState
-  [k: string]: unknown
 }
 
-export function isBlockedAuthor(v: unknown): v is BlockedAuthor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#blockedAuthor'
-  )
+const hashBlockedAuthor = 'blockedAuthor'
+
+export function isBlockedAuthor<V>(v: V) {
+  return is$typed(v, id, hashBlockedAuthor)
 }
 
-export function validateBlockedAuthor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#blockedAuthor', v)
+export function validateBlockedAuthor<V>(v: V) {
+  return validate<BlockedAuthor & V>(v, id, hashBlockedAuthor)
 }
 
 export interface GeneratorView {
+  $type?: 'app.bsky.feed.defs#generatorView'
   uri: string
   cid: string
   did: string
@@ -271,115 +258,103 @@ export interface GeneratorView {
     | 'app.bsky.feed.defs#contentModeVideo'
     | (string & {})
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isGeneratorView(v: unknown): v is GeneratorView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#generatorView'
-  )
+const hashGeneratorView = 'generatorView'
+
+export function isGeneratorView<V>(v: V) {
+  return is$typed(v, id, hashGeneratorView)
 }
 
-export function validateGeneratorView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#generatorView', v)
+export function validateGeneratorView<V>(v: V) {
+  return validate<GeneratorView & V>(v, id, hashGeneratorView)
 }
 
 export interface GeneratorViewerState {
+  $type?: 'app.bsky.feed.defs#generatorViewerState'
   like?: string
-  [k: string]: unknown
 }
 
-export function isGeneratorViewerState(v: unknown): v is GeneratorViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#generatorViewerState'
-  )
+const hashGeneratorViewerState = 'generatorViewerState'
+
+export function isGeneratorViewerState<V>(v: V) {
+  return is$typed(v, id, hashGeneratorViewerState)
 }
 
-export function validateGeneratorViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#generatorViewerState', v)
+export function validateGeneratorViewerState<V>(v: V) {
+  return validate<GeneratorViewerState & V>(v, id, hashGeneratorViewerState)
 }
 
 export interface SkeletonFeedPost {
+  $type?: 'app.bsky.feed.defs#skeletonFeedPost'
   post: string
   reason?:
-    | SkeletonReasonRepost
-    | SkeletonReasonPin
-    | { $type: string; [k: string]: unknown }
+    | $Typed<SkeletonReasonRepost>
+    | $Typed<SkeletonReasonPin>
+    | { $type: string }
   /** Context that will be passed through to client and may be passed to feed generator back alongside interactions. */
   feedContext?: string
-  [k: string]: unknown
 }
 
-export function isSkeletonFeedPost(v: unknown): v is SkeletonFeedPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonFeedPost'
-  )
+const hashSkeletonFeedPost = 'skeletonFeedPost'
+
+export function isSkeletonFeedPost<V>(v: V) {
+  return is$typed(v, id, hashSkeletonFeedPost)
 }
 
-export function validateSkeletonFeedPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonFeedPost', v)
+export function validateSkeletonFeedPost<V>(v: V) {
+  return validate<SkeletonFeedPost & V>(v, id, hashSkeletonFeedPost)
 }
 
 export interface SkeletonReasonRepost {
+  $type?: 'app.bsky.feed.defs#skeletonReasonRepost'
   repost: string
-  [k: string]: unknown
 }
 
-export function isSkeletonReasonRepost(v: unknown): v is SkeletonReasonRepost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonReasonRepost'
-  )
+const hashSkeletonReasonRepost = 'skeletonReasonRepost'
+
+export function isSkeletonReasonRepost<V>(v: V) {
+  return is$typed(v, id, hashSkeletonReasonRepost)
 }
 
-export function validateSkeletonReasonRepost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonReasonRepost', v)
+export function validateSkeletonReasonRepost<V>(v: V) {
+  return validate<SkeletonReasonRepost & V>(v, id, hashSkeletonReasonRepost)
 }
 
 export interface SkeletonReasonPin {
-  [k: string]: unknown
+  $type?: 'app.bsky.feed.defs#skeletonReasonPin'
 }
 
-export function isSkeletonReasonPin(v: unknown): v is SkeletonReasonPin {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonReasonPin'
-  )
+const hashSkeletonReasonPin = 'skeletonReasonPin'
+
+export function isSkeletonReasonPin<V>(v: V) {
+  return is$typed(v, id, hashSkeletonReasonPin)
 }
 
-export function validateSkeletonReasonPin(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonReasonPin', v)
+export function validateSkeletonReasonPin<V>(v: V) {
+  return validate<SkeletonReasonPin & V>(v, id, hashSkeletonReasonPin)
 }
 
 export interface ThreadgateView {
+  $type?: 'app.bsky.feed.defs#threadgateView'
   uri?: string
   cid?: string
-  record?: {}
+  record?: { [_ in string]: unknown }
   lists?: AppBskyGraphDefs.ListViewBasic[]
-  [k: string]: unknown
 }
 
-export function isThreadgateView(v: unknown): v is ThreadgateView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#threadgateView'
-  )
+const hashThreadgateView = 'threadgateView'
+
+export function isThreadgateView<V>(v: V) {
+  return is$typed(v, id, hashThreadgateView)
 }
 
-export function validateThreadgateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#threadgateView', v)
+export function validateThreadgateView<V>(v: V) {
+  return validate<ThreadgateView & V>(v, id, hashThreadgateView)
 }
 
 export interface Interaction {
+  $type?: 'app.bsky.feed.defs#interaction'
   item?: string
   event?:
     | 'app.bsky.feed.defs#requestLess'
@@ -397,47 +372,43 @@ export interface Interaction {
     | (string & {})
   /** Context on a feed item that was originally supplied by the feed generator on getFeedSkeleton. */
   feedContext?: string
-  [k: string]: unknown
 }
 
-export function isInteraction(v: unknown): v is Interaction {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#interaction'
-  )
+const hashInteraction = 'interaction'
+
+export function isInteraction<V>(v: V) {
+  return is$typed(v, id, hashInteraction)
 }
 
-export function validateInteraction(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#interaction', v)
+export function validateInteraction<V>(v: V) {
+  return validate<Interaction & V>(v, id, hashInteraction)
 }
 
 /** Request that less content like the given feed item be shown in the feed */
-export const REQUESTLESS = 'app.bsky.feed.defs#requestLess'
+export const REQUESTLESS = `${id}#requestLess`
 /** Request that more content like the given feed item be shown in the feed */
-export const REQUESTMORE = 'app.bsky.feed.defs#requestMore'
+export const REQUESTMORE = `${id}#requestMore`
 /** User clicked through to the feed item */
-export const CLICKTHROUGHITEM = 'app.bsky.feed.defs#clickthroughItem'
+export const CLICKTHROUGHITEM = `${id}#clickthroughItem`
 /** User clicked through to the author of the feed item */
-export const CLICKTHROUGHAUTHOR = 'app.bsky.feed.defs#clickthroughAuthor'
+export const CLICKTHROUGHAUTHOR = `${id}#clickthroughAuthor`
 /** User clicked through to the reposter of the feed item */
-export const CLICKTHROUGHREPOSTER = 'app.bsky.feed.defs#clickthroughReposter'
+export const CLICKTHROUGHREPOSTER = `${id}#clickthroughReposter`
 /** User clicked through to the embedded content of the feed item */
-export const CLICKTHROUGHEMBED = 'app.bsky.feed.defs#clickthroughEmbed'
+export const CLICKTHROUGHEMBED = `${id}#clickthroughEmbed`
 /** Declares the feed generator returns any types of posts. */
-export const CONTENTMODEUNSPECIFIED =
-  'app.bsky.feed.defs#contentModeUnspecified'
+export const CONTENTMODEUNSPECIFIED = `${id}#contentModeUnspecified`
 /** Declares the feed generator returns posts containing app.bsky.embed.video embeds. */
-export const CONTENTMODEVIDEO = 'app.bsky.feed.defs#contentModeVideo'
+export const CONTENTMODEVIDEO = `${id}#contentModeVideo`
 /** Feed item was seen by user */
-export const INTERACTIONSEEN = 'app.bsky.feed.defs#interactionSeen'
+export const INTERACTIONSEEN = `${id}#interactionSeen`
 /** User liked the feed item */
-export const INTERACTIONLIKE = 'app.bsky.feed.defs#interactionLike'
+export const INTERACTIONLIKE = `${id}#interactionLike`
 /** User reposted the feed item */
-export const INTERACTIONREPOST = 'app.bsky.feed.defs#interactionRepost'
+export const INTERACTIONREPOST = `${id}#interactionRepost`
 /** User replied to the feed item */
-export const INTERACTIONREPLY = 'app.bsky.feed.defs#interactionReply'
+export const INTERACTIONREPLY = `${id}#interactionReply`
 /** User quoted the feed item */
-export const INTERACTIONQUOTE = 'app.bsky.feed.defs#interactionQuote'
+export const INTERACTIONQUOTE = `${id}#interactionQuote`
 /** User shared the feed item */
-export const INTERACTIONSHARE = 'app.bsky.feed.defs#interactionShare'
+export const INTERACTIONSHARE = `${id}#interactionShare`
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts b/packages/pds/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
index 0a7d253ce8f..e3f17221cb1 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.describeFeedGenerator'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -16,7 +20,6 @@ export interface OutputSchema {
   did: string
   feeds: Feed[]
   links?: Links
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -46,36 +49,32 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Feed {
+  $type?: 'app.bsky.feed.describeFeedGenerator#feed'
   uri: string
-  [k: string]: unknown
 }
 
-export function isFeed(v: unknown): v is Feed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.describeFeedGenerator#feed'
-  )
+const hashFeed = 'feed'
+
+export function isFeed<V>(v: V) {
+  return is$typed(v, id, hashFeed)
 }
 
-export function validateFeed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.describeFeedGenerator#feed', v)
+export function validateFeed<V>(v: V) {
+  return validate<Feed & V>(v, id, hashFeed)
 }
 
 export interface Links {
+  $type?: 'app.bsky.feed.describeFeedGenerator#links'
   privacyPolicy?: string
   termsOfService?: string
-  [k: string]: unknown
 }
 
-export function isLinks(v: unknown): v is Links {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.describeFeedGenerator#links'
-  )
+const hashLinks = 'links'
+
+export function isLinks<V>(v: V) {
+  return is$typed(v, id, hashLinks)
 }
 
-export function validateLinks(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.describeFeedGenerator#links', v)
+export function validateLinks<V>(v: V) {
+  return validate<Links & V>(v, id, hashLinks)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/generator.ts b/packages/pds/src/lexicon/types/app/bsky/feed/generator.ts
index 482c7a7444e..3cddbae534b 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/generator.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/generator.ts
@@ -2,13 +2,18 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyRichtextFacet from '../richtext/facet.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.generator'
 
 export interface Record {
+  $type: 'app.bsky.feed.generator'
   did: string
   displayName: string
   description?: string
@@ -16,9 +21,7 @@ export interface Record {
   avatar?: BlobRef
   /** Declaration that a feed accepts feedback interactions from a client through app.bsky.feed.sendInteractions */
   acceptsInteractions?: boolean
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   contentMode?:
     | 'app.bsky.feed.defs#contentModeUnspecified'
     | 'app.bsky.feed.defs#contentModeVideo'
@@ -27,15 +30,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.generator#main' ||
-      v.$type === 'app.bsky.feed.generator')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.generator#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getActorFeeds.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
index 6af507c6e03..a2b257745b9 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getActorFeeds'
 
 export interface QueryParams {
   actor: string
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feeds: AppBskyFeedDefs.GeneratorView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getActorLikes.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getActorLikes.ts
index daf5060c8d2..b307c83b22d 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getActorLikes.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getActorLikes.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getActorLikes'
 
 export interface QueryParams {
   actor: string
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
index 2a14f45d6da..4d8b4098b77 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getAuthorFeed'
 
 export interface QueryParams {
   actor: string
@@ -29,7 +33,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getFeed.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getFeed.ts
index 5014c102155..593d3b63743 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getFeed.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getFeed.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getFeed'
 
 export interface QueryParams {
   feed: string
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
index 2b99efa318d..05ac731498e 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getFeedGenerator'
 
 export interface QueryParams {
   /** AT-URI of the feed generator record. */
@@ -22,7 +26,6 @@ export interface OutputSchema {
   isOnline: boolean
   /** Indicates whether the feed generator service is compatible with the record declaration. */
   isValid: boolean
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
index 2dd6f136f17..72a00cb2dd1 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getFeedGenerators'
 
 export interface QueryParams {
   feeds: string[]
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   feeds: AppBskyFeedDefs.GeneratorView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
index cd69f1a10b8..1f231dac80a 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getFeedSkeleton'
 
 export interface QueryParams {
   /** Reference to feed generator record describing the specific feed being requested. */
@@ -21,7 +25,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.SkeletonFeedPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getLikes.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getLikes.ts
index b035c2ea609..4b7e164cc2c 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getLikes.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getLikes.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getLikes'
 
 export interface QueryParams {
   /** AT-URI of the subject (eg, a post record). */
@@ -25,7 +29,6 @@ export interface OutputSchema {
   cid?: string
   cursor?: string
   likes: Like[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -55,18 +58,18 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Like {
+  $type?: 'app.bsky.feed.getLikes#like'
   indexedAt: string
   createdAt: string
   actor: AppBskyActorDefs.ProfileView
-  [k: string]: unknown
 }
 
-export function isLike(v: unknown): v is Like {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.getLikes#like'
-  )
+const hashLike = 'like'
+
+export function isLike<V>(v: V) {
+  return is$typed(v, id, hashLike)
 }
 
-export function validateLike(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.getLikes#like', v)
+export function validateLike<V>(v: V) {
+  return validate<Like & V>(v, id, hashLike)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getListFeed.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getListFeed.ts
index 0720feb5b6b..d131c5af040 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getListFeed.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getListFeed.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getListFeed'
 
 export interface QueryParams {
   /** Reference (AT-URI) to the list record. */
@@ -21,7 +25,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getPostThread.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getPostThread.ts
index 918faddfc1d..31e15ca72ac 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getPostThread.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getPostThread.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getPostThread'
 
 export interface QueryParams {
   /** Reference (AT-URI) to post record. */
@@ -22,12 +26,11 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   thread:
-    | AppBskyFeedDefs.ThreadViewPost
-    | AppBskyFeedDefs.NotFoundPost
-    | AppBskyFeedDefs.BlockedPost
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyFeedDefs.ThreadViewPost>
+    | $Typed<AppBskyFeedDefs.NotFoundPost>
+    | $Typed<AppBskyFeedDefs.BlockedPost>
+    | { $type: string }
   threadgate?: AppBskyFeedDefs.ThreadgateView
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getPosts.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getPosts.ts
index b7048083583..84dedf5816e 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getPosts.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getPosts.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getPosts'
 
 export interface QueryParams {
   /** List of post AT-URIs to return hydrated views for. */
@@ -18,7 +22,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   posts: AppBskyFeedDefs.PostView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getQuotes.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getQuotes.ts
index 23c7dd831f0..94a7b53c177 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getQuotes.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getQuotes.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getQuotes'
 
 export interface QueryParams {
   /** Reference (AT-URI) of post record */
@@ -25,7 +29,6 @@ export interface OutputSchema {
   cid?: string
   cursor?: string
   posts: AppBskyFeedDefs.PostView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getRepostedBy.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
index efae1c0b14f..81d65ae2c2b 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getRepostedBy'
 
 export interface QueryParams {
   /** Reference (AT-URI) of post record */
@@ -25,7 +29,6 @@ export interface OutputSchema {
   cid?: string
   cursor?: string
   repostedBy: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
index c660e995f9f..1dd00af2a37 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getSuggestedFeeds'
 
 export interface QueryParams {
   limit: number
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feeds: AppBskyFeedDefs.GeneratorView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getTimeline.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getTimeline.ts
index f9cd3d702c5..93f5b055b32 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getTimeline.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getTimeline.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.getTimeline'
 
 export interface QueryParams {
   /** Variant 'algorithm' for timeline. Implementation-specific. NOTE: most feed flexibility has been moved to feed generator mechanism. */
@@ -21,7 +25,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.FeedViewPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/like.ts b/packages/pds/src/lexicon/types/app/bsky/feed/like.ts
index 1da9dd940dc..504023db951 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/like.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/like.ts
@@ -2,25 +2,28 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.like'
 
 export interface Record {
+  $type: 'app.bsky.feed.like'
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.like#main' || v.$type === 'app.bsky.feed.like')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.like#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/post.ts b/packages/pds/src/lexicon/types/app/bsky/feed/post.ts
index f9f2827c8d0..1c921bf4331 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/post.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/post.ts
@@ -2,19 +2,24 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as AppBskyEmbedImages from '../embed/images'
-import * as AppBskyEmbedVideo from '../embed/video'
-import * as AppBskyEmbedExternal from '../embed/external'
-import * as AppBskyEmbedRecord from '../embed/record'
-import * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyRichtextFacet from '../richtext/facet.js'
+import type * as AppBskyEmbedImages from '../embed/images.js'
+import type * as AppBskyEmbedVideo from '../embed/video.js'
+import type * as AppBskyEmbedExternal from '../embed/external.js'
+import type * as AppBskyEmbedRecord from '../embed/record.js'
+import type * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.post'
 
 export interface Record {
+  $type: 'app.bsky.feed.post'
   /** The primary post content. May be an empty string, if there are embeds. */
   text: string
   /** DEPRECATED: replaced by app.bsky.richtext.facet. */
@@ -23,17 +28,15 @@ export interface Record {
   facets?: AppBskyRichtextFacet.Main[]
   reply?: ReplyRef
   embed?:
-    | AppBskyEmbedImages.Main
-    | AppBskyEmbedVideo.Main
-    | AppBskyEmbedExternal.Main
-    | AppBskyEmbedRecord.Main
-    | AppBskyEmbedRecordWithMedia.Main
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyEmbedImages.Main>
+    | $Typed<AppBskyEmbedVideo.Main>
+    | $Typed<AppBskyEmbedExternal.Main>
+    | $Typed<AppBskyEmbedRecord.Main>
+    | $Typed<AppBskyEmbedRecordWithMedia.Main>
+    | { $type: string }
   /** Indicates human language of post primary text content. */
   langs?: string[]
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   /** Additional hashtags, in addition to any included in post text and facets. */
   tags?: string[]
   /** Client-declared timestamp when this post was originally created. */
@@ -41,68 +44,64 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.post#main' || v.$type === 'app.bsky.feed.post')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
 
 export interface ReplyRef {
+  $type?: 'app.bsky.feed.post#replyRef'
   root: ComAtprotoRepoStrongRef.Main
   parent: ComAtprotoRepoStrongRef.Main
-  [k: string]: unknown
 }
 
-export function isReplyRef(v: unknown): v is ReplyRef {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.post#replyRef'
-  )
+const hashReplyRef = 'replyRef'
+
+export function isReplyRef<V>(v: V) {
+  return is$typed(v, id, hashReplyRef)
 }
 
-export function validateReplyRef(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#replyRef', v)
+export function validateReplyRef<V>(v: V) {
+  return validate<ReplyRef & V>(v, id, hashReplyRef)
 }
 
 /** Deprecated: use facets instead. */
 export interface Entity {
+  $type?: 'app.bsky.feed.post#entity'
   index: TextSlice
   /** Expected values are 'mention' and 'link'. */
   type: string
   value: string
-  [k: string]: unknown
 }
 
-export function isEntity(v: unknown): v is Entity {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.post#entity'
-  )
+const hashEntity = 'entity'
+
+export function isEntity<V>(v: V) {
+  return is$typed(v, id, hashEntity)
 }
 
-export function validateEntity(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#entity', v)
+export function validateEntity<V>(v: V) {
+  return validate<Entity & V>(v, id, hashEntity)
 }
 
 /** Deprecated. Use app.bsky.richtext instead -- A text segment. Start is inclusive, end is exclusive. Indices are for utf16-encoded strings. */
 export interface TextSlice {
+  $type?: 'app.bsky.feed.post#textSlice'
   start: number
   end: number
-  [k: string]: unknown
 }
 
-export function isTextSlice(v: unknown): v is TextSlice {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.post#textSlice'
-  )
+const hashTextSlice = 'textSlice'
+
+export function isTextSlice<V>(v: V) {
+  return is$typed(v, id, hashTextSlice)
 }
 
-export function validateTextSlice(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#textSlice', v)
+export function validateTextSlice<V>(v: V) {
+  return validate<TextSlice & V>(v, id, hashTextSlice)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/postgate.ts b/packages/pds/src/lexicon/types/app/bsky/feed/postgate.ts
index da5d6b175b2..3bb6fa929ef 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/postgate.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/postgate.ts
@@ -2,47 +2,47 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.postgate'
 
 export interface Record {
+  $type: 'app.bsky.feed.postgate'
   createdAt: string
   /** Reference (AT-URI) to the post record. */
   post: string
   /** List of AT-URIs embedding this post that the author has detached from. */
   detachedEmbeddingUris?: string[]
   /** List of rules defining who can embed this post. If value is an empty array or is undefined, no particular rules apply and anyone can embed. */
-  embeddingRules?: (DisableRule | { $type: string; [k: string]: unknown })[]
+  embeddingRules?: ($Typed<DisableRule> | { $type: string })[]
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.postgate#main' ||
-      v.$type === 'app.bsky.feed.postgate')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.postgate#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
 
 /** Disables embedding of this post. */
 export interface DisableRule {
-  [k: string]: unknown
+  $type?: 'app.bsky.feed.postgate#disableRule'
 }
 
-export function isDisableRule(v: unknown): v is DisableRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.postgate#disableRule'
-  )
+const hashDisableRule = 'disableRule'
+
+export function isDisableRule<V>(v: V) {
+  return is$typed(v, id, hashDisableRule)
 }
 
-export function validateDisableRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.postgate#disableRule', v)
+export function validateDisableRule<V>(v: V) {
+  return validate<DisableRule & V>(v, id, hashDisableRule)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/repost.ts b/packages/pds/src/lexicon/types/app/bsky/feed/repost.ts
index 4c836d76e2a..00a74c8b617 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/repost.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/repost.ts
@@ -2,26 +2,28 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.repost'
 
 export interface Record {
+  $type: 'app.bsky.feed.repost'
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.repost#main' ||
-      v.$type === 'app.bsky.feed.repost')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.repost#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/searchPosts.ts b/packages/pds/src/lexicon/types/app/bsky/feed/searchPosts.ts
index 68e0b729b53..1f7a68d6085 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/searchPosts.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/searchPosts.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.searchPosts'
 
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
@@ -42,7 +46,6 @@ export interface OutputSchema {
   /** Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. */
   hitsTotal?: number
   posts: AppBskyFeedDefs.PostView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/sendInteractions.ts b/packages/pds/src/lexicon/types/app/bsky/feed/sendInteractions.ts
index b0280ad8028..e96f1a870f5 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/sendInteractions.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/sendInteractions.ts
@@ -3,22 +3,23 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from './defs'
+import type * as AppBskyFeedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.sendInteractions'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   interactions: AppBskyFeedDefs.Interaction[]
-  [k: string]: unknown
 }
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export interface HandlerInput {
   encoding: 'application/json'
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/threadgate.ts b/packages/pds/src/lexicon/types/app/bsky/feed/threadgate.ts
index 869b8d51d64..e15cda096aa 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/threadgate.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/threadgate.ts
@@ -2,20 +2,25 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.feed.threadgate'
 
 export interface Record {
+  $type: 'app.bsky.feed.threadgate'
   /** Reference (AT-URI) to the post record. */
   post: string
   /** List of rules defining who can reply to this post. If value is an empty array, no one can reply. If value is undefined, anyone can reply. */
   allow?: (
-    | MentionRule
-    | FollowerRule
-    | FollowingRule
-    | ListRule
-    | { $type: string; [k: string]: unknown }
+    | $Typed<MentionRule>
+    | $Typed<FollowerRule>
+    | $Typed<FollowingRule>
+    | $Typed<ListRule>
+    | { $type: string }
   )[]
   createdAt: string
   /** List of hidden reply URIs. */
@@ -23,84 +28,73 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.threadgate#main' ||
-      v.$type === 'app.bsky.feed.threadgate')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
 
 /** Allow replies from actors mentioned in your post. */
 export interface MentionRule {
-  [k: string]: unknown
+  $type?: 'app.bsky.feed.threadgate#mentionRule'
 }
 
-export function isMentionRule(v: unknown): v is MentionRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#mentionRule'
-  )
+const hashMentionRule = 'mentionRule'
+
+export function isMentionRule<V>(v: V) {
+  return is$typed(v, id, hashMentionRule)
 }
 
-export function validateMentionRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#mentionRule', v)
+export function validateMentionRule<V>(v: V) {
+  return validate<MentionRule & V>(v, id, hashMentionRule)
 }
 
 /** Allow replies from actors who follow you. */
 export interface FollowerRule {
-  [k: string]: unknown
+  $type?: 'app.bsky.feed.threadgate#followerRule'
 }
 
-export function isFollowerRule(v: unknown): v is FollowerRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#followerRule'
-  )
+const hashFollowerRule = 'followerRule'
+
+export function isFollowerRule<V>(v: V) {
+  return is$typed(v, id, hashFollowerRule)
 }
 
-export function validateFollowerRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#followerRule', v)
+export function validateFollowerRule<V>(v: V) {
+  return validate<FollowerRule & V>(v, id, hashFollowerRule)
 }
 
 /** Allow replies from actors you follow. */
 export interface FollowingRule {
-  [k: string]: unknown
+  $type?: 'app.bsky.feed.threadgate#followingRule'
 }
 
-export function isFollowingRule(v: unknown): v is FollowingRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#followingRule'
-  )
+const hashFollowingRule = 'followingRule'
+
+export function isFollowingRule<V>(v: V) {
+  return is$typed(v, id, hashFollowingRule)
 }
 
-export function validateFollowingRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#followingRule', v)
+export function validateFollowingRule<V>(v: V) {
+  return validate<FollowingRule & V>(v, id, hashFollowingRule)
 }
 
 /** Allow replies from actors on a list. */
 export interface ListRule {
+  $type?: 'app.bsky.feed.threadgate#listRule'
   list: string
-  [k: string]: unknown
 }
 
-export function isListRule(v: unknown): v is ListRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#listRule'
-  )
+const hashListRule = 'listRule'
+
+export function isListRule<V>(v: V) {
+  return is$typed(v, id, hashListRule)
 }
 
-export function validateListRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#listRule', v)
+export function validateListRule<V>(v: V) {
+  return validate<ListRule & V>(v, id, hashListRule)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/block.ts b/packages/pds/src/lexicon/types/app/bsky/graph/block.ts
index b7f19f126b7..25ff38bd60d 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/block.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/block.ts
@@ -2,26 +2,28 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.block'
 
 export interface Record {
+  $type: 'app.bsky.graph.block'
   /** DID of the account to be blocked. */
   subject: string
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.block#main' ||
-      v.$type === 'app.bsky.graph.block')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.block#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/defs.ts b/packages/pds/src/lexicon/types/app/bsky/graph/defs.ts
index 63ecf7e00c0..bd9a4d6c07e 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/defs.ts
@@ -2,15 +2,20 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as AppBskyFeedDefs from '../feed/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+import type * as AppBskyRichtextFacet from '../richtext/facet.js'
+import type * as AppBskyFeedDefs from '../feed/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.defs'
 
 export interface ListViewBasic {
+  $type?: 'app.bsky.graph.defs#listViewBasic'
   uri: string
   cid: string
   name: string
@@ -20,22 +25,20 @@ export interface ListViewBasic {
   labels?: ComAtprotoLabelDefs.Label[]
   viewer?: ListViewerState
   indexedAt?: string
-  [k: string]: unknown
 }
 
-export function isListViewBasic(v: unknown): v is ListViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listViewBasic'
-  )
+const hashListViewBasic = 'listViewBasic'
+
+export function isListViewBasic<V>(v: V) {
+  return is$typed(v, id, hashListViewBasic)
 }
 
-export function validateListViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listViewBasic', v)
+export function validateListViewBasic<V>(v: V) {
+  return validate<ListViewBasic & V>(v, id, hashListViewBasic)
 }
 
 export interface ListView {
+  $type?: 'app.bsky.graph.defs#listView'
   uri: string
   cid: string
   creator: AppBskyActorDefs.ProfileView
@@ -48,43 +51,39 @@ export interface ListView {
   labels?: ComAtprotoLabelDefs.Label[]
   viewer?: ListViewerState
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isListView(v: unknown): v is ListView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listView'
-  )
+const hashListView = 'listView'
+
+export function isListView<V>(v: V) {
+  return is$typed(v, id, hashListView)
 }
 
-export function validateListView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listView', v)
+export function validateListView<V>(v: V) {
+  return validate<ListView & V>(v, id, hashListView)
 }
 
 export interface ListItemView {
+  $type?: 'app.bsky.graph.defs#listItemView'
   uri: string
   subject: AppBskyActorDefs.ProfileView
-  [k: string]: unknown
 }
 
-export function isListItemView(v: unknown): v is ListItemView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listItemView'
-  )
+const hashListItemView = 'listItemView'
+
+export function isListItemView<V>(v: V) {
+  return is$typed(v, id, hashListItemView)
 }
 
-export function validateListItemView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listItemView', v)
+export function validateListItemView<V>(v: V) {
+  return validate<ListItemView & V>(v, id, hashListItemView)
 }
 
 export interface StarterPackView {
+  $type?: 'app.bsky.graph.defs#starterPackView'
   uri: string
   cid: string
-  record: {}
+  record: { [_ in string]: unknown }
   creator: AppBskyActorDefs.ProfileViewBasic
   list?: ListViewBasic
   listItemsSample?: ListItemView[]
@@ -93,44 +92,39 @@ export interface StarterPackView {
   joinedAllTimeCount?: number
   labels?: ComAtprotoLabelDefs.Label[]
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isStarterPackView(v: unknown): v is StarterPackView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#starterPackView'
-  )
+const hashStarterPackView = 'starterPackView'
+
+export function isStarterPackView<V>(v: V) {
+  return is$typed(v, id, hashStarterPackView)
 }
 
-export function validateStarterPackView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#starterPackView', v)
+export function validateStarterPackView<V>(v: V) {
+  return validate<StarterPackView & V>(v, id, hashStarterPackView)
 }
 
 export interface StarterPackViewBasic {
+  $type?: 'app.bsky.graph.defs#starterPackViewBasic'
   uri: string
   cid: string
-  record: {}
+  record: { [_ in string]: unknown }
   creator: AppBskyActorDefs.ProfileViewBasic
   listItemCount?: number
   joinedWeekCount?: number
   joinedAllTimeCount?: number
   labels?: ComAtprotoLabelDefs.Label[]
   indexedAt: string
-  [k: string]: unknown
 }
 
-export function isStarterPackViewBasic(v: unknown): v is StarterPackViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#starterPackViewBasic'
-  )
+const hashStarterPackViewBasic = 'starterPackViewBasic'
+
+export function isStarterPackViewBasic<V>(v: V) {
+  return is$typed(v, id, hashStarterPackViewBasic)
 }
 
-export function validateStarterPackViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#starterPackViewBasic', v)
+export function validateStarterPackViewBasic<V>(v: V) {
+  return validate<StarterPackViewBasic & V>(v, id, hashStarterPackViewBasic)
 }
 
 export type ListPurpose =
@@ -140,67 +134,61 @@ export type ListPurpose =
   | (string & {})
 
 /** A list of actors to apply an aggregate moderation action (mute/block) on. */
-export const MODLIST = 'app.bsky.graph.defs#modlist'
+export const MODLIST = `${id}#modlist`
 /** A list of actors used for curation purposes such as list feeds or interaction gating. */
-export const CURATELIST = 'app.bsky.graph.defs#curatelist'
+export const CURATELIST = `${id}#curatelist`
 /** A list of actors used for only for reference purposes such as within a starter pack. */
-export const REFERENCELIST = 'app.bsky.graph.defs#referencelist'
+export const REFERENCELIST = `${id}#referencelist`
 
 export interface ListViewerState {
+  $type?: 'app.bsky.graph.defs#listViewerState'
   muted?: boolean
   blocked?: string
-  [k: string]: unknown
 }
 
-export function isListViewerState(v: unknown): v is ListViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listViewerState'
-  )
+const hashListViewerState = 'listViewerState'
+
+export function isListViewerState<V>(v: V) {
+  return is$typed(v, id, hashListViewerState)
 }
 
-export function validateListViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listViewerState', v)
+export function validateListViewerState<V>(v: V) {
+  return validate<ListViewerState & V>(v, id, hashListViewerState)
 }
 
 /** indicates that a handle or DID could not be resolved */
 export interface NotFoundActor {
+  $type?: 'app.bsky.graph.defs#notFoundActor'
   actor: string
   notFound: true
-  [k: string]: unknown
 }
 
-export function isNotFoundActor(v: unknown): v is NotFoundActor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#notFoundActor'
-  )
+const hashNotFoundActor = 'notFoundActor'
+
+export function isNotFoundActor<V>(v: V) {
+  return is$typed(v, id, hashNotFoundActor)
 }
 
-export function validateNotFoundActor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#notFoundActor', v)
+export function validateNotFoundActor<V>(v: V) {
+  return validate<NotFoundActor & V>(v, id, hashNotFoundActor)
 }
 
 /** lists the bi-directional graph relationships between one actor (not indicated in the object), and the target actors (the DID included in the object) */
 export interface Relationship {
+  $type?: 'app.bsky.graph.defs#relationship'
   did: string
   /** if the actor follows this DID, this is the AT-URI of the follow record */
   following?: string
   /** if the actor is followed by this DID, contains the AT-URI of the follow record */
   followedBy?: string
-  [k: string]: unknown
 }
 
-export function isRelationship(v: unknown): v is Relationship {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#relationship'
-  )
+const hashRelationship = 'relationship'
+
+export function isRelationship<V>(v: V) {
+  return is$typed(v, id, hashRelationship)
 }
 
-export function validateRelationship(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#relationship', v)
+export function validateRelationship<V>(v: V) {
+  return validate<Relationship & V>(v, id, hashRelationship)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/follow.ts b/packages/pds/src/lexicon/types/app/bsky/graph/follow.ts
index 4b74a58a5df..79478d39135 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/follow.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/follow.ts
@@ -2,25 +2,27 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.follow'
 
 export interface Record {
+  $type: 'app.bsky.graph.follow'
   subject: string
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.follow#main' ||
-      v.$type === 'app.bsky.graph.follow')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.follow#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
index 352c542990f..2e55945485a 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getActorStarterPacks'
 
 export interface QueryParams {
   actor: string
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   starterPacks: AppBskyGraphDefs.StarterPackViewBasic[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getBlocks.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getBlocks.ts
index 1fdd49c6831..dddd7a555a9 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getBlocks.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getBlocks.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getBlocks'
 
 export interface QueryParams {
   limit: number
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   blocks: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getFollowers.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getFollowers.ts
index 1f348e97d20..e631e3313ce 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getFollowers.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getFollowers.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getFollowers'
 
 export interface QueryParams {
   actor: string
@@ -21,7 +25,6 @@ export interface OutputSchema {
   subject: AppBskyActorDefs.ProfileView
   cursor?: string
   followers: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getFollows.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getFollows.ts
index a9664991c88..efd34eaedaa 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getFollows.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getFollows.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getFollows'
 
 export interface QueryParams {
   actor: string
@@ -21,7 +25,6 @@ export interface OutputSchema {
   subject: AppBskyActorDefs.ProfileView
   cursor?: string
   follows: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
index 1f348e97d20..92562abea9a 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getKnownFollowers'
 
 export interface QueryParams {
   actor: string
@@ -21,7 +25,6 @@ export interface OutputSchema {
   subject: AppBskyActorDefs.ProfileView
   cursor?: string
   followers: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getList.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getList.ts
index a8408edd622..eba37cede07 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getList.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getList.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getList'
 
 export interface QueryParams {
   /** Reference (AT-URI) of the list record to hydrate. */
@@ -22,7 +26,6 @@ export interface OutputSchema {
   cursor?: string
   list: AppBskyGraphDefs.ListView
   items: AppBskyGraphDefs.ListItemView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getListBlocks.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getListBlocks.ts
index 728892f4379..0918ecbac30 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getListBlocks.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getListBlocks.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getListBlocks'
 
 export interface QueryParams {
   limit: number
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   lists: AppBskyGraphDefs.ListView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getListMutes.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getListMutes.ts
index 728892f4379..d5ff5158769 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getListMutes.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getListMutes.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getListMutes'
 
 export interface QueryParams {
   limit: number
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   lists: AppBskyGraphDefs.ListView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getLists.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getLists.ts
index 0ed8abc586e..854fc9534f9 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getLists.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getLists.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getLists'
 
 export interface QueryParams {
   /** The account (actor) to enumerate lists from. */
@@ -21,7 +25,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   lists: AppBskyGraphDefs.ListView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getMutes.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getMutes.ts
index 45c7966644e..e1c5615e412 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getMutes.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getMutes.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getMutes'
 
 export interface QueryParams {
   limit: number
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   mutes: AppBskyActorDefs.ProfileView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getRelationships.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getRelationships.ts
index 677c8815d43..adff220f8ed 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getRelationships.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getRelationships.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getRelationships'
 
 export interface QueryParams {
   /** Primary account requesting relationships for. */
@@ -21,11 +25,10 @@ export type InputSchema = undefined
 export interface OutputSchema {
   actor?: string
   relationships: (
-    | AppBskyGraphDefs.Relationship
-    | AppBskyGraphDefs.NotFoundActor
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyGraphDefs.Relationship>
+    | $Typed<AppBskyGraphDefs.NotFoundActor>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPack.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPack.ts
index bbf8a537da0..a7e7e479201 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPack.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPack.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getStarterPack'
 
 export interface QueryParams {
   /** Reference (AT-URI) of the starter pack record. */
@@ -18,7 +22,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   starterPack: AppBskyGraphDefs.StarterPackView
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPacks.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
index 1ea054400b3..9b99308dba9 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getStarterPacks'
 
 export interface QueryParams {
   uris: string[]
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   starterPacks: AppBskyGraphDefs.StarterPackViewBasic[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
index 8736dc71b45..098070d2da7 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.getSuggestedFollowsByActor'
 
 export interface QueryParams {
   actor: string
@@ -21,7 +25,6 @@ export interface OutputSchema {
   isFallback?: boolean
   /** Snowflake for this recommendation, use when submitting recommendation events. */
   recId?: number
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/list.ts b/packages/pds/src/lexicon/types/app/bsky/graph/list.ts
index 91c8ccee5bb..f899e73317a 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/list.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/list.ts
@@ -2,36 +2,36 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyGraphDefs from './defs'
-import * as AppBskyRichtextFacet from '../richtext/facet'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyGraphDefs from './defs.js'
+import type * as AppBskyRichtextFacet from '../richtext/facet.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.list'
 
 export interface Record {
+  $type: 'app.bsky.graph.list'
   purpose: AppBskyGraphDefs.ListPurpose
   /** Display name for list; can not be empty. */
   name: string
   description?: string
   descriptionFacets?: AppBskyRichtextFacet.Main[]
   avatar?: BlobRef
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.list#main' ||
-      v.$type === 'app.bsky.graph.list')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.list#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/listblock.ts b/packages/pds/src/lexicon/types/app/bsky/graph/listblock.ts
index 592778c7a51..05a204fa3b5 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/listblock.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/listblock.ts
@@ -2,26 +2,28 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.listblock'
 
 export interface Record {
+  $type: 'app.bsky.graph.listblock'
   /** Reference (AT-URI) to the mod list record. */
   subject: string
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.listblock#main' ||
-      v.$type === 'app.bsky.graph.listblock')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.listblock#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/listitem.ts b/packages/pds/src/lexicon/types/app/bsky/graph/listitem.ts
index 5e93b34a111..46e0ccbf206 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/listitem.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/listitem.ts
@@ -2,11 +2,16 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.listitem'
 
 export interface Record {
+  $type: 'app.bsky.graph.listitem'
   /** The account which is included on the list. */
   subject: string
   /** Reference (AT-URI) to the list record (app.bsky.graph.list). */
@@ -15,15 +20,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.listitem#main' ||
-      v.$type === 'app.bsky.graph.listitem')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.listitem#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/muteActor.ts b/packages/pds/src/lexicon/types/app/bsky/graph/muteActor.ts
index 7d0057721d6..5b76c3eb88f 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/muteActor.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/muteActor.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.muteActor'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   actor: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/muteActorList.ts b/packages/pds/src/lexicon/types/app/bsky/graph/muteActorList.ts
index 1d80ac0d3db..62be146bdff 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/muteActorList.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/muteActorList.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.muteActorList'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   list: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/muteThread.ts b/packages/pds/src/lexicon/types/app/bsky/graph/muteThread.ts
index 659ced88112..bc9f0c2339d 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/muteThread.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/muteThread.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.muteThread'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   root: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts b/packages/pds/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
index 70bc184bb43..6ffc5517a74 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyGraphDefs from './defs'
+import type * as AppBskyGraphDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.searchStarterPacks'
 
 export interface QueryParams {
   /** Search query string. Syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
@@ -21,7 +25,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   starterPacks: AppBskyGraphDefs.StarterPackViewBasic[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/starterpack.ts b/packages/pds/src/lexicon/types/app/bsky/graph/starterpack.ts
index 0daf8daf688..d7761245080 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/starterpack.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/starterpack.ts
@@ -2,12 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyRichtextFacet from '../richtext/facet'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyRichtextFacet from '../richtext/facet.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.starterpack'
 
 export interface Record {
+  $type: 'app.bsky.graph.starterpack'
   /** Display name for starter pack; can not be empty. */
   name: string
   description?: string
@@ -19,32 +24,27 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.starterpack#main' ||
-      v.$type === 'app.bsky.graph.starterpack')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.starterpack#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
 
 export interface FeedItem {
+  $type?: 'app.bsky.graph.starterpack#feedItem'
   uri: string
-  [k: string]: unknown
 }
 
-export function isFeedItem(v: unknown): v is FeedItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.starterpack#feedItem'
-  )
+const hashFeedItem = 'feedItem'
+
+export function isFeedItem<V>(v: V) {
+  return is$typed(v, id, hashFeedItem)
 }
 
-export function validateFeedItem(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.starterpack#feedItem', v)
+export function validateFeedItem<V>(v: V) {
+  return validate<FeedItem & V>(v, id, hashFeedItem)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActor.ts b/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActor.ts
index 7d0057721d6..91519c3f2b3 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActor.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActor.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.unmuteActor'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   actor: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActorList.ts b/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
index 1d80ac0d3db..00e0959d70d 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.unmuteActorList'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   list: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/unmuteThread.ts b/packages/pds/src/lexicon/types/app/bsky/graph/unmuteThread.ts
index 659ced88112..2465768319e 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/unmuteThread.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/unmuteThread.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.graph.unmuteThread'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   root: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/app/bsky/labeler/defs.ts b/packages/pds/src/lexicon/types/app/bsky/labeler/defs.ts
index e12c7203c57..453b010db5e 100644
--- a/packages/pds/src/lexicon/types/app/bsky/labeler/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/labeler/defs.ts
@@ -2,13 +2,18 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.labeler.defs'
 
 export interface LabelerView {
+  $type?: 'app.bsky.labeler.defs#labelerView'
   uri: string
   cid: string
   creator: AppBskyActorDefs.ProfileView
@@ -16,22 +21,20 @@ export interface LabelerView {
   viewer?: LabelerViewerState
   indexedAt: string
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isLabelerView(v: unknown): v is LabelerView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerView'
-  )
+const hashLabelerView = 'labelerView'
+
+export function isLabelerView<V>(v: V) {
+  return is$typed(v, id, hashLabelerView)
 }
 
-export function validateLabelerView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerView', v)
+export function validateLabelerView<V>(v: V) {
+  return validate<LabelerView & V>(v, id, hashLabelerView)
 }
 
 export interface LabelerViewDetailed {
+  $type?: 'app.bsky.labeler.defs#labelerViewDetailed'
   uri: string
   cid: string
   creator: AppBskyActorDefs.ProfileView
@@ -40,54 +43,47 @@ export interface LabelerViewDetailed {
   viewer?: LabelerViewerState
   indexedAt: string
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isLabelerViewDetailed(v: unknown): v is LabelerViewDetailed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerViewDetailed'
-  )
+const hashLabelerViewDetailed = 'labelerViewDetailed'
+
+export function isLabelerViewDetailed<V>(v: V) {
+  return is$typed(v, id, hashLabelerViewDetailed)
 }
 
-export function validateLabelerViewDetailed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerViewDetailed', v)
+export function validateLabelerViewDetailed<V>(v: V) {
+  return validate<LabelerViewDetailed & V>(v, id, hashLabelerViewDetailed)
 }
 
 export interface LabelerViewerState {
+  $type?: 'app.bsky.labeler.defs#labelerViewerState'
   like?: string
-  [k: string]: unknown
 }
 
-export function isLabelerViewerState(v: unknown): v is LabelerViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerViewerState'
-  )
+const hashLabelerViewerState = 'labelerViewerState'
+
+export function isLabelerViewerState<V>(v: V) {
+  return is$typed(v, id, hashLabelerViewerState)
 }
 
-export function validateLabelerViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerViewerState', v)
+export function validateLabelerViewerState<V>(v: V) {
+  return validate<LabelerViewerState & V>(v, id, hashLabelerViewerState)
 }
 
 export interface LabelerPolicies {
+  $type?: 'app.bsky.labeler.defs#labelerPolicies'
   /** The label values which this labeler publishes. May include global or custom labels. */
   labelValues: ComAtprotoLabelDefs.LabelValue[]
   /** Label values created by this labeler and scoped exclusively to it. Labels defined here will override global label definitions for this labeler. */
   labelValueDefinitions?: ComAtprotoLabelDefs.LabelValueDefinition[]
-  [k: string]: unknown
 }
 
-export function isLabelerPolicies(v: unknown): v is LabelerPolicies {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerPolicies'
-  )
+const hashLabelerPolicies = 'labelerPolicies'
+
+export function isLabelerPolicies<V>(v: V) {
+  return is$typed(v, id, hashLabelerPolicies)
 }
 
-export function validateLabelerPolicies(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerPolicies', v)
+export function validateLabelerPolicies<V>(v: V) {
+  return validate<LabelerPolicies & V>(v, id, hashLabelerPolicies)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/labeler/getServices.ts b/packages/pds/src/lexicon/types/app/bsky/labeler/getServices.ts
index e1d318b6177..edee111a234 100644
--- a/packages/pds/src/lexicon/types/app/bsky/labeler/getServices.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/labeler/getServices.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyLabelerDefs from './defs'
+import type * as AppBskyLabelerDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.labeler.getServices'
 
 export interface QueryParams {
   dids: string[]
@@ -18,11 +22,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   views: (
-    | AppBskyLabelerDefs.LabelerView
-    | AppBskyLabelerDefs.LabelerViewDetailed
-    | { $type: string; [k: string]: unknown }
+    | $Typed<AppBskyLabelerDefs.LabelerView>
+    | $Typed<AppBskyLabelerDefs.LabelerViewDetailed>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/labeler/service.ts b/packages/pds/src/lexicon/types/app/bsky/labeler/service.ts
index a044b8699b6..368f71e53bc 100644
--- a/packages/pds/src/lexicon/types/app/bsky/labeler/service.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/labeler/service.ts
@@ -2,30 +2,30 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyLabelerDefs from './defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyLabelerDefs from './defs.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.labeler.service'
 
 export interface Record {
+  $type: 'app.bsky.labeler.service'
   policies: AppBskyLabelerDefs.LabelerPolicies
-  labels?:
-    | ComAtprotoLabelDefs.SelfLabels
-    | { $type: string; [k: string]: unknown }
+  labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.labeler.service#main' ||
-      v.$type === 'app.bsky.labeler.service')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.service#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/notification/getUnreadCount.ts b/packages/pds/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
index d2cff779da4..835ea895332 100644
--- a/packages/pds/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.notification.getUnreadCount'
+
 export interface QueryParams {
   priority?: boolean
   seenAt?: string
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   count: number
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/notification/listNotifications.ts b/packages/pds/src/lexicon/types/app/bsky/notification/listNotifications.ts
index 69d05288acb..de01a6b6b79 100644
--- a/packages/pds/src/lexicon/types/app/bsky/notification/listNotifications.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/notification/listNotifications.ts
@@ -3,12 +3,16 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyActorDefs from '../actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import type * as AppBskyActorDefs from '../actor/defs.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.notification.listNotifications'
 
 export interface QueryParams {
   /** Notification reasons to include in response. */
@@ -26,7 +30,6 @@ export interface OutputSchema {
   notifications: Notification[]
   priority?: boolean
   seenAt?: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -56,6 +59,7 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Notification {
+  $type?: 'app.bsky.notification.listNotifications#notification'
   uri: string
   cid: string
   author: AppBskyActorDefs.ProfileView
@@ -70,24 +74,18 @@ export interface Notification {
     | 'starterpack-joined'
     | (string & {})
   reasonSubject?: string
-  record: {}
+  record: { [_ in string]: unknown }
   isRead: boolean
   indexedAt: string
   labels?: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isNotification(v: unknown): v is Notification {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.notification.listNotifications#notification'
-  )
+const hashNotification = 'notification'
+
+export function isNotification<V>(v: V) {
+  return is$typed(v, id, hashNotification)
 }
 
-export function validateNotification(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'app.bsky.notification.listNotifications#notification',
-    v,
-  )
+export function validateNotification<V>(v: V) {
+  return validate<Notification & V>(v, id, hashNotification)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/notification/putPreferences.ts b/packages/pds/src/lexicon/types/app/bsky/notification/putPreferences.ts
index 2271b658cb2..616ed6ed417 100644
--- a/packages/pds/src/lexicon/types/app/bsky/notification/putPreferences.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/notification/putPreferences.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.notification.putPreferences'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   priority: boolean
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/app/bsky/notification/registerPush.ts b/packages/pds/src/lexicon/types/app/bsky/notification/registerPush.ts
index c4ca7104764..028b564401e 100644
--- a/packages/pds/src/lexicon/types/app/bsky/notification/registerPush.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/notification/registerPush.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.notification.registerPush'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -15,7 +19,6 @@ export interface InputSchema {
   token: string
   platform: 'ios' | 'android' | 'web' | (string & {})
   appId: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/app/bsky/notification/updateSeen.ts b/packages/pds/src/lexicon/types/app/bsky/notification/updateSeen.ts
index 690e68dbeeb..4269de0642e 100644
--- a/packages/pds/src/lexicon/types/app/bsky/notification/updateSeen.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/notification/updateSeen.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.notification.updateSeen'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   seenAt: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/app/bsky/richtext/facet.ts b/packages/pds/src/lexicon/types/app/bsky/richtext/facet.ts
index 139b5382caf..8085d33c8ee 100644
--- a/packages/pds/src/lexicon/types/app/bsky/richtext/facet.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/richtext/facet.ts
@@ -2,97 +2,92 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.richtext.facet'
 
 /** Annotation of a sub-string within rich text. */
 export interface Main {
+  $type?: 'app.bsky.richtext.facet'
   index: ByteSlice
-  features: (Mention | Link | Tag | { $type: string; [k: string]: unknown })[]
-  [k: string]: unknown
+  features: ($Typed<Mention> | $Typed<Link> | $Typed<Tag> | { $type: string })[]
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.richtext.facet#main' ||
-      v.$type === 'app.bsky.richtext.facet')
-  )
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#main', v)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
 
 /** Facet feature for mention of another account. The text is usually a handle, including a '@' prefix, but the facet reference is a DID. */
 export interface Mention {
+  $type?: 'app.bsky.richtext.facet#mention'
   did: string
-  [k: string]: unknown
 }
 
-export function isMention(v: unknown): v is Mention {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#mention'
-  )
+const hashMention = 'mention'
+
+export function isMention<V>(v: V) {
+  return is$typed(v, id, hashMention)
 }
 
-export function validateMention(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#mention', v)
+export function validateMention<V>(v: V) {
+  return validate<Mention & V>(v, id, hashMention)
 }
 
 /** Facet feature for a URL. The text URL may have been simplified or truncated, but the facet reference should be a complete URL. */
 export interface Link {
+  $type?: 'app.bsky.richtext.facet#link'
   uri: string
-  [k: string]: unknown
 }
 
-export function isLink(v: unknown): v is Link {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#link'
-  )
+const hashLink = 'link'
+
+export function isLink<V>(v: V) {
+  return is$typed(v, id, hashLink)
 }
 
-export function validateLink(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#link', v)
+export function validateLink<V>(v: V) {
+  return validate<Link & V>(v, id, hashLink)
 }
 
 /** Facet feature for a hashtag. The text usually includes a '#' prefix, but the facet reference should not (except in the case of 'double hash tags'). */
 export interface Tag {
+  $type?: 'app.bsky.richtext.facet#tag'
   tag: string
-  [k: string]: unknown
 }
 
-export function isTag(v: unknown): v is Tag {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.richtext.facet#tag'
-  )
+const hashTag = 'tag'
+
+export function isTag<V>(v: V) {
+  return is$typed(v, id, hashTag)
 }
 
-export function validateTag(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#tag', v)
+export function validateTag<V>(v: V) {
+  return validate<Tag & V>(v, id, hashTag)
 }
 
 /** Specifies the sub-string range a facet feature applies to. Start index is inclusive, end index is exclusive. Indices are zero-indexed, counting bytes of the UTF-8 encoded text. NOTE: some languages, like Javascript, use UTF-16 or Unicode codepoints for string slice indexing; in these languages, convert to byte arrays before working with facets. */
 export interface ByteSlice {
+  $type?: 'app.bsky.richtext.facet#byteSlice'
   byteStart: number
   byteEnd: number
-  [k: string]: unknown
 }
 
-export function isByteSlice(v: unknown): v is ByteSlice {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#byteSlice'
-  )
+const hashByteSlice = 'byteSlice'
+
+export function isByteSlice<V>(v: V) {
+  return is$typed(v, id, hashByteSlice)
 }
 
-export function validateByteSlice(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#byteSlice', v)
+export function validateByteSlice<V>(v: V) {
+  return validate<ByteSlice & V>(v, id, hashByteSlice)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/defs.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/defs.ts
index f25e35853c5..6bde35e5709 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/defs.ts
@@ -2,84 +2,77 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.defs'
 
 export interface SkeletonSearchPost {
+  $type?: 'app.bsky.unspecced.defs#skeletonSearchPost'
   uri: string
-  [k: string]: unknown
 }
 
-export function isSkeletonSearchPost(v: unknown): v is SkeletonSearchPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#skeletonSearchPost'
-  )
+const hashSkeletonSearchPost = 'skeletonSearchPost'
+
+export function isSkeletonSearchPost<V>(v: V) {
+  return is$typed(v, id, hashSkeletonSearchPost)
 }
 
-export function validateSkeletonSearchPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.unspecced.defs#skeletonSearchPost', v)
+export function validateSkeletonSearchPost<V>(v: V) {
+  return validate<SkeletonSearchPost & V>(v, id, hashSkeletonSearchPost)
 }
 
 export interface SkeletonSearchActor {
+  $type?: 'app.bsky.unspecced.defs#skeletonSearchActor'
   did: string
-  [k: string]: unknown
 }
 
-export function isSkeletonSearchActor(v: unknown): v is SkeletonSearchActor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#skeletonSearchActor'
-  )
+const hashSkeletonSearchActor = 'skeletonSearchActor'
+
+export function isSkeletonSearchActor<V>(v: V) {
+  return is$typed(v, id, hashSkeletonSearchActor)
 }
 
-export function validateSkeletonSearchActor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.unspecced.defs#skeletonSearchActor', v)
+export function validateSkeletonSearchActor<V>(v: V) {
+  return validate<SkeletonSearchActor & V>(v, id, hashSkeletonSearchActor)
 }
 
 export interface SkeletonSearchStarterPack {
+  $type?: 'app.bsky.unspecced.defs#skeletonSearchStarterPack'
   uri: string
-  [k: string]: unknown
 }
 
-export function isSkeletonSearchStarterPack(
-  v: unknown,
-): v is SkeletonSearchStarterPack {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#skeletonSearchStarterPack'
-  )
+const hashSkeletonSearchStarterPack = 'skeletonSearchStarterPack'
+
+export function isSkeletonSearchStarterPack<V>(v: V) {
+  return is$typed(v, id, hashSkeletonSearchStarterPack)
 }
 
-export function validateSkeletonSearchStarterPack(
-  v: unknown,
-): ValidationResult {
-  return lexicons.validate(
-    'app.bsky.unspecced.defs#skeletonSearchStarterPack',
+export function validateSkeletonSearchStarterPack<V>(v: V) {
+  return validate<SkeletonSearchStarterPack & V>(
     v,
+    id,
+    hashSkeletonSearchStarterPack,
   )
 }
 
 export interface TrendingTopic {
+  $type?: 'app.bsky.unspecced.defs#trendingTopic'
   topic: string
   displayName?: string
   description?: string
   link: string
-  [k: string]: unknown
 }
 
-export function isTrendingTopic(v: unknown): v is TrendingTopic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#trendingTopic'
-  )
+const hashTrendingTopic = 'trendingTopic'
+
+export function isTrendingTopic<V>(v: V) {
+  return is$typed(v, id, hashTrendingTopic)
 }
 
-export function validateTrendingTopic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.unspecced.defs#trendingTopic', v)
+export function validateTrendingTopic<V>(v: V) {
+  return validate<TrendingTopic & V>(v, id, hashTrendingTopic)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/getConfig.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/getConfig.ts
index e922e1f10df..c4ebde0c7bf 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/getConfig.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/getConfig.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.getConfig'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
 
 export interface OutputSchema {
   checkEmailConfirmed?: boolean
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
index 56ecba098be..ad662f6a41b 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from '../feed/defs'
+import type * as AppBskyFeedDefs from '../feed/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.getPopularFeedGenerators'
 
 export interface QueryParams {
   limit: number
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feeds: AppBskyFeedDefs.GeneratorView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
index 4b68e768e20..c6d9a6963c4 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyUnspeccedDefs from './defs'
+import type * as AppBskyUnspeccedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.getSuggestionsSkeleton'
 
 export interface QueryParams {
   /** DID of the account making the request (not included for public/unauthenticated queries). Used to boost followed accounts in ranking. */
@@ -27,7 +31,6 @@ export interface OutputSchema {
   relativeToDid?: string
   /** Snowflake for this recommendation, use when submitting recommendation events. */
   recId?: number
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
index 7febcd64994..bb0b8acd2b1 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.getTaggedSuggestions'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
 
 export interface OutputSchema {
   suggestions: Suggestion[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -44,23 +47,18 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Suggestion {
+  $type?: 'app.bsky.unspecced.getTaggedSuggestions#suggestion'
   tag: string
   subjectType: 'actor' | 'feed' | (string & {})
   subject: string
-  [k: string]: unknown
 }
 
-export function isSuggestion(v: unknown): v is Suggestion {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.getTaggedSuggestions#suggestion'
-  )
+const hashSuggestion = 'suggestion'
+
+export function isSuggestion<V>(v: V) {
+  return is$typed(v, id, hashSuggestion)
 }
 
-export function validateSuggestion(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'app.bsky.unspecced.getTaggedSuggestions#suggestion',
-    v,
-  )
+export function validateSuggestion<V>(v: V) {
+  return validate<Suggestion & V>(v, id, hashSuggestion)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
index 469ecd63b79..6ffd18ce20d 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyUnspeccedDefs from './defs'
+import type * as AppBskyUnspeccedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.getTrendingTopics'
 
 export interface QueryParams {
   /** DID of the account making the request (not included for public/unauthenticated queries). Used to boost followed accounts in ranking. */
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   topics: AppBskyUnspeccedDefs.TrendingTopic[]
   suggested: AppBskyUnspeccedDefs.TrendingTopic[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
index 0cb2c5e0b9c..8972f20da04 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyUnspeccedDefs from './defs'
+import type * as AppBskyUnspeccedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.searchActorsSkeleton'
 
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. For typeahead search, only simple term match is supported, not full syntax. */
@@ -28,7 +32,6 @@ export interface OutputSchema {
   /** Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. */
   hitsTotal?: number
   actors: AppBskyUnspeccedDefs.SkeletonSearchActor[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
index 00318176398..6e116ab78ba 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyUnspeccedDefs from './defs'
+import type * as AppBskyUnspeccedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.searchPostsSkeleton'
 
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
@@ -44,7 +48,6 @@ export interface OutputSchema {
   /** Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. */
   hitsTotal?: number
   posts: AppBskyUnspeccedDefs.SkeletonSearchPost[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
index d488cb43fed..05f18e7cc2b 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyUnspeccedDefs from './defs'
+import type * as AppBskyUnspeccedDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.unspecced.searchStarterPacksSkeleton'
 
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
@@ -26,7 +30,6 @@ export interface OutputSchema {
   /** Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. */
   hitsTotal?: number
   starterPacks: AppBskyUnspeccedDefs.SkeletonSearchStarterPack[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/video/defs.ts b/packages/pds/src/lexicon/types/app/bsky/video/defs.ts
index 12f4d674794..15079613e68 100644
--- a/packages/pds/src/lexicon/types/app/bsky/video/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/video/defs.ts
@@ -2,11 +2,16 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.video.defs'
 
 export interface JobStatus {
+  $type?: 'app.bsky.video.defs#jobStatus'
   jobId: string
   did: string
   /** The state of the video processing job. All values not listed as a known value indicate that the job is in process. */
@@ -16,17 +21,14 @@ export interface JobStatus {
   blob?: BlobRef
   error?: string
   message?: string
-  [k: string]: unknown
 }
 
-export function isJobStatus(v: unknown): v is JobStatus {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.video.defs#jobStatus'
-  )
+const hashJobStatus = 'jobStatus'
+
+export function isJobStatus<V>(v: V) {
+  return is$typed(v, id, hashJobStatus)
 }
 
-export function validateJobStatus(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.video.defs#jobStatus', v)
+export function validateJobStatus<V>(v: V) {
+  return validate<JobStatus & V>(v, id, hashJobStatus)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/video/getJobStatus.ts b/packages/pds/src/lexicon/types/app/bsky/video/getJobStatus.ts
index 846dbf5e0b5..8add5896050 100644
--- a/packages/pds/src/lexicon/types/app/bsky/video/getJobStatus.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/video/getJobStatus.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyVideoDefs from './defs'
+import type * as AppBskyVideoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.video.getJobStatus'
 
 export interface QueryParams {
   jobId: string
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   jobStatus: AppBskyVideoDefs.JobStatus
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/video/getUploadLimits.ts b/packages/pds/src/lexicon/types/app/bsky/video/getUploadLimits.ts
index d1930430c9d..70069eaf71e 100644
--- a/packages/pds/src/lexicon/types/app/bsky/video/getUploadLimits.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/video/getUploadLimits.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.video.getUploadLimits'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -18,7 +22,6 @@ export interface OutputSchema {
   remainingDailyBytes?: number
   message?: string
   error?: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/video/uploadVideo.ts b/packages/pds/src/lexicon/types/app/bsky/video/uploadVideo.ts
index 99291559507..576c84967a5 100644
--- a/packages/pds/src/lexicon/types/app/bsky/video/uploadVideo.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/video/uploadVideo.ts
@@ -2,13 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import stream from 'stream'
+import stream from 'node:stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as AppBskyVideoDefs from './defs'
+import type * as AppBskyVideoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.video.uploadVideo'
 
 export interface QueryParams {}
 
@@ -16,7 +20,6 @@ export type InputSchema = string | Uint8Array | Blob
 
 export interface OutputSchema {
   jobStatus: AppBskyVideoDefs.JobStatus
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/chat/bsky/actor/declaration.ts b/packages/pds/src/lexicon/types/chat/bsky/actor/declaration.ts
index b837351c1e1..b153d13a088 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/actor/declaration.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/actor/declaration.ts
@@ -2,24 +2,26 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.actor.declaration'
 
 export interface Record {
+  $type: 'chat.bsky.actor.declaration'
   allowIncoming: 'all' | 'none' | 'following' | (string & {})
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'chat.bsky.actor.declaration#main' ||
-      v.$type === 'chat.bsky.actor.declaration')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.actor.declaration#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/pds/src/lexicon/types/chat/bsky/actor/defs.ts b/packages/pds/src/lexicon/types/chat/bsky/actor/defs.ts
index 8a05d480784..031c1d1a87c 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/actor/defs.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/actor/defs.ts
@@ -2,13 +2,18 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../../../app/bsky/actor/defs.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.actor.defs'
 
 export interface ProfileViewBasic {
+  $type?: 'chat.bsky.actor.defs#profileViewBasic'
   did: string
   handle: string
   displayName?: string
@@ -18,17 +23,14 @@ export interface ProfileViewBasic {
   labels?: ComAtprotoLabelDefs.Label[]
   /** Set to true when the actor cannot actively participate in converations */
   chatDisabled?: boolean
-  [k: string]: unknown
 }
 
-export function isProfileViewBasic(v: unknown): v is ProfileViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.actor.defs#profileViewBasic'
-  )
+const hashProfileViewBasic = 'profileViewBasic'
+
+export function isProfileViewBasic<V>(v: V) {
+  return is$typed(v, id, hashProfileViewBasic)
 }
 
-export function validateProfileViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.actor.defs#profileViewBasic', v)
+export function validateProfileViewBasic<V>(v: V) {
+  return validate<ProfileViewBasic & V>(v, id, hashProfileViewBasic)
 }
diff --git a/packages/pds/src/lexicon/types/chat/bsky/actor/deleteAccount.ts b/packages/pds/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
index 1ae84f6c7cc..bfad6d56da6 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
@@ -3,18 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.actor.deleteAccount'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export type HandlerInput = undefined
 
diff --git a/packages/pds/src/lexicon/types/chat/bsky/actor/exportAccountData.ts b/packages/pds/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
index 363a8c68b97..e97a0ede3ef 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
@@ -2,13 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import stream from 'stream'
+import stream from 'node:stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.actor.exportAccountData'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/defs.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/defs.ts
index b2452410be2..4d458fb798e 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/defs.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/defs.ts
@@ -2,215 +2,193 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyRichtextFacet from '../../../app/bsky/richtext/facet'
-import * as AppBskyEmbedRecord from '../../../app/bsky/embed/record'
-import * as ChatBskyActorDefs from '../actor/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyRichtextFacet from '../../../app/bsky/richtext/facet.js'
+import type * as AppBskyEmbedRecord from '../../../app/bsky/embed/record.js'
+import type * as ChatBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.defs'
 
 export interface MessageRef {
+  $type?: 'chat.bsky.convo.defs#messageRef'
   did: string
   convoId: string
   messageId: string
-  [k: string]: unknown
 }
 
-export function isMessageRef(v: unknown): v is MessageRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageRef'
-  )
+const hashMessageRef = 'messageRef'
+
+export function isMessageRef<V>(v: V) {
+  return is$typed(v, id, hashMessageRef)
 }
 
-export function validateMessageRef(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageRef', v)
+export function validateMessageRef<V>(v: V) {
+  return validate<MessageRef & V>(v, id, hashMessageRef)
 }
 
 export interface MessageInput {
+  $type?: 'chat.bsky.convo.defs#messageInput'
   text: string
   /** Annotations of text (mentions, URLs, hashtags, etc) */
   facets?: AppBskyRichtextFacet.Main[]
-  embed?: AppBskyEmbedRecord.Main | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+  embed?: $Typed<AppBskyEmbedRecord.Main> | { $type: string }
 }
 
-export function isMessageInput(v: unknown): v is MessageInput {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageInput'
-  )
+const hashMessageInput = 'messageInput'
+
+export function isMessageInput<V>(v: V) {
+  return is$typed(v, id, hashMessageInput)
 }
 
-export function validateMessageInput(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageInput', v)
+export function validateMessageInput<V>(v: V) {
+  return validate<MessageInput & V>(v, id, hashMessageInput)
 }
 
 export interface MessageView {
+  $type?: 'chat.bsky.convo.defs#messageView'
   id: string
   rev: string
   text: string
   /** Annotations of text (mentions, URLs, hashtags, etc) */
   facets?: AppBskyRichtextFacet.Main[]
-  embed?: AppBskyEmbedRecord.View | { $type: string; [k: string]: unknown }
+  embed?: $Typed<AppBskyEmbedRecord.View> | { $type: string }
   sender: MessageViewSender
   sentAt: string
-  [k: string]: unknown
 }
 
-export function isMessageView(v: unknown): v is MessageView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageView'
-  )
+const hashMessageView = 'messageView'
+
+export function isMessageView<V>(v: V) {
+  return is$typed(v, id, hashMessageView)
 }
 
-export function validateMessageView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageView', v)
+export function validateMessageView<V>(v: V) {
+  return validate<MessageView & V>(v, id, hashMessageView)
 }
 
 export interface DeletedMessageView {
+  $type?: 'chat.bsky.convo.defs#deletedMessageView'
   id: string
   rev: string
   sender: MessageViewSender
   sentAt: string
-  [k: string]: unknown
 }
 
-export function isDeletedMessageView(v: unknown): v is DeletedMessageView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#deletedMessageView'
-  )
+const hashDeletedMessageView = 'deletedMessageView'
+
+export function isDeletedMessageView<V>(v: V) {
+  return is$typed(v, id, hashDeletedMessageView)
 }
 
-export function validateDeletedMessageView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#deletedMessageView', v)
+export function validateDeletedMessageView<V>(v: V) {
+  return validate<DeletedMessageView & V>(v, id, hashDeletedMessageView)
 }
 
 export interface MessageViewSender {
+  $type?: 'chat.bsky.convo.defs#messageViewSender'
   did: string
-  [k: string]: unknown
 }
 
-export function isMessageViewSender(v: unknown): v is MessageViewSender {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageViewSender'
-  )
+const hashMessageViewSender = 'messageViewSender'
+
+export function isMessageViewSender<V>(v: V) {
+  return is$typed(v, id, hashMessageViewSender)
 }
 
-export function validateMessageViewSender(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageViewSender', v)
+export function validateMessageViewSender<V>(v: V) {
+  return validate<MessageViewSender & V>(v, id, hashMessageViewSender)
 }
 
 export interface ConvoView {
+  $type?: 'chat.bsky.convo.defs#convoView'
   id: string
   rev: string
   members: ChatBskyActorDefs.ProfileViewBasic[]
   lastMessage?:
-    | MessageView
-    | DeletedMessageView
-    | { $type: string; [k: string]: unknown }
+    | $Typed<MessageView>
+    | $Typed<DeletedMessageView>
+    | { $type: string }
   muted: boolean
   opened?: boolean
   unreadCount: number
-  [k: string]: unknown
 }
 
-export function isConvoView(v: unknown): v is ConvoView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#convoView'
-  )
+const hashConvoView = 'convoView'
+
+export function isConvoView<V>(v: V) {
+  return is$typed(v, id, hashConvoView)
 }
 
-export function validateConvoView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#convoView', v)
+export function validateConvoView<V>(v: V) {
+  return validate<ConvoView & V>(v, id, hashConvoView)
 }
 
 export interface LogBeginConvo {
+  $type?: 'chat.bsky.convo.defs#logBeginConvo'
   rev: string
   convoId: string
-  [k: string]: unknown
 }
 
-export function isLogBeginConvo(v: unknown): v is LogBeginConvo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logBeginConvo'
-  )
+const hashLogBeginConvo = 'logBeginConvo'
+
+export function isLogBeginConvo<V>(v: V) {
+  return is$typed(v, id, hashLogBeginConvo)
 }
 
-export function validateLogBeginConvo(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logBeginConvo', v)
+export function validateLogBeginConvo<V>(v: V) {
+  return validate<LogBeginConvo & V>(v, id, hashLogBeginConvo)
 }
 
 export interface LogLeaveConvo {
+  $type?: 'chat.bsky.convo.defs#logLeaveConvo'
   rev: string
   convoId: string
-  [k: string]: unknown
 }
 
-export function isLogLeaveConvo(v: unknown): v is LogLeaveConvo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logLeaveConvo'
-  )
+const hashLogLeaveConvo = 'logLeaveConvo'
+
+export function isLogLeaveConvo<V>(v: V) {
+  return is$typed(v, id, hashLogLeaveConvo)
 }
 
-export function validateLogLeaveConvo(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logLeaveConvo', v)
+export function validateLogLeaveConvo<V>(v: V) {
+  return validate<LogLeaveConvo & V>(v, id, hashLogLeaveConvo)
 }
 
 export interface LogCreateMessage {
+  $type?: 'chat.bsky.convo.defs#logCreateMessage'
   rev: string
   convoId: string
-  message:
-    | MessageView
-    | DeletedMessageView
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+  message: $Typed<MessageView> | $Typed<DeletedMessageView> | { $type: string }
 }
 
-export function isLogCreateMessage(v: unknown): v is LogCreateMessage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logCreateMessage'
-  )
+const hashLogCreateMessage = 'logCreateMessage'
+
+export function isLogCreateMessage<V>(v: V) {
+  return is$typed(v, id, hashLogCreateMessage)
 }
 
-export function validateLogCreateMessage(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logCreateMessage', v)
+export function validateLogCreateMessage<V>(v: V) {
+  return validate<LogCreateMessage & V>(v, id, hashLogCreateMessage)
 }
 
 export interface LogDeleteMessage {
+  $type?: 'chat.bsky.convo.defs#logDeleteMessage'
   rev: string
   convoId: string
-  message:
-    | MessageView
-    | DeletedMessageView
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+  message: $Typed<MessageView> | $Typed<DeletedMessageView> | { $type: string }
 }
 
-export function isLogDeleteMessage(v: unknown): v is LogDeleteMessage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logDeleteMessage'
-  )
+const hashLogDeleteMessage = 'logDeleteMessage'
+
+export function isLogDeleteMessage<V>(v: V) {
+  return is$typed(v, id, hashLogDeleteMessage)
 }
 
-export function validateLogDeleteMessage(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logDeleteMessage', v)
+export function validateLogDeleteMessage<V>(v: V) {
+  return validate<LogDeleteMessage & V>(v, id, hashLogDeleteMessage)
 }
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
index 2a70c63df4f..5a75ca53e09 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.deleteMessageForSelf'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
   messageId: string
-  [k: string]: unknown
 }
 
 export type OutputSchema = ChatBskyConvoDefs.DeletedMessageView
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/getConvo.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/getConvo.ts
index e6d1a651280..e0f3ed80b2a 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/getConvo.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/getConvo.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.getConvo'
 
 export interface QueryParams {
   convoId: string
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
index 0062e2230e6..0b085f06893 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.getConvoForMembers'
 
 export interface QueryParams {
   members: string[]
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/getLog.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/getLog.ts
index 2d1354f09bd..d439c2eabfb 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/getLog.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/getLog.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.getLog'
 
 export interface QueryParams {
   cursor?: string
@@ -18,13 +22,12 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   logs: (
-    | ChatBskyConvoDefs.LogBeginConvo
-    | ChatBskyConvoDefs.LogLeaveConvo
-    | ChatBskyConvoDefs.LogCreateMessage
-    | ChatBskyConvoDefs.LogDeleteMessage
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ChatBskyConvoDefs.LogBeginConvo>
+    | $Typed<ChatBskyConvoDefs.LogLeaveConvo>
+    | $Typed<ChatBskyConvoDefs.LogCreateMessage>
+    | $Typed<ChatBskyConvoDefs.LogDeleteMessage>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/getMessages.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/getMessages.ts
index 689dd4539dd..8c2c327986c 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/getMessages.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/getMessages.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.getMessages'
 
 export interface QueryParams {
   convoId: string
@@ -20,11 +24,10 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   messages: (
-    | ChatBskyConvoDefs.MessageView
-    | ChatBskyConvoDefs.DeletedMessageView
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ChatBskyConvoDefs.MessageView>
+    | $Typed<ChatBskyConvoDefs.DeletedMessageView>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/leaveConvo.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
index 99af5702e29..d7c557469dc 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
@@ -3,22 +3,24 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.leaveConvo'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convoId: string
   rev: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/listConvos.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/listConvos.ts
index 5e9a3dad264..2db1d29308f 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/listConvos.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/listConvos.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.listConvos'
 
 export interface QueryParams {
   limit: number
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   convos: ChatBskyConvoDefs.ConvoView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/muteConvo.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/muteConvo.ts
index 4d39442ff86..3b843c62122 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/muteConvo.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/muteConvo.ts
@@ -3,22 +3,24 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.muteConvo'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessage.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessage.ts
index 94acb7f018d..d8ebca50f53 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessage.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessage.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.sendMessage'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
   message: ChatBskyConvoDefs.MessageInput
-  [k: string]: unknown
 }
 
 export type OutputSchema = ChatBskyConvoDefs.MessageView
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
index 29556e52e7a..9c2e1a22623 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
@@ -3,22 +3,24 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.sendMessageBatch'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   items: BatchItem[]
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   items: ChatBskyConvoDefs.MessageView[]
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
@@ -51,19 +53,17 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface BatchItem {
+  $type?: 'chat.bsky.convo.sendMessageBatch#batchItem'
   convoId: string
   message: ChatBskyConvoDefs.MessageInput
-  [k: string]: unknown
 }
 
-export function isBatchItem(v: unknown): v is BatchItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.sendMessageBatch#batchItem'
-  )
+const hashBatchItem = 'batchItem'
+
+export function isBatchItem<V>(v: V) {
+  return is$typed(v, id, hashBatchItem)
 }
 
-export function validateBatchItem(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.sendMessageBatch#batchItem', v)
+export function validateBatchItem<V>(v: V) {
+  return validate<BatchItem & V>(v, id, hashBatchItem)
 }
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
index 4d39442ff86..cc29f5bb24e 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
@@ -3,22 +3,24 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.unmuteConvo'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/updateRead.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/updateRead.ts
index 6aa23309332..f4f12cd7789 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/updateRead.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/updateRead.ts
@@ -3,23 +3,25 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from './defs'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.updateRead'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
   messageId?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts b/packages/pds/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
index f99260a1b85..5c24a50c5b5 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.moderation.getActorMetadata'
+
 export interface QueryParams {
   actor: string
 }
@@ -18,7 +22,6 @@ export interface OutputSchema {
   day: Metadata
   month: Metadata
   all: Metadata
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -48,21 +51,19 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Metadata {
+  $type?: 'chat.bsky.moderation.getActorMetadata#metadata'
   messagesSent: number
   messagesReceived: number
   convos: number
   convosStarted: number
-  [k: string]: unknown
 }
 
-export function isMetadata(v: unknown): v is Metadata {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.moderation.getActorMetadata#metadata'
-  )
+const hashMetadata = 'metadata'
+
+export function isMetadata<V>(v: V) {
+  return is$typed(v, id, hashMetadata)
 }
 
-export function validateMetadata(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.moderation.getActorMetadata#metadata', v)
+export function validateMetadata<V>(v: V) {
+  return validate<Metadata & V>(v, id, hashMetadata)
 }
diff --git a/packages/pds/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts b/packages/pds/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
index 39489eb7c12..037d4dde4ec 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ChatBskyConvoDefs from '../convo/defs'
+import type * as ChatBskyConvoDefs from '../convo/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.moderation.getMessageContext'
 
 export interface QueryParams {
   /** Conversation that the message is from. NOTE: this field will eventually be required. */
@@ -21,11 +25,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   messages: (
-    | ChatBskyConvoDefs.MessageView
-    | ChatBskyConvoDefs.DeletedMessageView
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ChatBskyConvoDefs.MessageView>
+    | $Typed<ChatBskyConvoDefs.DeletedMessageView>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts b/packages/pds/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
index 17324495c1c..6bf8c511da7 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.moderation.updateActorAccess'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   actor: string
   allowAccess: boolean
   ref?: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/defs.ts b/packages/pds/src/lexicon/types/com/atproto/admin/defs.ts
index f58b7c7ece4..c130e5bb0c2 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/defs.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/defs.ts
@@ -2,34 +2,37 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoServerDefs from '../server/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoServerDefs from '../server/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.defs'
 
 export interface StatusAttr {
+  $type?: 'com.atproto.admin.defs#statusAttr'
   applied: boolean
   ref?: string
-  [k: string]: unknown
 }
 
-export function isStatusAttr(v: unknown): v is StatusAttr {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#statusAttr'
-  )
+const hashStatusAttr = 'statusAttr'
+
+export function isStatusAttr<V>(v: V) {
+  return is$typed(v, id, hashStatusAttr)
 }
 
-export function validateStatusAttr(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#statusAttr', v)
+export function validateStatusAttr<V>(v: V) {
+  return validate<StatusAttr & V>(v, id, hashStatusAttr)
 }
 
 export interface AccountView {
+  $type?: 'com.atproto.admin.defs#accountView'
   did: string
   handle: string
   email?: string
-  relatedRecords?: {}[]
+  relatedRecords?: { [_ in string]: unknown }[]
   indexedAt: string
   invitedBy?: ComAtprotoServerDefs.InviteCode
   invites?: ComAtprotoServerDefs.InviteCode[]
@@ -38,71 +41,62 @@ export interface AccountView {
   inviteNote?: string
   deactivatedAt?: string
   threatSignatures?: ThreatSignature[]
-  [k: string]: unknown
 }
 
-export function isAccountView(v: unknown): v is AccountView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#accountView'
-  )
+const hashAccountView = 'accountView'
+
+export function isAccountView<V>(v: V) {
+  return is$typed(v, id, hashAccountView)
 }
 
-export function validateAccountView(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#accountView', v)
+export function validateAccountView<V>(v: V) {
+  return validate<AccountView & V>(v, id, hashAccountView)
 }
 
 export interface RepoRef {
+  $type?: 'com.atproto.admin.defs#repoRef'
   did: string
-  [k: string]: unknown
 }
 
-export function isRepoRef(v: unknown): v is RepoRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#repoRef'
-  )
+const hashRepoRef = 'repoRef'
+
+export function isRepoRef<V>(v: V) {
+  return is$typed(v, id, hashRepoRef)
 }
 
-export function validateRepoRef(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#repoRef', v)
+export function validateRepoRef<V>(v: V) {
+  return validate<RepoRef & V>(v, id, hashRepoRef)
 }
 
 export interface RepoBlobRef {
+  $type?: 'com.atproto.admin.defs#repoBlobRef'
   did: string
   cid: string
   recordUri?: string
-  [k: string]: unknown
 }
 
-export function isRepoBlobRef(v: unknown): v is RepoBlobRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#repoBlobRef'
-  )
+const hashRepoBlobRef = 'repoBlobRef'
+
+export function isRepoBlobRef<V>(v: V) {
+  return is$typed(v, id, hashRepoBlobRef)
 }
 
-export function validateRepoBlobRef(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#repoBlobRef', v)
+export function validateRepoBlobRef<V>(v: V) {
+  return validate<RepoBlobRef & V>(v, id, hashRepoBlobRef)
 }
 
 export interface ThreatSignature {
+  $type?: 'com.atproto.admin.defs#threatSignature'
   property: string
   value: string
-  [k: string]: unknown
 }
 
-export function isThreatSignature(v: unknown): v is ThreatSignature {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#threatSignature'
-  )
+const hashThreatSignature = 'threatSignature'
+
+export function isThreatSignature<V>(v: V) {
+  return is$typed(v, id, hashThreatSignature)
 }
 
-export function validateThreatSignature(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#threatSignature', v)
+export function validateThreatSignature<V>(v: V) {
+  return validate<ThreatSignature & V>(v, id, hashThreatSignature)
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/deleteAccount.ts b/packages/pds/src/lexicon/types/com/atproto/admin/deleteAccount.ts
index 1b0223ea303..f000acc12b1 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/deleteAccount.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/deleteAccount.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.deleteAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   did: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts b/packages/pds/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
index d8f8ecad320..1d01b3a8860 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.disableAccountInvites'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   account: string
   /** Optional reason for disabled invites. */
   note?: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts b/packages/pds/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
index 75a9fb472a5..5b112c656e8 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
@@ -3,17 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.disableInviteCodes'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   codes?: string[]
   accounts?: string[]
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts b/packages/pds/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
index b072ad7ec56..a8e1a00894c 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.enableAccountInvites'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   account: string
   /** Optional reason for enabled invites. */
   note?: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfo.ts b/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
index acea7749774..c6f703d1625 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
+import type * as ComAtprotoAdminDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.getAccountInfo'
 
 export interface QueryParams {
   did: string
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfos.ts b/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
index 7d9fa3fdcbf..c876c92ef6b 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
+import type * as ComAtprotoAdminDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.getAccountInfos'
 
 export interface QueryParams {
   dids: string[]
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   infos: ComAtprotoAdminDefs.AccountView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/getInviteCodes.ts b/packages/pds/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
index 9619d5e4b5b..d685988633c 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoServerDefs from '../server/defs'
+import type * as ComAtprotoServerDefs from '../server/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.getInviteCodes'
 
 export interface QueryParams {
   sort: 'recent' | 'usage' | (string & {})
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   codes: ComAtprotoServerDefs.InviteCode[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts b/packages/pds/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
index 3aff3e6f322..06d25f389ec 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
@@ -3,12 +3,16 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
-import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
+import type * as ComAtprotoAdminDefs from './defs.js'
+import type * as ComAtprotoRepoStrongRef from '../repo/strongRef.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.getSubjectStatus'
 
 export interface QueryParams {
   did?: string
@@ -20,13 +24,12 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ComAtprotoAdminDefs.RepoBlobRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ComAtprotoAdminDefs.RepoBlobRef>
+    | { $type: string }
   takedown?: ComAtprotoAdminDefs.StatusAttr
   deactivated?: ComAtprotoAdminDefs.StatusAttr
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/searchAccounts.ts b/packages/pds/src/lexicon/types/com/atproto/admin/searchAccounts.ts
index 96b26867f41..043d5a0ba31 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/searchAccounts.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/searchAccounts.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
+import type * as ComAtprotoAdminDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.searchAccounts'
 
 export interface QueryParams {
   email?: string
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   accounts: ComAtprotoAdminDefs.AccountView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/sendEmail.ts b/packages/pds/src/lexicon/types/com/atproto/admin/sendEmail.ts
index 5c8bebe791d..462e403aa0c 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/sendEmail.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/sendEmail.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.sendEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -17,12 +21,10 @@ export interface InputSchema {
   senderDid: string
   /** Additional comment by the sender that won't be used in the email itself but helpful to provide more context for moderators/reviewers */
   comment?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   sent: boolean
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts b/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
index e3ea26f7298..c9e60e9c621 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.updateAccountEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   /** The handle or DID of the repo. */
   account: string
   email: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts b/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
index 87d861faef5..721a486dc16 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
@@ -3,17 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.updateAccountHandle'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   did: string
   handle: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts b/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
index b6aef601e13..c782b5cc9ce 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
@@ -3,17 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.updateAccountPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   did: string
   password: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts b/packages/pds/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
index ae48689cb4f..f768e076005 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
@@ -3,34 +3,36 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
-import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
+import type * as ComAtprotoAdminDefs from './defs.js'
+import type * as ComAtprotoRepoStrongRef from '../repo/strongRef.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.admin.updateSubjectStatus'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ComAtprotoAdminDefs.RepoBlobRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ComAtprotoAdminDefs.RepoBlobRef>
+    | { $type: string }
   takedown?: ComAtprotoAdminDefs.StatusAttr
   deactivated?: ComAtprotoAdminDefs.StatusAttr
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ComAtprotoAdminDefs.RepoBlobRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ComAtprotoAdminDefs.RepoBlobRef>
+    | { $type: string }
   takedown?: ComAtprotoAdminDefs.StatusAttr
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts b/packages/pds/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
index 33bd5f6fa05..add1d696b5c 100644
--- a/packages/pds/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.getRecommendedDidCredentials'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -16,9 +20,8 @@ export interface OutputSchema {
   /** Recommended rotation keys for PLC dids. Should be undefined (or ignored) for did:webs. */
   rotationKeys?: string[]
   alsoKnownAs?: string[]
-  verificationMethods?: {}
-  services?: {}
-  [k: string]: unknown
+  verificationMethods?: { [_ in string]: unknown }
+  services?: { [_ in string]: unknown }
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts b/packages/pds/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
index 7620d0abb69..a9818c9bece 100644
--- a/packages/pds/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.requestPlcOperationSignature'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/identity/resolveHandle.ts b/packages/pds/src/lexicon/types/com/atproto/identity/resolveHandle.ts
index e319fbfbadb..7c7fd5fe225 100644
--- a/packages/pds/src/lexicon/types/com/atproto/identity/resolveHandle.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/resolveHandle.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.resolveHandle'
+
 export interface QueryParams {
   /** The handle to resolve. */
   handle: string
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   did: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/identity/signPlcOperation.ts b/packages/pds/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
index 9b0cb540b8e..b8b684fd5c2 100644
--- a/packages/pds/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.signPlcOperation'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -15,15 +19,13 @@ export interface InputSchema {
   token?: string
   rotationKeys?: string[]
   alsoKnownAs?: string[]
-  verificationMethods?: {}
-  services?: {}
-  [k: string]: unknown
+  verificationMethods?: { [_ in string]: unknown }
+  services?: { [_ in string]: unknown }
 }
 
 export interface OutputSchema {
   /** A signed DID PLC operation. */
-  operation: {}
-  [k: string]: unknown
+  operation: { [_ in string]: unknown }
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts b/packages/pds/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
index 9b85d7dcb2f..388ad351dec 100644
--- a/packages/pds/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.submitPlcOperation'
+
 export interface QueryParams {}
 
 export interface InputSchema {
-  operation: {}
-  [k: string]: unknown
+  operation: { [_ in string]: unknown }
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/identity/updateHandle.ts b/packages/pds/src/lexicon/types/com/atproto/identity/updateHandle.ts
index 8a271d80264..dee985db8f2 100644
--- a/packages/pds/src/lexicon/types/com/atproto/identity/updateHandle.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/updateHandle.ts
@@ -3,17 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.updateHandle'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   /** The new handle. */
   handle: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/label/defs.ts b/packages/pds/src/lexicon/types/com/atproto/label/defs.ts
index 348e985622b..b5f75bfce0b 100644
--- a/packages/pds/src/lexicon/types/com/atproto/label/defs.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/label/defs.ts
@@ -2,12 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.label.defs'
 
 /** Metadata tag on an atproto resource (eg, repo or record). */
 export interface Label {
+  $type?: 'com.atproto.label.defs#label'
   /** The AT Protocol version of the label object. */
   ver?: number
   /** DID of the actor who created this label. */
@@ -26,60 +31,54 @@ export interface Label {
   exp?: string
   /** Signature of dag-cbor encoded label. */
   sig?: Uint8Array
-  [k: string]: unknown
 }
 
-export function isLabel(v: unknown): v is Label {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#label'
-  )
+const hashLabel = 'label'
+
+export function isLabel<V>(v: V) {
+  return is$typed(v, id, hashLabel)
 }
 
-export function validateLabel(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#label', v)
+export function validateLabel<V>(v: V) {
+  return validate<Label & V>(v, id, hashLabel)
 }
 
 /** Metadata tags on an atproto record, published by the author within the record. */
 export interface SelfLabels {
+  $type?: 'com.atproto.label.defs#selfLabels'
   values: SelfLabel[]
-  [k: string]: unknown
 }
 
-export function isSelfLabels(v: unknown): v is SelfLabels {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#selfLabels'
-  )
+const hashSelfLabels = 'selfLabels'
+
+export function isSelfLabels<V>(v: V) {
+  return is$typed(v, id, hashSelfLabels)
 }
 
-export function validateSelfLabels(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#selfLabels', v)
+export function validateSelfLabels<V>(v: V) {
+  return validate<SelfLabels & V>(v, id, hashSelfLabels)
 }
 
 /** Metadata tag on an atproto record, published by the author within the record. Note that schemas should use #selfLabels, not #selfLabel. */
 export interface SelfLabel {
+  $type?: 'com.atproto.label.defs#selfLabel'
   /** The short string name of the value or type of this label. */
   val: string
-  [k: string]: unknown
 }
 
-export function isSelfLabel(v: unknown): v is SelfLabel {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#selfLabel'
-  )
+const hashSelfLabel = 'selfLabel'
+
+export function isSelfLabel<V>(v: V) {
+  return is$typed(v, id, hashSelfLabel)
 }
 
-export function validateSelfLabel(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#selfLabel', v)
+export function validateSelfLabel<V>(v: V) {
+  return validate<SelfLabel & V>(v, id, hashSelfLabel)
 }
 
 /** Declares a label value and its expected interpretations and behaviors. */
 export interface LabelValueDefinition {
+  $type?: 'com.atproto.label.defs#labelValueDefinition'
   /** The value of the label being defined. Must only include lowercase ascii and the '-' character ([a-z-]+). */
   identifier: string
   /** How should a client visually convey this label? 'inform' means neutral and informational; 'alert' means negative and warning; 'none' means show nothing. */
@@ -91,48 +90,40 @@ export interface LabelValueDefinition {
   /** Does the user need to have adult content enabled in order to configure this label? */
   adultOnly?: boolean
   locales: LabelValueDefinitionStrings[]
-  [k: string]: unknown
 }
 
-export function isLabelValueDefinition(v: unknown): v is LabelValueDefinition {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#labelValueDefinition'
-  )
+const hashLabelValueDefinition = 'labelValueDefinition'
+
+export function isLabelValueDefinition<V>(v: V) {
+  return is$typed(v, id, hashLabelValueDefinition)
 }
 
-export function validateLabelValueDefinition(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#labelValueDefinition', v)
+export function validateLabelValueDefinition<V>(v: V) {
+  return validate<LabelValueDefinition & V>(v, id, hashLabelValueDefinition)
 }
 
 /** Strings which describe the label in the UI, localized into a specific language. */
 export interface LabelValueDefinitionStrings {
+  $type?: 'com.atproto.label.defs#labelValueDefinitionStrings'
   /** The code of the language these strings are written in. */
   lang: string
   /** A short human-readable name for the label. */
   name: string
   /** A longer description of what the label means and why it might be applied. */
   description: string
-  [k: string]: unknown
 }
 
-export function isLabelValueDefinitionStrings(
-  v: unknown,
-): v is LabelValueDefinitionStrings {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#labelValueDefinitionStrings'
-  )
+const hashLabelValueDefinitionStrings = 'labelValueDefinitionStrings'
+
+export function isLabelValueDefinitionStrings<V>(v: V) {
+  return is$typed(v, id, hashLabelValueDefinitionStrings)
 }
 
-export function validateLabelValueDefinitionStrings(
-  v: unknown,
-): ValidationResult {
-  return lexicons.validate(
-    'com.atproto.label.defs#labelValueDefinitionStrings',
+export function validateLabelValueDefinitionStrings<V>(v: V) {
+  return validate<LabelValueDefinitionStrings & V>(
     v,
+    id,
+    hashLabelValueDefinitionStrings,
   )
 }
 
diff --git a/packages/pds/src/lexicon/types/com/atproto/label/queryLabels.ts b/packages/pds/src/lexicon/types/com/atproto/label/queryLabels.ts
index 9873f6914b4..b179124e639 100644
--- a/packages/pds/src/lexicon/types/com/atproto/label/queryLabels.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/label/queryLabels.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoLabelDefs from './defs'
+import type * as ComAtprotoLabelDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.label.queryLabels'
 
 export interface QueryParams {
   /** List of AT URI patterns to match (boolean 'OR'). Each may be a prefix (ending with '*'; will match inclusive of the string leading to '*'), or a full URI. */
@@ -23,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   labels: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/label/subscribeLabels.ts b/packages/pds/src/lexicon/types/com/atproto/label/subscribeLabels.ts
index 6034b35d895..da6e961fa94 100644
--- a/packages/pds/src/lexicon/types/com/atproto/label/subscribeLabels.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/label/subscribeLabels.ts
@@ -2,22 +2,23 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, ErrorFrame } from '@atproto/xrpc-server'
-import { IncomingMessage } from 'http'
-import * as ComAtprotoLabelDefs from './defs'
+import { IncomingMessage } from 'node:http'
+import type * as ComAtprotoLabelDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.label.subscribeLabels'
 
 export interface QueryParams {
   /** The last known event seq number to backfill from. */
   cursor?: number
 }
 
-export type OutputSchema =
-  | Labels
-  | Info
-  | { $type: string; [k: string]: unknown }
+export type OutputSchema = $Typed<Labels> | $Typed<Info> | { $type: string }
 export type HandlerError = ErrorFrame<'FutureCursor'>
 export type HandlerOutput = HandlerError | OutputSchema
 export type HandlerReqCtx<HA extends HandlerAuth = never> = {
@@ -31,37 +32,33 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => AsyncIterable<HandlerOutput>
 
 export interface Labels {
+  $type?: 'com.atproto.label.subscribeLabels#labels'
   seq: number
   labels: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
-export function isLabels(v: unknown): v is Labels {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.subscribeLabels#labels'
-  )
+const hashLabels = 'labels'
+
+export function isLabels<V>(v: V) {
+  return is$typed(v, id, hashLabels)
 }
 
-export function validateLabels(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.subscribeLabels#labels', v)
+export function validateLabels<V>(v: V) {
+  return validate<Labels & V>(v, id, hashLabels)
 }
 
 export interface Info {
+  $type?: 'com.atproto.label.subscribeLabels#info'
   name: 'OutdatedCursor' | (string & {})
   message?: string
-  [k: string]: unknown
 }
 
-export function isInfo(v: unknown): v is Info {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.subscribeLabels#info'
-  )
+const hashInfo = 'info'
+
+export function isInfo<V>(v: V) {
+  return is$typed(v, id, hashInfo)
 }
 
-export function validateInfo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.subscribeLabels#info', v)
+export function validateInfo<V>(v: V) {
+  return validate<Info & V>(v, id, hashInfo)
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/lexicon/schema.ts b/packages/pds/src/lexicon/types/com/atproto/lexicon/schema.ts
index fbb12809710..4f632560c7f 100644
--- a/packages/pds/src/lexicon/types/com/atproto/lexicon/schema.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/lexicon/schema.ts
@@ -2,25 +2,27 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.lexicon.schema'
 
 export interface Record {
+  $type: 'com.atproto.lexicon.schema'
   /** Indicates the 'version' of the Lexicon language. Must be '1' for the current atproto/Lexicon schema system. */
   lexicon: number
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'com.atproto.lexicon.schema#main' ||
-      v.$type === 'com.atproto.lexicon.schema')
-  )
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.lexicon.schema#main', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/moderation/createReport.ts b/packages/pds/src/lexicon/types/com/atproto/moderation/createReport.ts
index dc7985c7685..5022352bc70 100644
--- a/packages/pds/src/lexicon/types/com/atproto/moderation/createReport.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/moderation/createReport.ts
@@ -3,13 +3,17 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoModerationDefs from './defs'
-import * as ComAtprotoAdminDefs from '../admin/defs'
-import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
+import type * as ComAtprotoModerationDefs from './defs.js'
+import type * as ComAtprotoAdminDefs from '../admin/defs.js'
+import type * as ComAtprotoRepoStrongRef from '../repo/strongRef.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.moderation.createReport'
 
 export interface QueryParams {}
 
@@ -18,10 +22,9 @@ export interface InputSchema {
   /** Additional context about the content and violation. */
   reason?: string
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | { $type: string; [k: string]: unknown }
-  [k: string]: unknown
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | { $type: string }
 }
 
 export interface OutputSchema {
@@ -29,12 +32,11 @@ export interface OutputSchema {
   reasonType: ComAtprotoModerationDefs.ReasonType
   reason?: string
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | { $type: string }
   reportedBy: string
   createdAt: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/moderation/defs.ts b/packages/pds/src/lexicon/types/com/atproto/moderation/defs.ts
index 08e555c2422..2d7a46f5dd8 100644
--- a/packages/pds/src/lexicon/types/com/atproto/moderation/defs.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/moderation/defs.ts
@@ -2,9 +2,13 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.moderation.defs'
 
 export type ReasonType =
   | 'com.atproto.moderation.defs#reasonSpam'
@@ -17,16 +21,16 @@ export type ReasonType =
   | (string & {})
 
 /** Spam: frequent unwanted promotion, replies, mentions */
-export const REASONSPAM = 'com.atproto.moderation.defs#reasonSpam'
+export const REASONSPAM = `${id}#reasonSpam`
 /** Direct violation of server rules, laws, terms of service */
-export const REASONVIOLATION = 'com.atproto.moderation.defs#reasonViolation'
+export const REASONVIOLATION = `${id}#reasonViolation`
 /** Misleading identity, affiliation, or content */
-export const REASONMISLEADING = 'com.atproto.moderation.defs#reasonMisleading'
+export const REASONMISLEADING = `${id}#reasonMisleading`
 /** Unwanted or mislabeled sexual content */
-export const REASONSEXUAL = 'com.atproto.moderation.defs#reasonSexual'
+export const REASONSEXUAL = `${id}#reasonSexual`
 /** Rude, harassing, explicit, or otherwise unwelcoming behavior */
-export const REASONRUDE = 'com.atproto.moderation.defs#reasonRude'
+export const REASONRUDE = `${id}#reasonRude`
 /** Other: reports not falling under another report category */
-export const REASONOTHER = 'com.atproto.moderation.defs#reasonOther'
+export const REASONOTHER = `${id}#reasonOther`
 /** Appeal: appeal a previously taken moderation action */
-export const REASONAPPEAL = 'com.atproto.moderation.defs#reasonAppeal'
+export const REASONAPPEAL = `${id}#reasonAppeal`
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/applyWrites.ts b/packages/pds/src/lexicon/types/com/atproto/repo/applyWrites.ts
index a58fcc0a56b..c6e07aff94e 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/applyWrites.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/applyWrites.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoRepoDefs from './defs'
+import type * as ComAtprotoRepoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.applyWrites'
 
 export interface QueryParams {}
 
@@ -16,16 +20,18 @@ export interface InputSchema {
   repo: string
   /** Can be set to 'false' to skip Lexicon schema validation of record data across all operations, 'true' to require it, or leave unset to validate only for known Lexicons. */
   validate?: boolean
-  writes: (Create | Update | Delete)[]
+  writes: ($Typed<Create> | $Typed<Update> | $Typed<Delete>)[]
   /** If provided, the entire operation will fail if the current repo commit CID does not match this value. Used to prevent conflicting repo mutations. */
   swapCommit?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   commit?: ComAtprotoRepoDefs.CommitMeta
-  results?: (CreateResult | UpdateResult | DeleteResult)[]
-  [k: string]: unknown
+  results?: (
+    | $Typed<CreateResult>
+    | $Typed<UpdateResult>
+    | $Typed<DeleteResult>
+  )[]
 }
 
 export interface HandlerInput {
@@ -60,113 +66,101 @@ export type Handler<HA extends HandlerAuth = never> = (
 
 /** Operation which creates a new record. */
 export interface Create {
+  $type?: 'com.atproto.repo.applyWrites#create'
   collection: string
   rkey?: string
-  value: {}
-  [k: string]: unknown
+  value: { [_ in string]: unknown }
 }
 
-export function isCreate(v: unknown): v is Create {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#create'
-  )
+const hashCreate = 'create'
+
+export function isCreate<V>(v: V) {
+  return is$typed(v, id, hashCreate)
 }
 
-export function validateCreate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#create', v)
+export function validateCreate<V>(v: V) {
+  return validate<Create & V>(v, id, hashCreate)
 }
 
 /** Operation which updates an existing record. */
 export interface Update {
+  $type?: 'com.atproto.repo.applyWrites#update'
   collection: string
   rkey: string
-  value: {}
-  [k: string]: unknown
+  value: { [_ in string]: unknown }
 }
 
-export function isUpdate(v: unknown): v is Update {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#update'
-  )
+const hashUpdate = 'update'
+
+export function isUpdate<V>(v: V) {
+  return is$typed(v, id, hashUpdate)
 }
 
-export function validateUpdate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#update', v)
+export function validateUpdate<V>(v: V) {
+  return validate<Update & V>(v, id, hashUpdate)
 }
 
 /** Operation which deletes an existing record. */
 export interface Delete {
+  $type?: 'com.atproto.repo.applyWrites#delete'
   collection: string
   rkey: string
-  [k: string]: unknown
 }
 
-export function isDelete(v: unknown): v is Delete {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#delete'
-  )
+const hashDelete = 'delete'
+
+export function isDelete<V>(v: V) {
+  return is$typed(v, id, hashDelete)
 }
 
-export function validateDelete(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#delete', v)
+export function validateDelete<V>(v: V) {
+  return validate<Delete & V>(v, id, hashDelete)
 }
 
 export interface CreateResult {
+  $type?: 'com.atproto.repo.applyWrites#createResult'
   uri: string
   cid: string
   validationStatus?: 'valid' | 'unknown' | (string & {})
-  [k: string]: unknown
 }
 
-export function isCreateResult(v: unknown): v is CreateResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#createResult'
-  )
+const hashCreateResult = 'createResult'
+
+export function isCreateResult<V>(v: V) {
+  return is$typed(v, id, hashCreateResult)
 }
 
-export function validateCreateResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#createResult', v)
+export function validateCreateResult<V>(v: V) {
+  return validate<CreateResult & V>(v, id, hashCreateResult)
 }
 
 export interface UpdateResult {
+  $type?: 'com.atproto.repo.applyWrites#updateResult'
   uri: string
   cid: string
   validationStatus?: 'valid' | 'unknown' | (string & {})
-  [k: string]: unknown
 }
 
-export function isUpdateResult(v: unknown): v is UpdateResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#updateResult'
-  )
+const hashUpdateResult = 'updateResult'
+
+export function isUpdateResult<V>(v: V) {
+  return is$typed(v, id, hashUpdateResult)
 }
 
-export function validateUpdateResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#updateResult', v)
+export function validateUpdateResult<V>(v: V) {
+  return validate<UpdateResult & V>(v, id, hashUpdateResult)
 }
 
 export interface DeleteResult {
-  [k: string]: unknown
+  $type?: 'com.atproto.repo.applyWrites#deleteResult'
 }
 
-export function isDeleteResult(v: unknown): v is DeleteResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#deleteResult'
-  )
+const hashDeleteResult = 'deleteResult'
+
+export function isDeleteResult<V>(v: V) {
+  return is$typed(v, id, hashDeleteResult)
 }
 
-export function validateDeleteResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#deleteResult', v)
+export function validateDeleteResult<V>(v: V) {
+  return validate<DeleteResult & V>(v, id, hashDeleteResult)
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/createRecord.ts b/packages/pds/src/lexicon/types/com/atproto/repo/createRecord.ts
index 0982f49bf3d..f844aa60313 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/createRecord.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/createRecord.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoRepoDefs from './defs'
+import type * as ComAtprotoRepoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.createRecord'
 
 export interface QueryParams {}
 
@@ -21,10 +25,9 @@ export interface InputSchema {
   /** Can be set to 'false' to skip Lexicon schema validation of record data, 'true' to require it, or leave unset to validate only for known Lexicons. */
   validate?: boolean
   /** The record itself. Must contain a $type field. */
-  record: {}
+  record: { [_ in string]: unknown }
   /** Compare and swap with the previous commit by CID. */
   swapCommit?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
@@ -32,7 +35,6 @@ export interface OutputSchema {
   cid: string
   commit?: ComAtprotoRepoDefs.CommitMeta
   validationStatus?: 'valid' | 'unknown' | (string & {})
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/defs.ts b/packages/pds/src/lexicon/types/com/atproto/repo/defs.ts
index 8357fe2a611..3b02739d7dd 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/defs.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/defs.ts
@@ -2,24 +2,26 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.defs'
 
 export interface CommitMeta {
+  $type?: 'com.atproto.repo.defs#commitMeta'
   cid: string
   rev: string
-  [k: string]: unknown
 }
 
-export function isCommitMeta(v: unknown): v is CommitMeta {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.defs#commitMeta'
-  )
+const hashCommitMeta = 'commitMeta'
+
+export function isCommitMeta<V>(v: V) {
+  return is$typed(v, id, hashCommitMeta)
 }
 
-export function validateCommitMeta(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.defs#commitMeta', v)
+export function validateCommitMeta<V>(v: V) {
+  return validate<CommitMeta & V>(v, id, hashCommitMeta)
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/deleteRecord.ts b/packages/pds/src/lexicon/types/com/atproto/repo/deleteRecord.ts
index c86ab7ba47a..ce903f82544 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/deleteRecord.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/deleteRecord.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoRepoDefs from './defs'
+import type * as ComAtprotoRepoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.deleteRecord'
 
 export interface QueryParams {}
 
@@ -22,12 +26,10 @@ export interface InputSchema {
   swapRecord?: string
   /** Compare and swap with the previous commit by CID. */
   swapCommit?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   commit?: ComAtprotoRepoDefs.CommitMeta
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/describeRepo.ts b/packages/pds/src/lexicon/types/com/atproto/repo/describeRepo.ts
index 5b187f3758c..c2c6afe848d 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/describeRepo.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/describeRepo.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.describeRepo'
+
 export interface QueryParams {
   /** The handle or DID of the repo. */
   repo: string
@@ -19,12 +23,11 @@ export interface OutputSchema {
   handle: string
   did: string
   /** The complete DID document for this account. */
-  didDoc: {}
+  didDoc: { [_ in string]: unknown }
   /** List of all the collections (NSIDs) for which this repo contains at least one record. */
   collections: string[]
   /** Indicates if handle is currently valid (resolves bi-directionally) */
   handleIsCorrect: boolean
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/getRecord.ts b/packages/pds/src/lexicon/types/com/atproto/repo/getRecord.ts
index 96ce9ee551f..62509f77008 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/getRecord.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/getRecord.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.getRecord'
+
 export interface QueryParams {
   /** The handle or DID of the repo. */
   repo: string
@@ -24,8 +28,7 @@ export type InputSchema = undefined
 export interface OutputSchema {
   uri: string
   cid?: string
-  value: {}
-  [k: string]: unknown
+  value: { [_ in string]: unknown }
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/importRepo.ts b/packages/pds/src/lexicon/types/com/atproto/repo/importRepo.ts
index 685918f455f..f15a7784258 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/importRepo.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/importRepo.ts
@@ -2,13 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import stream from 'stream'
+import stream from 'node:stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.importRepo'
+
 export interface QueryParams {}
 
 export type InputSchema = string | Uint8Array | Blob
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts b/packages/pds/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
index f1be00d8e87..0404bac3f48 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.listMissingBlobs'
+
 export interface QueryParams {
   limit: number
   cursor?: string
@@ -18,7 +22,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   blobs: RecordBlob[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -48,19 +51,17 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface RecordBlob {
+  $type?: 'com.atproto.repo.listMissingBlobs#recordBlob'
   cid: string
   recordUri: string
-  [k: string]: unknown
 }
 
-export function isRecordBlob(v: unknown): v is RecordBlob {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.listMissingBlobs#recordBlob'
-  )
+const hashRecordBlob = 'recordBlob'
+
+export function isRecordBlob<V>(v: V) {
+  return is$typed(v, id, hashRecordBlob)
 }
 
-export function validateRecordBlob(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.listMissingBlobs#recordBlob', v)
+export function validateRecordBlob<V>(v: V) {
+  return validate<RecordBlob & V>(v, id, hashRecordBlob)
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/listRecords.ts b/packages/pds/src/lexicon/types/com/atproto/repo/listRecords.ts
index e328cfbb204..573d34d70a8 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/listRecords.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/listRecords.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.listRecords'
+
 export interface QueryParams {
   /** The handle or DID of the repo. */
   repo: string
@@ -29,7 +33,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   records: Record[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -59,20 +62,18 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Record {
+  $type?: 'com.atproto.repo.listRecords#record'
   uri: string
   cid: string
-  value: {}
-  [k: string]: unknown
+  value: { [_ in string]: unknown }
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.listRecords#record'
-  )
+const hashRecord = 'record'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.listRecords#record', v)
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord)
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/putRecord.ts b/packages/pds/src/lexicon/types/com/atproto/repo/putRecord.ts
index 269244ede91..7d417a860f6 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/putRecord.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/putRecord.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoRepoDefs from './defs'
+import type * as ComAtprotoRepoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.putRecord'
 
 export interface QueryParams {}
 
@@ -21,12 +25,11 @@ export interface InputSchema {
   /** Can be set to 'false' to skip Lexicon schema validation of record data, 'true' to require it, or leave unset to validate only for known Lexicons. */
   validate?: boolean
   /** The record to write. */
-  record: {}
+  record: { [_ in string]: unknown }
   /** Compare and swap with the previous record by CID. WARNING: nullable and optional field; may cause problems with golang implementation */
   swapRecord?: string | null
   /** Compare and swap with the previous commit by CID. */
   swapCommit?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
@@ -34,7 +37,6 @@ export interface OutputSchema {
   cid: string
   commit?: ComAtprotoRepoDefs.CommitMeta
   validationStatus?: 'valid' | 'unknown' | (string & {})
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/strongRef.ts b/packages/pds/src/lexicon/types/com/atproto/repo/strongRef.ts
index 8b21a6ddf81..e2652df53cb 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/strongRef.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/strongRef.ts
@@ -2,25 +2,26 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+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
-  [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'com.atproto.repo.strongRef#main' ||
-      v.$type === 'com.atproto.repo.strongRef')
-  )
+const hashMain = 'main'
+
+export function isMain<V>(v: V) {
+  return is$typed(v, id, hashMain)
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.strongRef#main', v)
+export function validateMain<V>(v: V) {
+  return validate<Main & V>(v, id, hashMain)
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/uploadBlob.ts b/packages/pds/src/lexicon/types/com/atproto/repo/uploadBlob.ts
index 7595e7295e6..c523b188706 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/uploadBlob.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/uploadBlob.ts
@@ -2,20 +2,23 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import stream from 'stream'
+import stream from 'node:stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.repo.uploadBlob'
+
 export interface QueryParams {}
 
 export type InputSchema = string | Uint8Array | Blob
 
 export interface OutputSchema {
   blob: BlobRef
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/activateAccount.ts b/packages/pds/src/lexicon/types/com/atproto/server/activateAccount.ts
index 7620d0abb69..70cd19e46a5 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/activateAccount.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/activateAccount.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.activateAccount'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/checkAccountStatus.ts b/packages/pds/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
index 2ad98689303..0487aea5938 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.checkAccountStatus'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -22,7 +26,6 @@ export interface OutputSchema {
   privateStateValues: number
   expectedBlobs: number
   importedBlobs: number
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/confirmEmail.ts b/packages/pds/src/lexicon/types/com/atproto/server/confirmEmail.ts
index d6338b80fc5..9a3cb61558b 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/confirmEmail.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/confirmEmail.ts
@@ -3,17 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.confirmEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   email: string
   token: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/createAccount.ts b/packages/pds/src/lexicon/types/com/atproto/server/createAccount.ts
index a85c83edffc..c1efde363c2 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/createAccount.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/createAccount.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.createAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -24,8 +28,7 @@ export interface InputSchema {
   /** DID PLC rotation key (aka, recovery key) to be included in PLC creation operation. */
   recoveryKey?: string
   /** A signed DID PLC operation to be submitted as part of importing an existing account to this instance. NOTE: this optional field may be updated when full account migration is implemented. */
-  plcOp?: {}
-  [k: string]: unknown
+  plcOp?: { [_ in string]: unknown }
 }
 
 /** Account login session returned on successful account creation. */
@@ -36,8 +39,7 @@ export interface OutputSchema {
   /** The DID of the new account. */
   did: string
   /** Complete DID document. */
-  didDoc?: {}
-  [k: string]: unknown
+  didDoc?: { [_ in string]: unknown }
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/createAppPassword.ts b/packages/pds/src/lexicon/types/com/atproto/server/createAppPassword.ts
index 65ad1d4b4cb..4ef50d9f210 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/createAppPassword.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/createAppPassword.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.createAppPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -15,7 +19,6 @@ export interface InputSchema {
   name: string
   /** If an app password has 'privileged' access to possibly sensitive account state. Meant for use with trusted clients. */
   privileged?: boolean
-  [k: string]: unknown
 }
 
 export type OutputSchema = AppPassword
@@ -51,24 +54,19 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface AppPassword {
+  $type?: 'com.atproto.server.createAppPassword#appPassword'
   name: string
   password: string
   createdAt: string
   privileged?: boolean
-  [k: string]: unknown
 }
 
-export function isAppPassword(v: unknown): v is AppPassword {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.createAppPassword#appPassword'
-  )
+const hashAppPassword = 'appPassword'
+
+export function isAppPassword<V>(v: V) {
+  return is$typed(v, id, hashAppPassword)
 }
 
-export function validateAppPassword(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'com.atproto.server.createAppPassword#appPassword',
-    v,
-  )
+export function validateAppPassword<V>(v: V) {
+  return validate<AppPassword & V>(v, id, hashAppPassword)
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/createInviteCode.ts b/packages/pds/src/lexicon/types/com/atproto/server/createInviteCode.ts
index 82daf7eea6f..fcda04f920b 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/createInviteCode.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/createInviteCode.ts
@@ -3,22 +3,24 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.createInviteCode'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   useCount: number
   forAccount?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   code: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/createInviteCodes.ts b/packages/pds/src/lexicon/types/com/atproto/server/createInviteCodes.ts
index fa2c1f73c2a..6f447d94d74 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/createInviteCodes.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/createInviteCodes.ts
@@ -3,23 +3,25 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.createInviteCodes'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   codeCount: number
   useCount: number
   forAccounts?: string[]
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   codes: AccountCodes[]
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
@@ -52,22 +54,17 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface AccountCodes {
+  $type?: 'com.atproto.server.createInviteCodes#accountCodes'
   account: string
   codes: string[]
-  [k: string]: unknown
 }
 
-export function isAccountCodes(v: unknown): v is AccountCodes {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.createInviteCodes#accountCodes'
-  )
+const hashAccountCodes = 'accountCodes'
+
+export function isAccountCodes<V>(v: V) {
+  return is$typed(v, id, hashAccountCodes)
 }
 
-export function validateAccountCodes(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'com.atproto.server.createInviteCodes#accountCodes',
-    v,
-  )
+export function validateAccountCodes<V>(v: V) {
+  return validate<AccountCodes & V>(v, id, hashAccountCodes)
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/createSession.ts b/packages/pds/src/lexicon/types/com/atproto/server/createSession.ts
index 47ffaaaa0bd..1f3b974ce63 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/createSession.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/createSession.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.createSession'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -17,7 +21,6 @@ export interface InputSchema {
   authFactorToken?: string
   /** When true, instead of throwing error for takendown accounts, a valid response with a narrow scoped token will be returned */
   allowTakendown?: boolean
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
@@ -25,14 +28,13 @@ export interface OutputSchema {
   refreshJwt: string
   handle: string
   did: string
-  didDoc?: {}
+  didDoc?: { [_ in string]: unknown }
   email?: string
   emailConfirmed?: boolean
   emailAuthFactor?: boolean
   active?: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/deactivateAccount.ts b/packages/pds/src/lexicon/types/com/atproto/server/deactivateAccount.ts
index 56b86424e61..6bf18012bda 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/deactivateAccount.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/deactivateAccount.ts
@@ -3,17 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.deactivateAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   /** A recommendation to server as to how long they should hold onto the deactivated account before deleting. */
   deleteAfter?: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/defs.ts b/packages/pds/src/lexicon/types/com/atproto/server/defs.ts
index 9bd67c9d7a5..a3b0bb6d989 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/defs.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/defs.ts
@@ -2,11 +2,16 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.defs'
 
 export interface InviteCode {
+  $type?: 'com.atproto.server.defs#inviteCode'
   code: string
   available: number
   disabled: boolean
@@ -14,35 +19,30 @@ export interface InviteCode {
   createdBy: string
   createdAt: string
   uses: InviteCodeUse[]
-  [k: string]: unknown
 }
 
-export function isInviteCode(v: unknown): v is InviteCode {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.defs#inviteCode'
-  )
+const hashInviteCode = 'inviteCode'
+
+export function isInviteCode<V>(v: V) {
+  return is$typed(v, id, hashInviteCode)
 }
 
-export function validateInviteCode(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.defs#inviteCode', v)
+export function validateInviteCode<V>(v: V) {
+  return validate<InviteCode & V>(v, id, hashInviteCode)
 }
 
 export interface InviteCodeUse {
+  $type?: 'com.atproto.server.defs#inviteCodeUse'
   usedBy: string
   usedAt: string
-  [k: string]: unknown
 }
 
-export function isInviteCodeUse(v: unknown): v is InviteCodeUse {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.defs#inviteCodeUse'
-  )
+const hashInviteCodeUse = 'inviteCodeUse'
+
+export function isInviteCodeUse<V>(v: V) {
+  return is$typed(v, id, hashInviteCodeUse)
 }
 
-export function validateInviteCodeUse(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.defs#inviteCodeUse', v)
+export function validateInviteCodeUse<V>(v: V) {
+  return validate<InviteCodeUse & V>(v, id, hashInviteCodeUse)
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/deleteAccount.ts b/packages/pds/src/lexicon/types/com/atproto/server/deleteAccount.ts
index 93b7b78a0e5..f717788711b 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/deleteAccount.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/deleteAccount.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.deleteAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   did: string
   password: string
   token: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/deleteSession.ts b/packages/pds/src/lexicon/types/com/atproto/server/deleteSession.ts
index 7620d0abb69..644d4ffde04 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/deleteSession.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/deleteSession.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.deleteSession'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/describeServer.ts b/packages/pds/src/lexicon/types/com/atproto/server/describeServer.ts
index 6964a59ffdf..17b0400d611 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/describeServer.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/describeServer.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.describeServer'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -22,7 +26,6 @@ export interface OutputSchema {
   links?: Links
   contact?: Contact
   did: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -52,36 +55,32 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Links {
+  $type?: 'com.atproto.server.describeServer#links'
   privacyPolicy?: string
   termsOfService?: string
-  [k: string]: unknown
 }
 
-export function isLinks(v: unknown): v is Links {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.describeServer#links'
-  )
+const hashLinks = 'links'
+
+export function isLinks<V>(v: V) {
+  return is$typed(v, id, hashLinks)
 }
 
-export function validateLinks(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.describeServer#links', v)
+export function validateLinks<V>(v: V) {
+  return validate<Links & V>(v, id, hashLinks)
 }
 
 export interface Contact {
+  $type?: 'com.atproto.server.describeServer#contact'
   email?: string
-  [k: string]: unknown
 }
 
-export function isContact(v: unknown): v is Contact {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.describeServer#contact'
-  )
+const hashContact = 'contact'
+
+export function isContact<V>(v: V) {
+  return is$typed(v, id, hashContact)
 }
 
-export function validateContact(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.describeServer#contact', v)
+export function validateContact<V>(v: V) {
+  return validate<Contact & V>(v, id, hashContact)
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts b/packages/pds/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
index 1cdf1299961..3c6998c47ee 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoServerDefs from './defs'
+import type * as ComAtprotoServerDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.getAccountInviteCodes'
 
 export interface QueryParams {
   includeUsed: boolean
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   codes: ComAtprotoServerDefs.InviteCode[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/getServiceAuth.ts b/packages/pds/src/lexicon/types/com/atproto/server/getServiceAuth.ts
index 1e9d1398be7..a8c53382f01 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/getServiceAuth.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/getServiceAuth.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.getServiceAuth'
+
 export interface QueryParams {
   /** The DID of the service that the token will be used to authenticate with */
   aud: string
@@ -21,7 +25,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   token: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/getSession.ts b/packages/pds/src/lexicon/types/com/atproto/server/getSession.ts
index cafa6bc7452..1c5ad0d543f 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/getSession.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/getSession.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.getSession'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -18,11 +22,10 @@ export interface OutputSchema {
   email?: string
   emailConfirmed?: boolean
   emailAuthFactor?: boolean
-  didDoc?: {}
+  didDoc?: { [_ in string]: unknown }
   active?: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/listAppPasswords.ts b/packages/pds/src/lexicon/types/com/atproto/server/listAppPasswords.ts
index 99219e67f7f..4881fa79fc0 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/listAppPasswords.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/listAppPasswords.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.listAppPasswords'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
 
 export interface OutputSchema {
   passwords: AppPassword[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -45,20 +48,18 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface AppPassword {
+  $type?: 'com.atproto.server.listAppPasswords#appPassword'
   name: string
   createdAt: string
   privileged?: boolean
-  [k: string]: unknown
 }
 
-export function isAppPassword(v: unknown): v is AppPassword {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.listAppPasswords#appPassword'
-  )
+const hashAppPassword = 'appPassword'
+
+export function isAppPassword<V>(v: V) {
+  return is$typed(v, id, hashAppPassword)
 }
 
-export function validateAppPassword(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.listAppPasswords#appPassword', v)
+export function validateAppPassword<V>(v: V) {
+  return validate<AppPassword & V>(v, id, hashAppPassword)
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/refreshSession.ts b/packages/pds/src/lexicon/types/com/atproto/server/refreshSession.ts
index 59e8f9d5a32..bc13c402019 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/refreshSession.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/refreshSession.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.refreshSession'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -17,11 +21,10 @@ export interface OutputSchema {
   refreshJwt: string
   handle: string
   did: string
-  didDoc?: {}
+  didDoc?: { [_ in string]: unknown }
   active?: boolean
   /** Hosting status of the account. If not specified, then assume 'active'. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/requestAccountDelete.ts b/packages/pds/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
index 7620d0abb69..e8eac86efbf 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.requestAccountDelete'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts b/packages/pds/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
index 7620d0abb69..2d64a2adf1b 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.requestEmailConfirmation'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts b/packages/pds/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
index 87b9a094ccc..548b4f3a26f 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
@@ -3,18 +3,21 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.requestEmailUpdate'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
 
 export interface OutputSchema {
   tokenRequired: boolean
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/requestPasswordReset.ts b/packages/pds/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
index ae541342aff..58ae5e8d70e 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.requestPasswordReset'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   email: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/reserveSigningKey.ts b/packages/pds/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
index 72850ce061b..71a4dd20515 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
@@ -3,23 +3,25 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.reserveSigningKey'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   /** The DID to reserve a key for. */
   did?: string
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   /** The public key for the reserved signing key, in did:key serialization. */
   signingKey: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/resetPassword.ts b/packages/pds/src/lexicon/types/com/atproto/server/resetPassword.ts
index 4b5b8ea1ecc..d292f7c5f93 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/resetPassword.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/resetPassword.ts
@@ -3,17 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.resetPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   token: string
   password: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/revokeAppPassword.ts b/packages/pds/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
index 80131f8c9e3..b52e6d5103b 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.revokeAppPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   name: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/updateEmail.ts b/packages/pds/src/lexicon/types/com/atproto/server/updateEmail.ts
index a80982da4f8..ffd0e2e23b9 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/updateEmail.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/updateEmail.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.server.updateEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -15,7 +19,6 @@ export interface InputSchema {
   emailAuthFactor?: boolean
   /** Requires a token from com.atproto.sever.requestEmailUpdate if the account's email has been confirmed. */
   token?: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getBlob.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getBlob.ts
index 659c71c1a8d..89c40de7cb7 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getBlob.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getBlob.ts
@@ -2,13 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import stream from 'stream'
+import stream from 'node:stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getBlob'
+
 export interface QueryParams {
   /** The DID of the account. */
   did: string
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getBlocks.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getBlocks.ts
index 7fef8b7f64d..f51e262791a 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getBlocks.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getBlocks.ts
@@ -2,13 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import stream from 'stream'
+import stream from 'node:stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getBlocks'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getCheckout.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getCheckout.ts
index 3d519f6916d..571e3a2badd 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getCheckout.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getCheckout.ts
@@ -2,13 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import stream from 'stream'
+import stream from 'node:stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getCheckout'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getHead.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getHead.ts
index d9bb230cef5..f2a144c2675 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getHead.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getHead.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getHead'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   root: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getLatestCommit.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
index 6041841e311..0446f442025 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getLatestCommit'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
@@ -18,7 +22,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cid: string
   rev: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getRecord.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getRecord.ts
index afbd779faf1..1c7a509b1b4 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getRecord.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getRecord.ts
@@ -2,13 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import stream from 'stream'
+import stream from 'node:stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getRecord'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getRepo.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getRepo.ts
index 62a86f56a38..4e62086f457 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getRepo.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getRepo.ts
@@ -2,13 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import express from 'express'
-import stream from 'stream'
+import stream from 'node:stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getRepo'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getRepoStatus.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
index 743bcc45767..e23b538dc38 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getRepoStatus'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
@@ -22,7 +26,6 @@ export interface OutputSchema {
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
   /** Optional field, the current rev of the repo, if active=true */
   rev?: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/listBlobs.ts b/packages/pds/src/lexicon/types/com/atproto/sync/listBlobs.ts
index abb1719f41b..34d8557c3a8 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/listBlobs.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/listBlobs.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.listBlobs'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
@@ -22,7 +26,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   cids: string[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/listRepos.ts b/packages/pds/src/lexicon/types/com/atproto/sync/listRepos.ts
index 228d6a004b5..22d1cfa2db6 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/listRepos.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/listRepos.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.listRepos'
+
 export interface QueryParams {
   limit: number
   cursor?: string
@@ -18,7 +22,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   repos: Repo[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -48,6 +51,7 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface Repo {
+  $type?: 'com.atproto.sync.listRepos#repo'
   did: string
   /** Current repo commit CID */
   head: string
@@ -55,17 +59,14 @@ export interface Repo {
   active?: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
   status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
-export function isRepo(v: unknown): v is Repo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.listRepos#repo'
-  )
+const hashRepo = 'repo'
+
+export function isRepo<V>(v: V) {
+  return is$typed(v, id, hashRepo)
 }
 
-export function validateRepo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.listRepos#repo', v)
+export function validateRepo<V>(v: V) {
+  return validate<Repo & V>(v, id, hashRepo)
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts b/packages/pds/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
index b2d2e6b2e48..1bc47cea7d8 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
@@ -3,17 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.notifyOfUpdate'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   /** Hostname of the current service (usually a PDS) that is notifying of update. */
   hostname: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/requestCrawl.ts b/packages/pds/src/lexicon/types/com/atproto/sync/requestCrawl.ts
index fd54e157b7b..c50adf43847 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/requestCrawl.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/requestCrawl.ts
@@ -3,17 +3,20 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.requestCrawl'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   /** Hostname of the current service (eg, PDS) that is requesting to be crawled. */
   hostname: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/subscribeRepos.ts b/packages/pds/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
index 8f9855a5da4..0cb11e48b86 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
@@ -2,11 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, ErrorFrame } from '@atproto/xrpc-server'
-import { IncomingMessage } from 'http'
+import { IncomingMessage } from 'node:http'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.subscribeRepos'
 
 export interface QueryParams {
   /** The last known event seq number to backfill from. */
@@ -14,14 +18,14 @@ export interface QueryParams {
 }
 
 export type OutputSchema =
-  | Commit
-  | Identity
-  | Account
-  | Handle
-  | Migrate
-  | Tombstone
-  | Info
-  | { $type: string; [k: string]: unknown }
+  | $Typed<Commit>
+  | $Typed<Identity>
+  | $Typed<Account>
+  | $Typed<Handle>
+  | $Typed<Migrate>
+  | $Typed<Tombstone>
+  | $Typed<Info>
+  | { $type: string }
 export type HandlerError = ErrorFrame<'FutureCursor' | 'ConsumerTooSlow'>
 export type HandlerOutput = HandlerError | OutputSchema
 export type HandlerReqCtx<HA extends HandlerAuth = never> = {
@@ -36,6 +40,7 @@ export type Handler<HA extends HandlerAuth = never> = (
 
 /** Represents an update of repository state. Note that empty commits are allowed, which include no repo data changes, but an update to rev and signature. */
 export interface Commit {
+  $type?: 'com.atproto.sync.subscribeRepos#commit'
   /** The stream sequence number of this message. */
   seq: number
   /** DEPRECATED -- unused */
@@ -58,45 +63,41 @@ export interface Commit {
   blobs: CID[]
   /** Timestamp of when this message was originally broadcast. */
   time: string
-  [k: string]: unknown
 }
 
-export function isCommit(v: unknown): v is Commit {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#commit'
-  )
+const hashCommit = 'commit'
+
+export function isCommit<V>(v: V) {
+  return is$typed(v, id, hashCommit)
 }
 
-export function validateCommit(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#commit', v)
+export function validateCommit<V>(v: V) {
+  return validate<Commit & V>(v, id, hashCommit)
 }
 
 /** Represents a change to an account's identity. Could be an updated handle, signing key, or pds hosting endpoint. Serves as a prod to all downstream services to refresh their identity cache. */
 export interface Identity {
+  $type?: 'com.atproto.sync.subscribeRepos#identity'
   seq: number
   did: string
   time: string
   /** The current handle for the account, or 'handle.invalid' if validation fails. This field is optional, might have been validated or passed-through from an upstream source. Semantics and behaviors for PDS vs Relay may evolve in the future; see atproto specs for more details. */
   handle?: string
-  [k: string]: unknown
 }
 
-export function isIdentity(v: unknown): v is Identity {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#identity'
-  )
+const hashIdentity = 'identity'
+
+export function isIdentity<V>(v: V) {
+  return is$typed(v, id, hashIdentity)
 }
 
-export function validateIdentity(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#identity', v)
+export function validateIdentity<V>(v: V) {
+  return validate<Identity & V>(v, id, hashIdentity)
 }
 
 /** Represents a change to an account's status on a host (eg, PDS or Relay). The semantics of this event are that the status is at the host which emitted the event, not necessarily that at the currently active PDS. Eg, a Relay takedown would emit a takedown with active=false, even if the PDS is still active. */
 export interface Account {
+  $type?: 'com.atproto.sync.subscribeRepos#account'
   seq: number
   did: string
   time: string
@@ -104,118 +105,105 @@ export interface Account {
   active: boolean
   /** If active=false, this optional field indicates a reason for why the account is not active. */
   status?: 'takendown' | 'suspended' | 'deleted' | 'deactivated' | (string & {})
-  [k: string]: unknown
 }
 
-export function isAccount(v: unknown): v is Account {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#account'
-  )
+const hashAccount = 'account'
+
+export function isAccount<V>(v: V) {
+  return is$typed(v, id, hashAccount)
 }
 
-export function validateAccount(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#account', v)
+export function validateAccount<V>(v: V) {
+  return validate<Account & V>(v, id, hashAccount)
 }
 
 /** DEPRECATED -- Use #identity event instead */
 export interface Handle {
+  $type?: 'com.atproto.sync.subscribeRepos#handle'
   seq: number
   did: string
   handle: string
   time: string
-  [k: string]: unknown
 }
 
-export function isHandle(v: unknown): v is Handle {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#handle'
-  )
+const hashHandle = 'handle'
+
+export function isHandle<V>(v: V) {
+  return is$typed(v, id, hashHandle)
 }
 
-export function validateHandle(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#handle', v)
+export function validateHandle<V>(v: V) {
+  return validate<Handle & V>(v, id, hashHandle)
 }
 
 /** DEPRECATED -- Use #account event instead */
 export interface Migrate {
+  $type?: 'com.atproto.sync.subscribeRepos#migrate'
   seq: number
   did: string
   migrateTo: string | null
   time: string
-  [k: string]: unknown
 }
 
-export function isMigrate(v: unknown): v is Migrate {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#migrate'
-  )
+const hashMigrate = 'migrate'
+
+export function isMigrate<V>(v: V) {
+  return is$typed(v, id, hashMigrate)
 }
 
-export function validateMigrate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#migrate', v)
+export function validateMigrate<V>(v: V) {
+  return validate<Migrate & V>(v, id, hashMigrate)
 }
 
 /** DEPRECATED -- Use #account event instead */
 export interface Tombstone {
+  $type?: 'com.atproto.sync.subscribeRepos#tombstone'
   seq: number
   did: string
   time: string
-  [k: string]: unknown
 }
 
-export function isTombstone(v: unknown): v is Tombstone {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#tombstone'
-  )
+const hashTombstone = 'tombstone'
+
+export function isTombstone<V>(v: V) {
+  return is$typed(v, id, hashTombstone)
 }
 
-export function validateTombstone(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#tombstone', v)
+export function validateTombstone<V>(v: V) {
+  return validate<Tombstone & V>(v, id, hashTombstone)
 }
 
 export interface Info {
+  $type?: 'com.atproto.sync.subscribeRepos#info'
   name: 'OutdatedCursor' | (string & {})
   message?: string
-  [k: string]: unknown
 }
 
-export function isInfo(v: unknown): v is Info {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#info'
-  )
+const hashInfo = 'info'
+
+export function isInfo<V>(v: V) {
+  return is$typed(v, id, hashInfo)
 }
 
-export function validateInfo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#info', v)
+export function validateInfo<V>(v: V) {
+  return validate<Info & V>(v, id, hashInfo)
 }
 
 /** A repo operation, ie a mutation of a single record. */
 export interface RepoOp {
+  $type?: 'com.atproto.sync.subscribeRepos#repoOp'
   action: 'create' | 'update' | 'delete' | (string & {})
   path: string
   /** For creates and updates, the new record CID. For deletions, null. */
   cid: CID | null
-  [k: string]: unknown
 }
 
-export function isRepoOp(v: unknown): v is RepoOp {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#repoOp'
-  )
+const hashRepoOp = 'repoOp'
+
+export function isRepoOp<V>(v: V) {
+  return is$typed(v, id, hashRepoOp)
 }
 
-export function validateRepoOp(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#repoOp', v)
+export function validateRepoOp<V>(v: V) {
+  return validate<RepoOp & V>(v, id, hashRepoOp)
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/temp/addReservedHandle.ts b/packages/pds/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
index 69be85f72df..78679f078eb 100644
--- a/packages/pds/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
@@ -3,21 +3,22 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.temp.addReservedHandle'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   handle: string
-  [k: string]: unknown
 }
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export interface HandlerInput {
   encoding: 'application/json'
diff --git a/packages/pds/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts b/packages/pds/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
index 9c7ef1ae6ab..375cdcab7d8 100644
--- a/packages/pds/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.temp.checkSignupQueue'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -16,7 +20,6 @@ export interface OutputSchema {
   activated: boolean
   placeInQueue?: number
   estimatedTimeMs?: number
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/temp/fetchLabels.ts b/packages/pds/src/lexicon/types/com/atproto/temp/fetchLabels.ts
index 0392ba06ea2..bda6d96d968 100644
--- a/packages/pds/src/lexicon/types/com/atproto/temp/fetchLabels.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/temp/fetchLabels.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoLabelDefs from '../label/defs'
+import type * as ComAtprotoLabelDefs from '../label/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.temp.fetchLabels'
 
 export interface QueryParams {
   since?: number
@@ -18,7 +22,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   labels: ComAtprotoLabelDefs.Label[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts b/packages/pds/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
index 8ebee2ad46d..f8c12f72948 100644
--- a/packages/pds/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.temp.requestPhoneVerification'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   phoneNumber: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/tools/ozone/communication/createTemplate.ts b/packages/pds/src/lexicon/types/tools/ozone/communication/createTemplate.ts
index 49d46cc6299..1c4bad90748 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/communication/createTemplate.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/communication/createTemplate.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneCommunicationDefs from './defs'
+import type * as ToolsOzoneCommunicationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.communication.createTemplate'
 
 export interface QueryParams {}
 
@@ -22,7 +26,6 @@ export interface InputSchema {
   lang?: string
   /** DID of the user who is creating the template. */
   createdBy?: string
-  [k: string]: unknown
 }
 
 export type OutputSchema = ToolsOzoneCommunicationDefs.TemplateView
diff --git a/packages/pds/src/lexicon/types/tools/ozone/communication/defs.ts b/packages/pds/src/lexicon/types/tools/ozone/communication/defs.ts
index 1342dc3c399..c2346fe3bce 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/communication/defs.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/communication/defs.ts
@@ -2,11 +2,16 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.communication.defs'
 
 export interface TemplateView {
+  $type?: 'tools.ozone.communication.defs#templateView'
   id: string
   /** Name of the template. */
   name: string
@@ -21,17 +26,14 @@ export interface TemplateView {
   lastUpdatedBy: string
   createdAt: string
   updatedAt: string
-  [k: string]: unknown
 }
 
-export function isTemplateView(v: unknown): v is TemplateView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.communication.defs#templateView'
-  )
+const hashTemplateView = 'templateView'
+
+export function isTemplateView<V>(v: V) {
+  return is$typed(v, id, hashTemplateView)
 }
 
-export function validateTemplateView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.communication.defs#templateView', v)
+export function validateTemplateView<V>(v: V) {
+  return validate<TemplateView & V>(v, id, hashTemplateView)
 }
diff --git a/packages/pds/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts b/packages/pds/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts
index d773d84d8e6..43ae07dc711 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.communication.deleteTemplate'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   id: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/tools/ozone/communication/listTemplates.ts b/packages/pds/src/lexicon/types/tools/ozone/communication/listTemplates.ts
index aa2738f5ca2..5a316456f6c 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/communication/listTemplates.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/communication/listTemplates.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneCommunicationDefs from './defs'
+import type * as ToolsOzoneCommunicationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.communication.listTemplates'
 
 export interface QueryParams {}
 
@@ -15,7 +19,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   communicationTemplates: ToolsOzoneCommunicationDefs.TemplateView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/tools/ozone/communication/updateTemplate.ts b/packages/pds/src/lexicon/types/tools/ozone/communication/updateTemplate.ts
index 9f9c532e136..1d56ab55740 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/communication/updateTemplate.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/communication/updateTemplate.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneCommunicationDefs from './defs'
+import type * as ToolsOzoneCommunicationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.communication.updateTemplate'
 
 export interface QueryParams {}
 
@@ -25,7 +29,6 @@ export interface InputSchema {
   /** DID of the user who is updating the template. */
   updatedBy?: string
   disabled?: boolean
-  [k: string]: unknown
 }
 
 export type OutputSchema = ToolsOzoneCommunicationDefs.TemplateView
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts
index 1fb7bf8e25e..611010a42a4 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts
@@ -2,121 +2,119 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
-import * as ChatBskyConvoDefs from '../../../chat/bsky/convo/defs'
-import * as ComAtprotoModerationDefs from '../../../com/atproto/moderation/defs'
-import * as ComAtprotoServerDefs from '../../../com/atproto/server/defs'
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs.js'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
+import type * as ChatBskyConvoDefs from '../../../chat/bsky/convo/defs.js'
+import type * as ComAtprotoModerationDefs from '../../../com/atproto/moderation/defs.js'
+import type * as ComAtprotoServerDefs from '../../../com/atproto/server/defs.js'
+import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.defs'
 
 export interface ModEventView {
+  $type?: 'tools.ozone.moderation.defs#modEventView'
   id: number
   event:
-    | ModEventTakedown
-    | ModEventReverseTakedown
-    | ModEventComment
-    | ModEventReport
-    | ModEventLabel
-    | ModEventAcknowledge
-    | ModEventEscalate
-    | ModEventMute
-    | ModEventUnmute
-    | ModEventMuteReporter
-    | ModEventUnmuteReporter
-    | ModEventEmail
-    | ModEventResolveAppeal
-    | ModEventDivert
-    | ModEventTag
-    | AccountEvent
-    | IdentityEvent
-    | RecordEvent
-    | ModEventPriorityScore
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ModEventTakedown>
+    | $Typed<ModEventReverseTakedown>
+    | $Typed<ModEventComment>
+    | $Typed<ModEventReport>
+    | $Typed<ModEventLabel>
+    | $Typed<ModEventAcknowledge>
+    | $Typed<ModEventEscalate>
+    | $Typed<ModEventMute>
+    | $Typed<ModEventUnmute>
+    | $Typed<ModEventMuteReporter>
+    | $Typed<ModEventUnmuteReporter>
+    | $Typed<ModEventEmail>
+    | $Typed<ModEventResolveAppeal>
+    | $Typed<ModEventDivert>
+    | $Typed<ModEventTag>
+    | $Typed<AccountEvent>
+    | $Typed<IdentityEvent>
+    | $Typed<RecordEvent>
+    | $Typed<ModEventPriorityScore>
+    | { $type: string }
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | ChatBskyConvoDefs.MessageRef
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | $Typed<ChatBskyConvoDefs.MessageRef>
+    | { $type: string }
   subjectBlobCids: string[]
   createdBy: string
   createdAt: string
   creatorHandle?: string
   subjectHandle?: string
-  [k: string]: unknown
 }
 
-export function isModEventView(v: unknown): v is ModEventView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventView'
-  )
+const hashModEventView = 'modEventView'
+
+export function isModEventView<V>(v: V) {
+  return is$typed(v, id, hashModEventView)
 }
 
-export function validateModEventView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventView', v)
+export function validateModEventView<V>(v: V) {
+  return validate<ModEventView & V>(v, id, hashModEventView)
 }
 
 export interface ModEventViewDetail {
+  $type?: 'tools.ozone.moderation.defs#modEventViewDetail'
   id: number
   event:
-    | ModEventTakedown
-    | ModEventReverseTakedown
-    | ModEventComment
-    | ModEventReport
-    | ModEventLabel
-    | ModEventAcknowledge
-    | ModEventEscalate
-    | ModEventMute
-    | ModEventUnmute
-    | ModEventMuteReporter
-    | ModEventUnmuteReporter
-    | ModEventEmail
-    | ModEventResolveAppeal
-    | ModEventDivert
-    | ModEventTag
-    | AccountEvent
-    | IdentityEvent
-    | RecordEvent
-    | ModEventPriorityScore
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ModEventTakedown>
+    | $Typed<ModEventReverseTakedown>
+    | $Typed<ModEventComment>
+    | $Typed<ModEventReport>
+    | $Typed<ModEventLabel>
+    | $Typed<ModEventAcknowledge>
+    | $Typed<ModEventEscalate>
+    | $Typed<ModEventMute>
+    | $Typed<ModEventUnmute>
+    | $Typed<ModEventMuteReporter>
+    | $Typed<ModEventUnmuteReporter>
+    | $Typed<ModEventEmail>
+    | $Typed<ModEventResolveAppeal>
+    | $Typed<ModEventDivert>
+    | $Typed<ModEventTag>
+    | $Typed<AccountEvent>
+    | $Typed<IdentityEvent>
+    | $Typed<RecordEvent>
+    | $Typed<ModEventPriorityScore>
+    | { $type: string }
   subject:
-    | RepoView
-    | RepoViewNotFound
-    | RecordView
-    | RecordViewNotFound
-    | { $type: string; [k: string]: unknown }
+    | $Typed<RepoView>
+    | $Typed<RepoViewNotFound>
+    | $Typed<RecordView>
+    | $Typed<RecordViewNotFound>
+    | { $type: string }
   subjectBlobs: BlobView[]
   createdBy: string
   createdAt: string
-  [k: string]: unknown
 }
 
-export function isModEventViewDetail(v: unknown): v is ModEventViewDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventViewDetail'
-  )
+const hashModEventViewDetail = 'modEventViewDetail'
+
+export function isModEventViewDetail<V>(v: V) {
+  return is$typed(v, id, hashModEventViewDetail)
 }
 
-export function validateModEventViewDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventViewDetail', v)
+export function validateModEventViewDetail<V>(v: V) {
+  return validate<ModEventViewDetail & V>(v, id, hashModEventViewDetail)
 }
 
 export interface SubjectStatusView {
+  $type?: 'tools.ozone.moderation.defs#subjectStatusView'
   id: number
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | { $type: string; [k: string]: unknown }
-  hosting?:
-    | AccountHosting
-    | RecordHosting
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | { $type: string }
+  hosting?: $Typed<AccountHosting> | $Typed<RecordHosting> | { $type: string }
   subjectBlobCids?: string[]
   subjectRepoHandle?: string
   /** Timestamp referencing when the last update was made to the moderation status of the subject */
@@ -142,23 +140,21 @@ export interface SubjectStatusView {
   tags?: string[]
   accountStats?: AccountStats
   recordsStats?: RecordsStats
-  [k: string]: unknown
 }
 
-export function isSubjectStatusView(v: unknown): v is SubjectStatusView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#subjectStatusView'
-  )
+const hashSubjectStatusView = 'subjectStatusView'
+
+export function isSubjectStatusView<V>(v: V) {
+  return is$typed(v, id, hashSubjectStatusView)
 }
 
-export function validateSubjectStatusView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#subjectStatusView', v)
+export function validateSubjectStatusView<V>(v: V) {
+  return validate<SubjectStatusView & V>(v, id, hashSubjectStatusView)
 }
 
 /** Statistics about a particular account subject */
 export interface AccountStats {
+  $type?: 'tools.ozone.moderation.defs#accountStats'
   /** Total number of reports on the account */
   reportCount?: number
   /** Total number of appeals against a moderation action on the account */
@@ -169,23 +165,21 @@ export interface AccountStats {
   escalateCount?: number
   /** Number of times the account was taken down */
   takedownCount?: number
-  [k: string]: unknown
 }
 
-export function isAccountStats(v: unknown): v is AccountStats {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#accountStats'
-  )
+const hashAccountStats = 'accountStats'
+
+export function isAccountStats<V>(v: V) {
+  return is$typed(v, id, hashAccountStats)
 }
 
-export function validateAccountStats(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#accountStats', v)
+export function validateAccountStats<V>(v: V) {
+  return validate<AccountStats & V>(v, id, hashAccountStats)
 }
 
 /** Statistics about a set of record subject items */
 export interface RecordsStats {
+  $type?: 'tools.ozone.moderation.defs#recordsStats'
   /** Cumulative sum of the number of reports on the items in the set */
   totalReports?: number
   /** Number of items that were reported at least once */
@@ -202,19 +196,16 @@ export interface RecordsStats {
   processedCount?: number
   /** Number of item currently taken down */
   takendownCount?: number
-  [k: string]: unknown
 }
 
-export function isRecordsStats(v: unknown): v is RecordsStats {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordsStats'
-  )
+const hashRecordsStats = 'recordsStats'
+
+export function isRecordsStats<V>(v: V) {
+  return is$typed(v, id, hashRecordsStats)
 }
 
-export function validateRecordsStats(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordsStats', v)
+export function validateRecordsStats<V>(v: V) {
+  return validate<RecordsStats & V>(v, id, hashRecordsStats)
 }
 
 export type SubjectReviewState =
@@ -225,16 +216,17 @@ export type SubjectReviewState =
   | (string & {})
 
 /** Moderator review status of a subject: Open. Indicates that the subject needs to be reviewed by a moderator */
-export const REVIEWOPEN = 'tools.ozone.moderation.defs#reviewOpen'
+export const REVIEWOPEN = `${id}#reviewOpen`
 /** Moderator review status of a subject: Escalated. Indicates that the subject was escalated for review by a moderator */
-export const REVIEWESCALATED = 'tools.ozone.moderation.defs#reviewEscalated'
+export const REVIEWESCALATED = `${id}#reviewEscalated`
 /** Moderator review status of a subject: Closed. Indicates that the subject was already reviewed and resolved by a moderator */
-export const REVIEWCLOSED = 'tools.ozone.moderation.defs#reviewClosed'
+export const REVIEWCLOSED = `${id}#reviewClosed`
 /** Moderator review status of a subject: Unnecessary. Indicates that the subject does not need a review at the moment but there is probably some moderation related metadata available for it */
-export const REVIEWNONE = 'tools.ozone.moderation.defs#reviewNone'
+export const REVIEWNONE = `${id}#reviewNone`
 
 /** Take down a subject permanently or temporarily */
 export interface ModEventTakedown {
+  $type?: 'tools.ozone.moderation.defs#modEventTakedown'
   comment?: string
   /** Indicates how long the takedown should be in effect before automatically expiring. */
   durationInHours?: number
@@ -242,344 +234,293 @@ export interface ModEventTakedown {
   acknowledgeAccountSubjects?: boolean
   /** Names/Keywords of the policies that drove the decision. */
   policies?: string[]
-  [k: string]: unknown
 }
 
-export function isModEventTakedown(v: unknown): v is ModEventTakedown {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventTakedown'
-  )
+const hashModEventTakedown = 'modEventTakedown'
+
+export function isModEventTakedown<V>(v: V) {
+  return is$typed(v, id, hashModEventTakedown)
 }
 
-export function validateModEventTakedown(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventTakedown', v)
+export function validateModEventTakedown<V>(v: V) {
+  return validate<ModEventTakedown & V>(v, id, hashModEventTakedown)
 }
 
 /** Revert take down action on a subject */
 export interface ModEventReverseTakedown {
+  $type?: 'tools.ozone.moderation.defs#modEventReverseTakedown'
   /** Describe reasoning behind the reversal. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventReverseTakedown(
-  v: unknown,
-): v is ModEventReverseTakedown {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventReverseTakedown'
-  )
+const hashModEventReverseTakedown = 'modEventReverseTakedown'
+
+export function isModEventReverseTakedown<V>(v: V) {
+  return is$typed(v, id, hashModEventReverseTakedown)
 }
 
-export function validateModEventReverseTakedown(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventReverseTakedown',
+export function validateModEventReverseTakedown<V>(v: V) {
+  return validate<ModEventReverseTakedown & V>(
     v,
+    id,
+    hashModEventReverseTakedown,
   )
 }
 
 /** Resolve appeal on a subject */
 export interface ModEventResolveAppeal {
+  $type?: 'tools.ozone.moderation.defs#modEventResolveAppeal'
   /** Describe resolution. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventResolveAppeal(
-  v: unknown,
-): v is ModEventResolveAppeal {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventResolveAppeal'
-  )
+const hashModEventResolveAppeal = 'modEventResolveAppeal'
+
+export function isModEventResolveAppeal<V>(v: V) {
+  return is$typed(v, id, hashModEventResolveAppeal)
 }
 
-export function validateModEventResolveAppeal(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventResolveAppeal',
-    v,
-  )
+export function validateModEventResolveAppeal<V>(v: V) {
+  return validate<ModEventResolveAppeal & V>(v, id, hashModEventResolveAppeal)
 }
 
 /** Add a comment to a subject */
 export interface ModEventComment {
+  $type?: 'tools.ozone.moderation.defs#modEventComment'
   comment: string
   /** Make the comment persistent on the subject */
   sticky?: boolean
-  [k: string]: unknown
 }
 
-export function isModEventComment(v: unknown): v is ModEventComment {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventComment'
-  )
+const hashModEventComment = 'modEventComment'
+
+export function isModEventComment<V>(v: V) {
+  return is$typed(v, id, hashModEventComment)
 }
 
-export function validateModEventComment(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventComment', v)
+export function validateModEventComment<V>(v: V) {
+  return validate<ModEventComment & V>(v, id, hashModEventComment)
 }
 
 /** Report a subject */
 export interface ModEventReport {
+  $type?: 'tools.ozone.moderation.defs#modEventReport'
   comment?: string
   /** Set to true if the reporter was muted from reporting at the time of the event. These reports won't impact the reviewState of the subject. */
   isReporterMuted?: boolean
   reportType: ComAtprotoModerationDefs.ReasonType
-  [k: string]: unknown
 }
 
-export function isModEventReport(v: unknown): v is ModEventReport {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventReport'
-  )
+const hashModEventReport = 'modEventReport'
+
+export function isModEventReport<V>(v: V) {
+  return is$typed(v, id, hashModEventReport)
 }
 
-export function validateModEventReport(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventReport', v)
+export function validateModEventReport<V>(v: V) {
+  return validate<ModEventReport & V>(v, id, hashModEventReport)
 }
 
 /** Apply/Negate labels on a subject */
 export interface ModEventLabel {
+  $type?: 'tools.ozone.moderation.defs#modEventLabel'
   comment?: string
   createLabelVals: string[]
   negateLabelVals: string[]
   /** Indicates how long the label will remain on the subject. Only applies on labels that are being added. */
   durationInHours?: number
-  [k: string]: unknown
 }
 
-export function isModEventLabel(v: unknown): v is ModEventLabel {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventLabel'
-  )
+const hashModEventLabel = 'modEventLabel'
+
+export function isModEventLabel<V>(v: V) {
+  return is$typed(v, id, hashModEventLabel)
 }
 
-export function validateModEventLabel(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventLabel', v)
+export function validateModEventLabel<V>(v: V) {
+  return validate<ModEventLabel & V>(v, id, hashModEventLabel)
 }
 
 /** Set priority score of the subject. Higher score means higher priority. */
 export interface ModEventPriorityScore {
+  $type?: 'tools.ozone.moderation.defs#modEventPriorityScore'
   comment?: string
   score: number
-  [k: string]: unknown
 }
 
-export function isModEventPriorityScore(
-  v: unknown,
-): v is ModEventPriorityScore {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventPriorityScore'
-  )
+const hashModEventPriorityScore = 'modEventPriorityScore'
+
+export function isModEventPriorityScore<V>(v: V) {
+  return is$typed(v, id, hashModEventPriorityScore)
 }
 
-export function validateModEventPriorityScore(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventPriorityScore',
-    v,
-  )
+export function validateModEventPriorityScore<V>(v: V) {
+  return validate<ModEventPriorityScore & V>(v, id, hashModEventPriorityScore)
 }
 
 export interface ModEventAcknowledge {
+  $type?: 'tools.ozone.moderation.defs#modEventAcknowledge'
   comment?: string
   /** If true, all other reports on content authored by this account will be resolved (acknowledged). */
   acknowledgeAccountSubjects?: boolean
-  [k: string]: unknown
 }
 
-export function isModEventAcknowledge(v: unknown): v is ModEventAcknowledge {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventAcknowledge'
-  )
+const hashModEventAcknowledge = 'modEventAcknowledge'
+
+export function isModEventAcknowledge<V>(v: V) {
+  return is$typed(v, id, hashModEventAcknowledge)
 }
 
-export function validateModEventAcknowledge(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventAcknowledge', v)
+export function validateModEventAcknowledge<V>(v: V) {
+  return validate<ModEventAcknowledge & V>(v, id, hashModEventAcknowledge)
 }
 
 export interface ModEventEscalate {
+  $type?: 'tools.ozone.moderation.defs#modEventEscalate'
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventEscalate(v: unknown): v is ModEventEscalate {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventEscalate'
-  )
+const hashModEventEscalate = 'modEventEscalate'
+
+export function isModEventEscalate<V>(v: V) {
+  return is$typed(v, id, hashModEventEscalate)
 }
 
-export function validateModEventEscalate(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventEscalate', v)
+export function validateModEventEscalate<V>(v: V) {
+  return validate<ModEventEscalate & V>(v, id, hashModEventEscalate)
 }
 
 /** Mute incoming reports on a subject */
 export interface ModEventMute {
+  $type?: 'tools.ozone.moderation.defs#modEventMute'
   comment?: string
   /** Indicates how long the subject should remain muted. */
   durationInHours: number
-  [k: string]: unknown
 }
 
-export function isModEventMute(v: unknown): v is ModEventMute {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventMute'
-  )
+const hashModEventMute = 'modEventMute'
+
+export function isModEventMute<V>(v: V) {
+  return is$typed(v, id, hashModEventMute)
 }
 
-export function validateModEventMute(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventMute', v)
+export function validateModEventMute<V>(v: V) {
+  return validate<ModEventMute & V>(v, id, hashModEventMute)
 }
 
 /** Unmute action on a subject */
 export interface ModEventUnmute {
+  $type?: 'tools.ozone.moderation.defs#modEventUnmute'
   /** Describe reasoning behind the reversal. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventUnmute(v: unknown): v is ModEventUnmute {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventUnmute'
-  )
+const hashModEventUnmute = 'modEventUnmute'
+
+export function isModEventUnmute<V>(v: V) {
+  return is$typed(v, id, hashModEventUnmute)
 }
 
-export function validateModEventUnmute(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventUnmute', v)
+export function validateModEventUnmute<V>(v: V) {
+  return validate<ModEventUnmute & V>(v, id, hashModEventUnmute)
 }
 
 /** Mute incoming reports from an account */
 export interface ModEventMuteReporter {
+  $type?: 'tools.ozone.moderation.defs#modEventMuteReporter'
   comment?: string
   /** Indicates how long the account should remain muted. Falsy value here means a permanent mute. */
   durationInHours?: number
-  [k: string]: unknown
 }
 
-export function isModEventMuteReporter(v: unknown): v is ModEventMuteReporter {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventMuteReporter'
-  )
+const hashModEventMuteReporter = 'modEventMuteReporter'
+
+export function isModEventMuteReporter<V>(v: V) {
+  return is$typed(v, id, hashModEventMuteReporter)
 }
 
-export function validateModEventMuteReporter(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventMuteReporter',
-    v,
-  )
+export function validateModEventMuteReporter<V>(v: V) {
+  return validate<ModEventMuteReporter & V>(v, id, hashModEventMuteReporter)
 }
 
 /** Unmute incoming reports from an account */
 export interface ModEventUnmuteReporter {
+  $type?: 'tools.ozone.moderation.defs#modEventUnmuteReporter'
   /** Describe reasoning behind the reversal. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventUnmuteReporter(
-  v: unknown,
-): v is ModEventUnmuteReporter {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventUnmuteReporter'
-  )
+const hashModEventUnmuteReporter = 'modEventUnmuteReporter'
+
+export function isModEventUnmuteReporter<V>(v: V) {
+  return is$typed(v, id, hashModEventUnmuteReporter)
 }
 
-export function validateModEventUnmuteReporter(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventUnmuteReporter',
-    v,
-  )
+export function validateModEventUnmuteReporter<V>(v: V) {
+  return validate<ModEventUnmuteReporter & V>(v, id, hashModEventUnmuteReporter)
 }
 
 /** Keep a log of outgoing email to a user */
 export interface ModEventEmail {
+  $type?: 'tools.ozone.moderation.defs#modEventEmail'
   /** The subject line of the email sent to the user. */
   subjectLine: string
   /** The content of the email sent to the user. */
   content?: string
   /** Additional comment about the outgoing comm. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventEmail(v: unknown): v is ModEventEmail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventEmail'
-  )
+const hashModEventEmail = 'modEventEmail'
+
+export function isModEventEmail<V>(v: V) {
+  return is$typed(v, id, hashModEventEmail)
 }
 
-export function validateModEventEmail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventEmail', v)
+export function validateModEventEmail<V>(v: V) {
+  return validate<ModEventEmail & V>(v, id, hashModEventEmail)
 }
 
 /** Divert a record's blobs to a 3rd party service for further scanning/tagging */
 export interface ModEventDivert {
+  $type?: 'tools.ozone.moderation.defs#modEventDivert'
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventDivert(v: unknown): v is ModEventDivert {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventDivert'
-  )
+const hashModEventDivert = 'modEventDivert'
+
+export function isModEventDivert<V>(v: V) {
+  return is$typed(v, id, hashModEventDivert)
 }
 
-export function validateModEventDivert(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventDivert', v)
+export function validateModEventDivert<V>(v: V) {
+  return validate<ModEventDivert & V>(v, id, hashModEventDivert)
 }
 
 /** Add/Remove a tag on a subject */
 export interface ModEventTag {
+  $type?: 'tools.ozone.moderation.defs#modEventTag'
   /** Tags to be added to the subject. If already exists, won't be duplicated. */
   add: string[]
   /** Tags to be removed to the subject. Ignores a tag If it doesn't exist, won't be duplicated. */
   remove: string[]
   /** Additional comment about added/removed tags. */
   comment?: string
-  [k: string]: unknown
 }
 
-export function isModEventTag(v: unknown): v is ModEventTag {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventTag'
-  )
+const hashModEventTag = 'modEventTag'
+
+export function isModEventTag<V>(v: V) {
+  return is$typed(v, id, hashModEventTag)
 }
 
-export function validateModEventTag(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventTag', v)
+export function validateModEventTag<V>(v: V) {
+  return validate<ModEventTag & V>(v, id, hashModEventTag)
 }
 
 /** Logs account status related events on a repo subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
 export interface AccountEvent {
+  $type?: 'tools.ozone.moderation.defs#accountEvent'
   comment?: string
   /** Indicates that the account has a repository which can be fetched from the host that emitted this event. */
   active: boolean
@@ -592,69 +533,63 @@ export interface AccountEvent {
     | 'tombstoned'
     | (string & {})
   timestamp: string
-  [k: string]: unknown
 }
 
-export function isAccountEvent(v: unknown): v is AccountEvent {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#accountEvent'
-  )
+const hashAccountEvent = 'accountEvent'
+
+export function isAccountEvent<V>(v: V) {
+  return is$typed(v, id, hashAccountEvent)
 }
 
-export function validateAccountEvent(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#accountEvent', v)
+export function validateAccountEvent<V>(v: V) {
+  return validate<AccountEvent & V>(v, id, hashAccountEvent)
 }
 
 /** Logs identity related events on a repo subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
 export interface IdentityEvent {
+  $type?: 'tools.ozone.moderation.defs#identityEvent'
   comment?: string
   handle?: string
   pdsHost?: string
   tombstone?: boolean
   timestamp: string
-  [k: string]: unknown
 }
 
-export function isIdentityEvent(v: unknown): v is IdentityEvent {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#identityEvent'
-  )
+const hashIdentityEvent = 'identityEvent'
+
+export function isIdentityEvent<V>(v: V) {
+  return is$typed(v, id, hashIdentityEvent)
 }
 
-export function validateIdentityEvent(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#identityEvent', v)
+export function validateIdentityEvent<V>(v: V) {
+  return validate<IdentityEvent & V>(v, id, hashIdentityEvent)
 }
 
 /** Logs lifecycle event on a record subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
 export interface RecordEvent {
+  $type?: 'tools.ozone.moderation.defs#recordEvent'
   comment?: string
   op: 'create' | 'update' | 'delete' | (string & {})
   cid?: string
   timestamp: string
-  [k: string]: unknown
 }
 
-export function isRecordEvent(v: unknown): v is RecordEvent {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordEvent'
-  )
+const hashRecordEvent = 'recordEvent'
+
+export function isRecordEvent<V>(v: V) {
+  return is$typed(v, id, hashRecordEvent)
 }
 
-export function validateRecordEvent(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordEvent', v)
+export function validateRecordEvent<V>(v: V) {
+  return validate<RecordEvent & V>(v, id, hashRecordEvent)
 }
 
 export interface RepoView {
+  $type?: 'tools.ozone.moderation.defs#repoView'
   did: string
   handle: string
   email?: string
-  relatedRecords: {}[]
+  relatedRecords: { [_ in string]: unknown }[]
   indexedAt: string
   moderation: Moderation
   invitedBy?: ComAtprotoServerDefs.InviteCode
@@ -662,26 +597,24 @@ export interface RepoView {
   inviteNote?: string
   deactivatedAt?: string
   threatSignatures?: ComAtprotoAdminDefs.ThreatSignature[]
-  [k: string]: unknown
 }
 
-export function isRepoView(v: unknown): v is RepoView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#repoView'
-  )
+const hashRepoView = 'repoView'
+
+export function isRepoView<V>(v: V) {
+  return is$typed(v, id, hashRepoView)
 }
 
-export function validateRepoView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#repoView', v)
+export function validateRepoView<V>(v: V) {
+  return validate<RepoView & V>(v, id, hashRepoView)
 }
 
 export interface RepoViewDetail {
+  $type?: 'tools.ozone.moderation.defs#repoViewDetail'
   did: string
   handle: string
   email?: string
-  relatedRecords: {}[]
+  relatedRecords: { [_ in string]: unknown }[]
   indexedAt: string
   moderation: ModerationDetail
   labels?: ComAtprotoLabelDefs.Label[]
@@ -692,199 +625,176 @@ export interface RepoViewDetail {
   emailConfirmedAt?: string
   deactivatedAt?: string
   threatSignatures?: ComAtprotoAdminDefs.ThreatSignature[]
-  [k: string]: unknown
 }
 
-export function isRepoViewDetail(v: unknown): v is RepoViewDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#repoViewDetail'
-  )
+const hashRepoViewDetail = 'repoViewDetail'
+
+export function isRepoViewDetail<V>(v: V) {
+  return is$typed(v, id, hashRepoViewDetail)
 }
 
-export function validateRepoViewDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#repoViewDetail', v)
+export function validateRepoViewDetail<V>(v: V) {
+  return validate<RepoViewDetail & V>(v, id, hashRepoViewDetail)
 }
 
 export interface RepoViewNotFound {
+  $type?: 'tools.ozone.moderation.defs#repoViewNotFound'
   did: string
-  [k: string]: unknown
 }
 
-export function isRepoViewNotFound(v: unknown): v is RepoViewNotFound {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#repoViewNotFound'
-  )
+const hashRepoViewNotFound = 'repoViewNotFound'
+
+export function isRepoViewNotFound<V>(v: V) {
+  return is$typed(v, id, hashRepoViewNotFound)
 }
 
-export function validateRepoViewNotFound(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#repoViewNotFound', v)
+export function validateRepoViewNotFound<V>(v: V) {
+  return validate<RepoViewNotFound & V>(v, id, hashRepoViewNotFound)
 }
 
 export interface RecordView {
+  $type?: 'tools.ozone.moderation.defs#recordView'
   uri: string
   cid: string
-  value: {}
+  value: { [_ in string]: unknown }
   blobCids: string[]
   indexedAt: string
   moderation: Moderation
   repo: RepoView
-  [k: string]: unknown
 }
 
-export function isRecordView(v: unknown): v is RecordView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordView'
-  )
+const hashRecordView = 'recordView'
+
+export function isRecordView<V>(v: V) {
+  return is$typed(v, id, hashRecordView)
 }
 
-export function validateRecordView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordView', v)
+export function validateRecordView<V>(v: V) {
+  return validate<RecordView & V>(v, id, hashRecordView)
 }
 
 export interface RecordViewDetail {
+  $type?: 'tools.ozone.moderation.defs#recordViewDetail'
   uri: string
   cid: string
-  value: {}
+  value: { [_ in string]: unknown }
   blobs: BlobView[]
   labels?: ComAtprotoLabelDefs.Label[]
   indexedAt: string
   moderation: ModerationDetail
   repo: RepoView
-  [k: string]: unknown
 }
 
-export function isRecordViewDetail(v: unknown): v is RecordViewDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordViewDetail'
-  )
+const hashRecordViewDetail = 'recordViewDetail'
+
+export function isRecordViewDetail<V>(v: V) {
+  return is$typed(v, id, hashRecordViewDetail)
 }
 
-export function validateRecordViewDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordViewDetail', v)
+export function validateRecordViewDetail<V>(v: V) {
+  return validate<RecordViewDetail & V>(v, id, hashRecordViewDetail)
 }
 
 export interface RecordViewNotFound {
+  $type?: 'tools.ozone.moderation.defs#recordViewNotFound'
   uri: string
-  [k: string]: unknown
 }
 
-export function isRecordViewNotFound(v: unknown): v is RecordViewNotFound {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordViewNotFound'
-  )
+const hashRecordViewNotFound = 'recordViewNotFound'
+
+export function isRecordViewNotFound<V>(v: V) {
+  return is$typed(v, id, hashRecordViewNotFound)
 }
 
-export function validateRecordViewNotFound(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordViewNotFound', v)
+export function validateRecordViewNotFound<V>(v: V) {
+  return validate<RecordViewNotFound & V>(v, id, hashRecordViewNotFound)
 }
 
 export interface Moderation {
+  $type?: 'tools.ozone.moderation.defs#moderation'
   subjectStatus?: SubjectStatusView
-  [k: string]: unknown
 }
 
-export function isModeration(v: unknown): v is Moderation {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#moderation'
-  )
+const hashModeration = 'moderation'
+
+export function isModeration<V>(v: V) {
+  return is$typed(v, id, hashModeration)
 }
 
-export function validateModeration(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#moderation', v)
+export function validateModeration<V>(v: V) {
+  return validate<Moderation & V>(v, id, hashModeration)
 }
 
 export interface ModerationDetail {
+  $type?: 'tools.ozone.moderation.defs#moderationDetail'
   subjectStatus?: SubjectStatusView
-  [k: string]: unknown
 }
 
-export function isModerationDetail(v: unknown): v is ModerationDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#moderationDetail'
-  )
+const hashModerationDetail = 'moderationDetail'
+
+export function isModerationDetail<V>(v: V) {
+  return is$typed(v, id, hashModerationDetail)
 }
 
-export function validateModerationDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#moderationDetail', v)
+export function validateModerationDetail<V>(v: V) {
+  return validate<ModerationDetail & V>(v, id, hashModerationDetail)
 }
 
 export interface BlobView {
+  $type?: 'tools.ozone.moderation.defs#blobView'
   cid: string
   mimeType: string
   size: number
   createdAt: string
-  details?:
-    | ImageDetails
-    | VideoDetails
-    | { $type: string; [k: string]: unknown }
+  details?: $Typed<ImageDetails> | $Typed<VideoDetails> | { $type: string }
   moderation?: Moderation
-  [k: string]: unknown
 }
 
-export function isBlobView(v: unknown): v is BlobView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#blobView'
-  )
+const hashBlobView = 'blobView'
+
+export function isBlobView<V>(v: V) {
+  return is$typed(v, id, hashBlobView)
 }
 
-export function validateBlobView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#blobView', v)
+export function validateBlobView<V>(v: V) {
+  return validate<BlobView & V>(v, id, hashBlobView)
 }
 
 export interface ImageDetails {
+  $type?: 'tools.ozone.moderation.defs#imageDetails'
   width: number
   height: number
-  [k: string]: unknown
 }
 
-export function isImageDetails(v: unknown): v is ImageDetails {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#imageDetails'
-  )
+const hashImageDetails = 'imageDetails'
+
+export function isImageDetails<V>(v: V) {
+  return is$typed(v, id, hashImageDetails)
 }
 
-export function validateImageDetails(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#imageDetails', v)
+export function validateImageDetails<V>(v: V) {
+  return validate<ImageDetails & V>(v, id, hashImageDetails)
 }
 
 export interface VideoDetails {
+  $type?: 'tools.ozone.moderation.defs#videoDetails'
   width: number
   height: number
   length: number
-  [k: string]: unknown
 }
 
-export function isVideoDetails(v: unknown): v is VideoDetails {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#videoDetails'
-  )
+const hashVideoDetails = 'videoDetails'
+
+export function isVideoDetails<V>(v: V) {
+  return is$typed(v, id, hashVideoDetails)
 }
 
-export function validateVideoDetails(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#videoDetails', v)
+export function validateVideoDetails<V>(v: V) {
+  return validate<VideoDetails & V>(v, id, hashVideoDetails)
 }
 
 export interface AccountHosting {
+  $type?: 'tools.ozone.moderation.defs#accountHosting'
   status:
     | 'takendown'
     | 'suspended'
@@ -897,37 +807,32 @@ export interface AccountHosting {
   deletedAt?: string
   deactivatedAt?: string
   reactivatedAt?: string
-  [k: string]: unknown
 }
 
-export function isAccountHosting(v: unknown): v is AccountHosting {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#accountHosting'
-  )
+const hashAccountHosting = 'accountHosting'
+
+export function isAccountHosting<V>(v: V) {
+  return is$typed(v, id, hashAccountHosting)
 }
 
-export function validateAccountHosting(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#accountHosting', v)
+export function validateAccountHosting<V>(v: V) {
+  return validate<AccountHosting & V>(v, id, hashAccountHosting)
 }
 
 export interface RecordHosting {
+  $type?: 'tools.ozone.moderation.defs#recordHosting'
   status: 'deleted' | 'unknown' | (string & {})
   updatedAt?: string
   createdAt?: string
   deletedAt?: string
-  [k: string]: unknown
 }
 
-export function isRecordHosting(v: unknown): v is RecordHosting {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordHosting'
-  )
+const hashRecordHosting = 'recordHosting'
+
+export function isRecordHosting<V>(v: V) {
+  return is$typed(v, id, hashRecordHosting)
 }
 
-export function validateRecordHosting(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordHosting', v)
+export function validateRecordHosting<V>(v: V) {
+  return validate<RecordHosting & V>(v, id, hashRecordHosting)
 }
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/emitEvent.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
index 8f0f00e98f8..1fa8d586491 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
@@ -3,44 +3,47 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
-import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
-import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import type * as ToolsOzoneModerationDefs from './defs.js'
+import type * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs.js'
+import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.emitEvent'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   event:
-    | ToolsOzoneModerationDefs.ModEventTakedown
-    | ToolsOzoneModerationDefs.ModEventAcknowledge
-    | ToolsOzoneModerationDefs.ModEventEscalate
-    | ToolsOzoneModerationDefs.ModEventComment
-    | ToolsOzoneModerationDefs.ModEventLabel
-    | ToolsOzoneModerationDefs.ModEventReport
-    | ToolsOzoneModerationDefs.ModEventMute
-    | ToolsOzoneModerationDefs.ModEventUnmute
-    | ToolsOzoneModerationDefs.ModEventMuteReporter
-    | ToolsOzoneModerationDefs.ModEventUnmuteReporter
-    | ToolsOzoneModerationDefs.ModEventReverseTakedown
-    | ToolsOzoneModerationDefs.ModEventResolveAppeal
-    | ToolsOzoneModerationDefs.ModEventEmail
-    | ToolsOzoneModerationDefs.ModEventTag
-    | ToolsOzoneModerationDefs.AccountEvent
-    | ToolsOzoneModerationDefs.IdentityEvent
-    | ToolsOzoneModerationDefs.RecordEvent
-    | ToolsOzoneModerationDefs.ModEventPriorityScore
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ToolsOzoneModerationDefs.ModEventTakedown>
+    | $Typed<ToolsOzoneModerationDefs.ModEventAcknowledge>
+    | $Typed<ToolsOzoneModerationDefs.ModEventEscalate>
+    | $Typed<ToolsOzoneModerationDefs.ModEventComment>
+    | $Typed<ToolsOzoneModerationDefs.ModEventLabel>
+    | $Typed<ToolsOzoneModerationDefs.ModEventReport>
+    | $Typed<ToolsOzoneModerationDefs.ModEventMute>
+    | $Typed<ToolsOzoneModerationDefs.ModEventUnmute>
+    | $Typed<ToolsOzoneModerationDefs.ModEventMuteReporter>
+    | $Typed<ToolsOzoneModerationDefs.ModEventUnmuteReporter>
+    | $Typed<ToolsOzoneModerationDefs.ModEventReverseTakedown>
+    | $Typed<ToolsOzoneModerationDefs.ModEventResolveAppeal>
+    | $Typed<ToolsOzoneModerationDefs.ModEventEmail>
+    | $Typed<ToolsOzoneModerationDefs.ModEventTag>
+    | $Typed<ToolsOzoneModerationDefs.AccountEvent>
+    | $Typed<ToolsOzoneModerationDefs.IdentityEvent>
+    | $Typed<ToolsOzoneModerationDefs.RecordEvent>
+    | $Typed<ToolsOzoneModerationDefs.ModEventPriorityScore>
+    | { $type: string }
   subject:
-    | ComAtprotoAdminDefs.RepoRef
-    | ComAtprotoRepoStrongRef.Main
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ComAtprotoAdminDefs.RepoRef>
+    | $Typed<ComAtprotoRepoStrongRef.Main>
+    | { $type: string }
   subjectBlobCids?: string[]
   createdBy: string
-  [k: string]: unknown
 }
 
 export type OutputSchema = ToolsOzoneModerationDefs.ModEventView
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/getEvent.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/getEvent.ts
index c7e1b5943f3..fc89a911503 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/getEvent.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/getEvent.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
+import type * as ToolsOzoneModerationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.getEvent'
 
 export interface QueryParams {
   id: number
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecord.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecord.ts
index 67eca72d05f..f11d70fdb65 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecord.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecord.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
+import type * as ToolsOzoneModerationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.getRecord'
 
 export interface QueryParams {
   uri: string
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecords.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecords.ts
index 46e11ef48e3..b6f214ccaee 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecords.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecords.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
+import type * as ToolsOzoneModerationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.getRecords'
 
 export interface QueryParams {
   uris: string[]
@@ -17,11 +21,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   records: (
-    | ToolsOzoneModerationDefs.RecordViewDetail
-    | ToolsOzoneModerationDefs.RecordViewNotFound
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ToolsOzoneModerationDefs.RecordViewDetail>
+    | $Typed<ToolsOzoneModerationDefs.RecordViewNotFound>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepo.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepo.ts
index ff675e577dc..123ae28b45c 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepo.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepo.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
+import type * as ToolsOzoneModerationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.getRepo'
 
 export interface QueryParams {
   did: string
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepos.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepos.ts
index f113ef4395c..c1788f74877 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepos.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepos.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
+import type * as ToolsOzoneModerationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.getRepos'
 
 export interface QueryParams {
   dids: string[]
@@ -17,11 +21,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   repos: (
-    | ToolsOzoneModerationDefs.RepoViewDetail
-    | ToolsOzoneModerationDefs.RepoViewNotFound
-    | { $type: string; [k: string]: unknown }
+    | $Typed<ToolsOzoneModerationDefs.RepoViewDetail>
+    | $Typed<ToolsOzoneModerationDefs.RepoViewNotFound>
+    | { $type: string }
   )[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/queryEvents.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/queryEvents.ts
index c29249690d4..aab72d7e27b 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/queryEvents.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/queryEvents.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
+import type * as ToolsOzoneModerationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.queryEvents'
 
 export interface QueryParams {
   /** The types of events (fully qualified string in the format of tools.ozone.moderation.defs#modEvent<name>) to filter by. If not specified, all events are returned. */
@@ -49,7 +53,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   events: ToolsOzoneModerationDefs.ModEventView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
index 8e79b023c4c..118da702a56 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
+import type * as ToolsOzoneModerationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.queryStatuses'
 
 export interface QueryParams {
   /** Number of queues being used by moderators. Subjects will be split among all queues. */
@@ -83,7 +87,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   subjectStatuses: ToolsOzoneModerationDefs.SubjectStatusView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/searchRepos.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/searchRepos.ts
index 2aca4ee5a97..fcfd429463d 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/searchRepos.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/searchRepos.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneModerationDefs from './defs'
+import type * as ToolsOzoneModerationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.searchRepos'
 
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead */
@@ -22,7 +26,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   repos: ToolsOzoneModerationDefs.RepoView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/tools/ozone/server/getConfig.ts b/packages/pds/src/lexicon/types/tools/ozone/server/getConfig.ts
index 78ac5c2fb85..7e17aecae6e 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/server/getConfig.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/server/getConfig.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.server.getConfig'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -18,7 +22,6 @@ export interface OutputSchema {
   blobDivert?: ServiceConfig
   chat?: ServiceConfig
   viewer?: ViewerConfig
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -48,39 +51,35 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface ServiceConfig {
+  $type?: 'tools.ozone.server.getConfig#serviceConfig'
   url?: string
-  [k: string]: unknown
 }
 
-export function isServiceConfig(v: unknown): v is ServiceConfig {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.server.getConfig#serviceConfig'
-  )
+const hashServiceConfig = 'serviceConfig'
+
+export function isServiceConfig<V>(v: V) {
+  return is$typed(v, id, hashServiceConfig)
 }
 
-export function validateServiceConfig(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.server.getConfig#serviceConfig', v)
+export function validateServiceConfig<V>(v: V) {
+  return validate<ServiceConfig & V>(v, id, hashServiceConfig)
 }
 
 export interface ViewerConfig {
+  $type?: 'tools.ozone.server.getConfig#viewerConfig'
   role?:
     | 'tools.ozone.team.defs#roleAdmin'
     | 'tools.ozone.team.defs#roleModerator'
     | 'tools.ozone.team.defs#roleTriage'
     | (string & {})
-  [k: string]: unknown
 }
 
-export function isViewerConfig(v: unknown): v is ViewerConfig {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.server.getConfig#viewerConfig'
-  )
+const hashViewerConfig = 'viewerConfig'
+
+export function isViewerConfig<V>(v: V) {
+  return is$typed(v, id, hashViewerConfig)
 }
 
-export function validateViewerConfig(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.server.getConfig#viewerConfig', v)
+export function validateViewerConfig<V>(v: V) {
+  return validate<ViewerConfig & V>(v, id, hashViewerConfig)
 }
diff --git a/packages/pds/src/lexicon/types/tools/ozone/set/addValues.ts b/packages/pds/src/lexicon/types/tools/ozone/set/addValues.ts
index 41ae9830f30..3d98cb52514 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/addValues.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/addValues.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.set.addValues'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -15,7 +19,6 @@ export interface InputSchema {
   name: string
   /** Array of string values to add to the set */
   values: string[]
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/tools/ozone/set/defs.ts b/packages/pds/src/lexicon/types/tools/ozone/set/defs.ts
index 4256bf8a90f..ac1db2d6ada 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/defs.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/defs.ts
@@ -2,43 +2,45 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.set.defs'
 
 export interface Set {
+  $type?: 'tools.ozone.set.defs#set'
   name: string
   description?: string
-  [k: string]: unknown
 }
 
-export function isSet(v: unknown): v is Set {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'tools.ozone.set.defs#set'
-  )
+const hashSet = 'set'
+
+export function isSet<V>(v: V) {
+  return is$typed(v, id, hashSet)
 }
 
-export function validateSet(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.set.defs#set', v)
+export function validateSet<V>(v: V) {
+  return validate<Set & V>(v, id, hashSet)
 }
 
 export interface SetView {
+  $type?: 'tools.ozone.set.defs#setView'
   name: string
   description?: string
   setSize: number
   createdAt: string
   updatedAt: string
-  [k: string]: unknown
 }
 
-export function isSetView(v: unknown): v is SetView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.set.defs#setView'
-  )
+const hashSetView = 'setView'
+
+export function isSetView<V>(v: V) {
+  return is$typed(v, id, hashSetView)
 }
 
-export function validateSetView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.set.defs#setView', v)
+export function validateSetView<V>(v: V) {
+  return validate<SetView & V>(v, id, hashSetView)
 }
diff --git a/packages/pds/src/lexicon/types/tools/ozone/set/deleteSet.ts b/packages/pds/src/lexicon/types/tools/ozone/set/deleteSet.ts
index 4612b73d044..51d6d2043a4 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/deleteSet.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/deleteSet.ts
@@ -3,22 +3,23 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.set.deleteSet'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   /** Name of the set to delete */
   name: string
-  [k: string]: unknown
 }
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export interface HandlerInput {
   encoding: 'application/json'
diff --git a/packages/pds/src/lexicon/types/tools/ozone/set/deleteValues.ts b/packages/pds/src/lexicon/types/tools/ozone/set/deleteValues.ts
index f0a18ff3b26..219a9591eab 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/deleteValues.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/deleteValues.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.set.deleteValues'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -15,7 +19,6 @@ export interface InputSchema {
   name: string
   /** Array of string values to delete from the set */
   values: string[]
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/tools/ozone/set/getValues.ts b/packages/pds/src/lexicon/types/tools/ozone/set/getValues.ts
index d6f3af9e43e..0f360892b77 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/getValues.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/getValues.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneSetDefs from './defs'
+import type * as ToolsOzoneSetDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.set.getValues'
 
 export interface QueryParams {
   name: string
@@ -21,7 +25,6 @@ export interface OutputSchema {
   set: ToolsOzoneSetDefs.SetView
   values: string[]
   cursor?: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/tools/ozone/set/querySets.ts b/packages/pds/src/lexicon/types/tools/ozone/set/querySets.ts
index a1fe230268e..4bb0d21030e 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/querySets.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/querySets.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneSetDefs from './defs'
+import type * as ToolsOzoneSetDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.set.querySets'
 
 export interface QueryParams {
   limit: number
@@ -23,7 +27,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   sets: ToolsOzoneSetDefs.SetView[]
   cursor?: string
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/tools/ozone/set/upsertSet.ts b/packages/pds/src/lexicon/types/tools/ozone/set/upsertSet.ts
index 843ad1029db..a50e25e2549 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/upsertSet.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/upsertSet.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneSetDefs from './defs'
+import type * as ToolsOzoneSetDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.set.upsertSet'
 
 export interface QueryParams {}
 
diff --git a/packages/pds/src/lexicon/types/tools/ozone/setting/defs.ts b/packages/pds/src/lexicon/types/tools/ozone/setting/defs.ts
index 8a87cbb0e24..a17c778d26c 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/setting/defs.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/setting/defs.ts
@@ -2,14 +2,19 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.setting.defs'
 
 export interface Option {
+  $type?: 'tools.ozone.setting.defs#option'
   key: string
   did: string
-  value: {}
+  value: { [_ in string]: unknown }
   description?: string
   createdAt?: string
   updatedAt?: string
@@ -21,17 +26,14 @@ export interface Option {
   scope: 'instance' | 'personal' | (string & {})
   createdBy: string
   lastUpdatedBy: string
-  [k: string]: unknown
 }
 
-export function isOption(v: unknown): v is Option {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.setting.defs#option'
-  )
+const hashOption = 'option'
+
+export function isOption<V>(v: V) {
+  return is$typed(v, id, hashOption)
 }
 
-export function validateOption(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.setting.defs#option', v)
+export function validateOption<V>(v: V) {
+  return validate<Option & V>(v, id, hashOption)
 }
diff --git a/packages/pds/src/lexicon/types/tools/ozone/setting/listOptions.ts b/packages/pds/src/lexicon/types/tools/ozone/setting/listOptions.ts
index 464cdf7c50b..f2b736a459f 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/setting/listOptions.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/setting/listOptions.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneSettingDefs from './defs'
+import type * as ToolsOzoneSettingDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.setting.listOptions'
 
 export interface QueryParams {
   limit: number
@@ -24,7 +28,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   options: ToolsOzoneSettingDefs.Option[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/tools/ozone/setting/removeOptions.ts b/packages/pds/src/lexicon/types/tools/ozone/setting/removeOptions.ts
index 3aa323a7fa6..98192dd3498 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/setting/removeOptions.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/setting/removeOptions.ts
@@ -3,22 +3,23 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.setting.removeOptions'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   keys: string[]
   scope: 'instance' | 'personal' | (string & {})
-  [k: string]: unknown
 }
 
-export interface OutputSchema {
-  [k: string]: unknown
-}
+export interface OutputSchema {}
 
 export interface HandlerInput {
   encoding: 'application/json'
diff --git a/packages/pds/src/lexicon/types/tools/ozone/setting/upsertOption.ts b/packages/pds/src/lexicon/types/tools/ozone/setting/upsertOption.ts
index ee541ffe817..b57934bb8bc 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/setting/upsertOption.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/setting/upsertOption.ts
@@ -3,30 +3,32 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneSettingDefs from './defs'
+import type * as ToolsOzoneSettingDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.setting.upsertOption'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   key: string
   scope: 'instance' | 'personal' | (string & {})
-  value: {}
+  value: { [_ in string]: unknown }
   description?: string
   managerRole?:
     | 'tools.ozone.team.defs#roleModerator'
     | 'tools.ozone.team.defs#roleTriage'
     | 'tools.ozone.team.defs#roleAdmin'
     | (string & {})
-  [k: string]: unknown
 }
 
 export interface OutputSchema {
   option: ToolsOzoneSettingDefs.Option
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/tools/ozone/signature/defs.ts b/packages/pds/src/lexicon/types/tools/ozone/signature/defs.ts
index 2c9d9604aaa..bc862a6f312 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/signature/defs.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/signature/defs.ts
@@ -2,24 +2,26 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.signature.defs'
 
 export interface SigDetail {
+  $type?: 'tools.ozone.signature.defs#sigDetail'
   property: string
   value: string
-  [k: string]: unknown
 }
 
-export function isSigDetail(v: unknown): v is SigDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.signature.defs#sigDetail'
-  )
+const hashSigDetail = 'sigDetail'
+
+export function isSigDetail<V>(v: V) {
+  return is$typed(v, id, hashSigDetail)
 }
 
-export function validateSigDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.signature.defs#sigDetail', v)
+export function validateSigDetail<V>(v: V) {
+  return validate<SigDetail & V>(v, id, hashSigDetail)
 }
diff --git a/packages/pds/src/lexicon/types/tools/ozone/signature/findCorrelation.ts b/packages/pds/src/lexicon/types/tools/ozone/signature/findCorrelation.ts
index f12bdf6a04f..7387912d7db 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/signature/findCorrelation.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/signature/findCorrelation.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneSignatureDefs from './defs'
+import type * as ToolsOzoneSignatureDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.signature.findCorrelation'
 
 export interface QueryParams {
   dids: string[]
@@ -17,7 +21,6 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   details: ToolsOzoneSignatureDefs.SigDetail[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts b/packages/pds/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts
index b4773ac2e20..47eaca37c23 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts
@@ -3,12 +3,16 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
-import * as ToolsOzoneSignatureDefs from './defs'
+import type * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs.js'
+import type * as ToolsOzoneSignatureDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.signature.findRelatedAccounts'
 
 export interface QueryParams {
   did: string
@@ -21,7 +25,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   accounts: RelatedAccount[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
@@ -51,22 +54,17 @@ export type Handler<HA extends HandlerAuth = never> = (
 ) => Promise<HandlerOutput> | HandlerOutput
 
 export interface RelatedAccount {
+  $type?: 'tools.ozone.signature.findRelatedAccounts#relatedAccount'
   account: ComAtprotoAdminDefs.AccountView
   similarities?: ToolsOzoneSignatureDefs.SigDetail[]
-  [k: string]: unknown
 }
 
-export function isRelatedAccount(v: unknown): v is RelatedAccount {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.signature.findRelatedAccounts#relatedAccount'
-  )
+const hashRelatedAccount = 'relatedAccount'
+
+export function isRelatedAccount<V>(v: V) {
+  return is$typed(v, id, hashRelatedAccount)
 }
 
-export function validateRelatedAccount(v: unknown): ValidationResult {
-  return lexicons.validate(
-    'tools.ozone.signature.findRelatedAccounts#relatedAccount',
-    v,
-  )
+export function validateRelatedAccount<V>(v: V) {
+  return validate<RelatedAccount & V>(v, id, hashRelatedAccount)
 }
diff --git a/packages/pds/src/lexicon/types/tools/ozone/signature/searchAccounts.ts b/packages/pds/src/lexicon/types/tools/ozone/signature/searchAccounts.ts
index ad1f3f3c3b8..d75bf7db15c 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/signature/searchAccounts.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/signature/searchAccounts.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
+import type * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.signature.searchAccounts'
 
 export interface QueryParams {
   values: string[]
@@ -20,7 +24,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   accounts: ComAtprotoAdminDefs.AccountView[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/tools/ozone/team/addMember.ts b/packages/pds/src/lexicon/types/tools/ozone/team/addMember.ts
index ad33479adcf..a1250fee4a0 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/team/addMember.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/team/addMember.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneTeamDefs from './defs'
+import type * as ToolsOzoneTeamDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.team.addMember'
 
 export interface QueryParams {}
 
@@ -18,7 +22,6 @@ export interface InputSchema {
     | 'tools.ozone.team.defs#roleModerator'
     | 'tools.ozone.team.defs#roleTriage'
     | (string & {})
-  [k: string]: unknown
 }
 
 export type OutputSchema = ToolsOzoneTeamDefs.Member
diff --git a/packages/pds/src/lexicon/types/tools/ozone/team/defs.ts b/packages/pds/src/lexicon/types/tools/ozone/team/defs.ts
index b670ecc0a70..19c81550218 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/team/defs.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/team/defs.ts
@@ -2,12 +2,17 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as AppBskyActorDefs from '../../../app/bsky/actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.team.defs'
 
 export interface Member {
+  $type?: 'tools.ozone.team.defs#member'
   did: string
   disabled?: boolean
   profile?: AppBskyActorDefs.ProfileViewDetailed
@@ -19,24 +24,21 @@ export interface Member {
     | 'lex:tools.ozone.team.defs#roleModerator'
     | 'lex:tools.ozone.team.defs#roleTriage'
     | (string & {})
-  [k: string]: unknown
 }
 
-export function isMember(v: unknown): v is Member {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.team.defs#member'
-  )
+const hashMember = 'member'
+
+export function isMember<V>(v: V) {
+  return is$typed(v, id, hashMember)
 }
 
-export function validateMember(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.team.defs#member', v)
+export function validateMember<V>(v: V) {
+  return validate<Member & V>(v, id, hashMember)
 }
 
 /** Admin role. Highest level of access, can perform all actions. */
-export const ROLEADMIN = 'tools.ozone.team.defs#roleAdmin'
+export const ROLEADMIN = `${id}#roleAdmin`
 /** Moderator role. Can perform most actions. */
-export const ROLEMODERATOR = 'tools.ozone.team.defs#roleModerator'
+export const ROLEMODERATOR = `${id}#roleModerator`
 /** Triage role. Mostly intended for monitoring and escalating issues. */
-export const ROLETRIAGE = 'tools.ozone.team.defs#roleTriage'
+export const ROLETRIAGE = `${id}#roleTriage`
diff --git a/packages/pds/src/lexicon/types/tools/ozone/team/deleteMember.ts b/packages/pds/src/lexicon/types/tools/ozone/team/deleteMember.ts
index 14f0265fd6f..6f4722168d8 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/team/deleteMember.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/team/deleteMember.ts
@@ -3,16 +3,19 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.team.deleteMember'
+
 export interface QueryParams {}
 
 export interface InputSchema {
   did: string
-  [k: string]: unknown
 }
 
 export interface HandlerInput {
diff --git a/packages/pds/src/lexicon/types/tools/ozone/team/listMembers.ts b/packages/pds/src/lexicon/types/tools/ozone/team/listMembers.ts
index 813e86e9b16..8488cb9b54c 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/team/listMembers.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/team/listMembers.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneTeamDefs from './defs'
+import type * as ToolsOzoneTeamDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.team.listMembers'
 
 export interface QueryParams {
   limit: number
@@ -19,7 +23,6 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   members: ToolsOzoneTeamDefs.Member[]
-  [k: string]: unknown
 }
 
 export type HandlerInput = undefined
diff --git a/packages/pds/src/lexicon/types/tools/ozone/team/updateMember.ts b/packages/pds/src/lexicon/types/tools/ozone/team/updateMember.ts
index 4c343144a1b..d2175d3c97d 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/team/updateMember.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/team/updateMember.ts
@@ -3,11 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ToolsOzoneTeamDefs from './defs'
+import type * as ToolsOzoneTeamDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.team.updateMember'
 
 export interface QueryParams {}
 
@@ -19,7 +23,6 @@ export interface InputSchema {
     | 'tools.ozone.team.defs#roleModerator'
     | 'tools.ozone.team.defs#roleTriage'
     | (string & {})
-  [k: string]: unknown
 }
 
 export type OutputSchema = ToolsOzoneTeamDefs.Member
diff --git a/packages/pds/src/lexicon/util.ts b/packages/pds/src/lexicon/util.ts
index d7e70440d6e..7f88b6a6ef3 100644
--- a/packages/pds/src/lexicon/util.ts
+++ b/packages/pds/src/lexicon/util.ts
@@ -1,13 +1,82 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
-export function isObj(v: unknown): v is Record<string, unknown> {
-  return typeof v === 'object' && v !== null
+
+import { 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 function hasProp<K extends PropertyKey>(
-  data: object,
-  prop: K,
-): data is Record<K, unknown> {
-  return prop in data
+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/packages/pds/src/pipethrough.ts b/packages/pds/src/pipethrough.ts
index a10133fee62..58b88ffc727 100644
--- a/packages/pds/src/pipethrough.ts
+++ b/packages/pds/src/pipethrough.ts
@@ -472,7 +472,7 @@ function* responseHeaders(
 // Utils
 // -------------------
 
-export const PRIVILEGED_METHODS = new Set([
+export const PRIVILEGED_METHODS = new Set<string>([
   ids.ChatBskyActorDeleteAccount,
   ids.ChatBskyActorExportAccountData,
   ids.ChatBskyConvoDeleteMessageForSelf,
@@ -493,7 +493,7 @@ export const PRIVILEGED_METHODS = new Set([
 // These endpoints are related to account management and must be used directly,
 // not proxied or service-authed. Service auth may be utilized between PDS and
 // entryway for these methods.
-export const PROTECTED_METHODS = new Set([
+export const PROTECTED_METHODS = new Set<string>([
   ids.ComAtprotoAdminSendEmail,
   ids.ComAtprotoIdentityRequestPlcOperationSignature,
   ids.ComAtprotoIdentitySignPlcOperation,
diff --git a/packages/pds/src/read-after-write/viewer.ts b/packages/pds/src/read-after-write/viewer.ts
index 9fc649a0c70..c71e20e0911 100644
--- a/packages/pds/src/read-after-write/viewer.ts
+++ b/packages/pds/src/read-after-write/viewer.ts
@@ -13,10 +13,12 @@ import {
 import { Record as ProfileRecord } from '../lexicon/types/app/bsky/actor/profile'
 import {
   Main as EmbedExternal,
+  View as EmbedExternalView,
   isMain as isEmbedExternal,
 } from '../lexicon/types/app/bsky/embed/external'
 import {
   Main as EmbedImages,
+  View as EmbedImagesView,
   isMain as isEmbedImages,
 } from '../lexicon/types/app/bsky/embed/images'
 import {
@@ -36,6 +38,7 @@ import {
 } from '../lexicon/types/app/bsky/feed/defs'
 import { Record as PostRecord } from '../lexicon/types/app/bsky/feed/post'
 import { ListView } from '../lexicon/types/app/bsky/graph/defs'
+import { $Typed } from '../lexicon/util'
 import { LocalRecords, RecordDescript } from './types'
 
 type CommonSignedUris = 'avatar' | 'banner' | 'feed_thumbnail' | 'feed_fullsize'
@@ -167,7 +170,9 @@ export class LocalViewer {
     }
   }
 
-  async formatSimpleEmbed(embed: EmbedImages | EmbedExternal) {
+  async formatSimpleEmbed(
+    embed: $Typed<EmbedImages> | $Typed<EmbedExternal>,
+  ): Promise<$Typed<EmbedImagesView> | $Typed<EmbedExternalView>> {
     if (isEmbedImages(embed)) {
       const images = embed.images.map((img) => ({
         thumb: this.getImageUrl('feed_thumbnail', img.image.ref.toString()),
@@ -179,7 +184,7 @@ export class LocalViewer {
         $type: 'app.bsky.embed.images#view',
         images,
       }
-    } else {
+    } else if (isEmbedExternal(embed)) {
       const { uri, title, description, thumb } = embed.external
       return {
         $type: 'app.bsky.embed.external#view',
@@ -192,10 +197,15 @@ export class LocalViewer {
             : undefined,
         },
       }
+    } else {
+      // @ts-expect-error
+      throw new TypeError(`Unexpected embed type: ${embed.$type}`)
     }
   }
 
-  async formatRecordEmbed(embed: EmbedRecord): Promise<EmbedRecordView> {
+  async formatRecordEmbed(
+    embed: EmbedRecord,
+  ): Promise<$Typed<EmbedRecordView>> {
     const view = await this.formatRecordEmbedInternal(embed)
     return {
       $type: 'app.bsky.embed.record#view',
@@ -211,7 +221,9 @@ export class LocalViewer {
 
   private async formatRecordEmbedInternal(
     embed: EmbedRecord,
-  ): Promise<null | ViewRecord | GeneratorView | ListView> {
+  ): Promise<
+    null | $Typed<ViewRecord> | $Typed<GeneratorView> | $Typed<ListView>
+  > {
     if (!this.bskyAppView) {
       return null
     }
@@ -271,10 +283,9 @@ export class LocalViewer {
     }
   }
 
-  updateProfileViewBasic(
-    view: ProfileViewBasic,
-    record: ProfileRecord,
-  ): ProfileViewBasic {
+  updateProfileViewBasic<
+    T extends ProfileViewDetailed | ProfileViewBasic | ProfileView,
+  >(view: T, record: ProfileRecord): T {
     return {
       ...view,
       displayName: record.displayName,
@@ -284,17 +295,19 @@ export class LocalViewer {
     }
   }
 
-  updateProfileView(view: ProfileView, record: ProfileRecord): ProfileView {
+  updateProfileView<
+    T extends ProfileViewDetailed | ProfileViewBasic | ProfileView,
+  >(view: T, record: ProfileRecord): T {
     return {
       ...this.updateProfileViewBasic(view, record),
       description: record.description,
     }
   }
 
-  updateProfileDetailed(
-    view: ProfileViewDetailed,
+  updateProfileDetailed<T extends ProfileViewDetailed>(
+    view: T,
     record: ProfileRecord,
-  ): ProfileViewDetailed {
+  ): T {
     return {
       ...this.updateProfileView(view, record),
       banner: record.banner
diff --git a/packages/pds/src/repo/prepare.ts b/packages/pds/src/repo/prepare.ts
index eb86f4e9537..6fcea2f00dc 100644
--- a/packages/pds/src/repo/prepare.ts
+++ b/packages/pds/src/repo/prepare.ts
@@ -24,12 +24,13 @@ import {
 } from '@atproto/syntax'
 import { hasExplicitSlur } from '../handle/explicit-slurs'
 import * as lex from '../lexicon/lexicons'
-import { isRecord as isProfile } from '../lexicon/types/app/bsky/actor/profile'
-import { isRecord as isFeedGenerator } from '../lexicon/types/app/bsky/feed/generator'
-import { isRecord as isPost } from '../lexicon/types/app/bsky/feed/post'
-import { isRecord as isList } from '../lexicon/types/app/bsky/graph/list'
-import { isRecord as isStarterPack } from '../lexicon/types/app/bsky/graph/starterpack'
+import * as AppBskyActorProfile from '../lexicon/types/app/bsky/actor/profile'
+import * as AppBskyFeedGenerator from '../lexicon/types/app/bsky/feed/generator'
+import * as AppBskyFeedPost from '../lexicon/types/app/bsky/feed/post'
+import * as AppBskyGraphList from '../lexicon/types/app/bsky/graph/list'
+import * as AppBskyGraphStarterpack from '../lexicon/types/app/bsky/graph/starterpack'
 import { isTag } from '../lexicon/types/app/bsky/richtext/facet'
+import { asPredicate } from '../lexicon/util'
 import {
   InvalidRecordError,
   PreparedBlobRef,
@@ -40,6 +41,12 @@ import {
   ValidationStatus,
 } from './types'
 
+const isValidFeedGenerator = asPredicate(AppBskyFeedGenerator.validateRecord)
+const isValidStarterPack = asPredicate(AppBskyGraphStarterpack.validateRecord)
+const isValidPost = asPredicate(AppBskyFeedPost.validateRecord)
+const isValidList = asPredicate(AppBskyGraphList.validateRecord)
+const isValidProfile = asPredicate(AppBskyActorProfile.validateRecord)
+
 export const assertValidRecordWithStatus = (
   record: Record<string, unknown>,
   opts: { requireLexicon: boolean },
@@ -222,30 +229,31 @@ async function cidForSafeRecord(record: RepoRecord) {
 }
 
 function assertNoExplicitSlurs(rkey: string, record: RepoRecord) {
-  let toCheck = ''
-  if (isProfile(record)) {
-    toCheck += ' ' + record.displayName
-  } else if (isList(record)) {
-    toCheck += ' ' + record.name
-  } else if (isStarterPack(record)) {
-    toCheck += ' ' + record.name
-  } else if (isFeedGenerator(record)) {
-    toCheck += ' ' + rkey
-    toCheck += ' ' + record.displayName
-  } else if (isPost(record)) {
+  const toCheck: string[] = []
+
+  if (isValidProfile(record)) {
+    if (record.displayName) toCheck.push(record.displayName)
+  } else if (isValidList(record)) {
+    toCheck.push(record.name)
+  } else if (isValidStarterPack(record)) {
+    toCheck.push(record.name)
+  } else if (isValidFeedGenerator(record)) {
+    toCheck.push(rkey)
+    toCheck.push(record.displayName)
+  } else if (isValidPost(record)) {
     if (record.tags) {
-      toCheck += record.tags.join(' ')
+      toCheck.push(...record.tags)
     }
 
     for (const facet of record.facets || []) {
       for (const feat of facet.features) {
         if (isTag(feat)) {
-          toCheck += ' ' + feat.tag
+          toCheck.push(feat.tag)
         }
       }
     }
   }
-  if (hasExplicitSlur(toCheck)) {
+  if (hasExplicitSlur(toCheck.join(' '))) {
     throw new InvalidRecordError('Unacceptable slur in record')
   }
 }
diff --git a/packages/pds/tests/_util.ts b/packages/pds/tests/_util.ts
index d3cd7b2c82a..335318c6291 100644
--- a/packages/pds/tests/_util.ts
+++ b/packages/pds/tests/_util.ts
@@ -5,7 +5,10 @@ import { CID } from 'multiformats/cid'
 import { ToolsOzoneModerationDefs } from '@atproto/api'
 import { lexToJson } from '@atproto/lexicon'
 import { AtUri } from '@atproto/syntax'
-import { FeedViewPost } from '../src/lexicon/types/app/bsky/feed/defs'
+import {
+  FeedViewPost,
+  isReasonRepost,
+} from '../src/lexicon/types/app/bsky/feed/defs'
 
 // Swap out identifiers and dates with stable
 // values for the purpose of snapshot testing
@@ -98,10 +101,10 @@ export const forSnapshot = (obj: unknown) => {
 // Feed testing utils
 
 export const getOriginator = (item: FeedViewPost) => {
-  if (!item.reason) {
-    return item.post.author.did
+  if (isReasonRepost(item.reason)) {
+    return item.reason.by.did
   } else {
-    return (item.reason.by as { [did: string]: string }).did
+    return item.post.author.did
   }
 }
 
diff --git a/packages/pds/tests/app-passwords.test.ts b/packages/pds/tests/app-passwords.test.ts
index 7368007f7ec..06dd557a0b1 100644
--- a/packages/pds/tests/app-passwords.test.ts
+++ b/packages/pds/tests/app-passwords.test.ts
@@ -73,7 +73,7 @@ describe('app_passwords', () => {
   it('allows actions to be performed from app', async () => {
     await appAgent.api.app.bsky.feed.post.create(
       {
-        repo: appAgent.session?.did,
+        repo: appAgent.assertDid,
       },
       {
         text: 'Testing testing',
@@ -82,7 +82,7 @@ describe('app_passwords', () => {
     )
     await priviAgent.api.app.bsky.feed.post.create(
       {
-        repo: priviAgent.session?.did,
+        repo: priviAgent.assertDid,
       },
       {
         text: 'testing again',
@@ -142,7 +142,7 @@ describe('app_passwords', () => {
     // allows any access auth
     await appAgent.api.app.bsky.feed.post.create(
       {
-        repo: appAgent.session?.did,
+        repo: appAgent.assertDid,
       },
       {
         text: 'Testing testing',
@@ -188,7 +188,7 @@ describe('app_passwords', () => {
     // allows any access auth
     await priviAgent.api.app.bsky.feed.post.create(
       {
-        repo: priviAgent.session?.did,
+        repo: priviAgent.assertDid,
       },
       {
         text: 'Testing testing',
diff --git a/packages/pds/tests/create-post.test.ts b/packages/pds/tests/create-post.test.ts
index f1120d7fb38..ba86ecfb61f 100644
--- a/packages/pds/tests/create-post.test.ts
+++ b/packages/pds/tests/create-post.test.ts
@@ -4,6 +4,7 @@ import {
   AtUri,
   AtpAgent,
   RichText,
+  Un$Typed,
 } from '@atproto/api'
 import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 import basicSeed from './seeds/basic'
@@ -28,7 +29,7 @@ describe('pds posts record creation', () => {
   })
 
   it('allows for creating posts with tags', async () => {
-    const post: AppBskyFeedPost.Record = {
+    const post: Un$Typed<AppBskyFeedPost.Record> = {
       text: 'hello world',
       tags: ['javascript', 'hehe'],
       createdAt: new Date().toISOString(),
@@ -52,7 +53,7 @@ describe('pds posts record creation', () => {
     const rt = new RichText({ text: 'hello #world' })
     await rt.detectFacets(agent)
 
-    const post: AppBskyFeedPost.Record = {
+    const post: Un$Typed<AppBskyFeedPost.Record> = {
       text: rt.text,
       facets: rt.facets,
       createdAt: new Date().toISOString(),
diff --git a/packages/pds/tests/crud.test.ts b/packages/pds/tests/crud.test.ts
index e0509ebcf7f..4a898c244db 100644
--- a/packages/pds/tests/crud.test.ts
+++ b/packages/pds/tests/crud.test.ts
@@ -8,6 +8,7 @@ import { BlobNotFoundError } from '@atproto/repo'
 import { AtUri } from '@atproto/syntax'
 import { AppContext } from '../src/context'
 import { ids, lexicons } from '../src/lexicon/lexicons'
+import { isMain as isImagesEmbed } from '../src/lexicon/types/app/bsky/embed/images'
 import * as Post from '../src/lexicon/types/app/bsky/feed/post'
 import { forSnapshot, paginateAll } from './_util'
 
@@ -185,7 +186,8 @@ describe('crud operations', () => {
       rkey: postUri.rkey,
       repo: aliceAgent.accountDid,
     })
-    const images = post.value.embed?.images as { image: BlobRef }[]
+    assert(isImagesEmbed(post.value.embed))
+    const images = post.value.embed.images
     expect(images.length).toEqual(1)
     expect(uploaded.ref.equals(images[0].image.ref)).toBeTruthy()
     // Ensure that the uploaded image is now in the blobstore, i.e. doesn't throw BlobNotFoundError
@@ -768,7 +770,6 @@ describe('crud operations', () => {
         writes: [
           {
             $type: `${ids.ComAtprotoRepoApplyWrites}#create`,
-            action: 'create',
             collection: ids.AppBskyFeedPost,
             value: {
               $type: ids.AppBskyFeedPost,
@@ -778,14 +779,12 @@ describe('crud operations', () => {
           },
           {
             $type: `${ids.ComAtprotoRepoApplyWrites}#update`,
-            action: 'update',
             collection: 'com.example.record',
             rkey: new AtUri(existing1.data.uri).rkey,
             value: {},
           },
           {
             $type: `${ids.ComAtprotoRepoApplyWrites}#delete`,
-            action: 'delete',
             collection: 'com.example.record',
             rkey: new AtUri(existing2.data.uri).rkey,
           },
@@ -1145,7 +1144,6 @@ describe('crud operations', () => {
         writes: [
           {
             $type: `${ids.ComAtprotoRepoApplyWrites}#create`,
-            action: 'create',
             collection: ids.AppBskyFeedPost,
             value: { $type: ids.AppBskyFeedPost, ...postRecord() },
           },
@@ -1170,7 +1168,6 @@ describe('crud operations', () => {
         writes: [
           {
             $type: `${ids.ComAtprotoRepoApplyWrites}#create`,
-            action: 'create',
             collection: ids.AppBskyFeedPost,
             value: { $type: ids.AppBskyFeedPost, ...postRecord() },
           },
diff --git a/packages/pds/tests/file-uploads.test.ts b/packages/pds/tests/file-uploads.test.ts
index b3cbd26d2fd..3b4051f0178 100644
--- a/packages/pds/tests/file-uploads.test.ts
+++ b/packages/pds/tests/file-uploads.test.ts
@@ -182,6 +182,7 @@ describe('file uploads', () => {
       repo: alice,
       rkey: 'self',
     })
+    // @ts-expect-error "cid" is not documented as "com.atproto.repo.uploadBlob" output
     expect((profileA.value as any).avatar.cid).toEqual(uploadA.cid)
     await sc.updateProfile(bob, {
       displayName: 'Bob',
@@ -191,6 +192,7 @@ describe('file uploads', () => {
       repo: bob,
       rkey: 'self',
     })
+    // @ts-expect-error "cid" is not documented as "com.atproto.repo.uploadBlob" output
     expect((profileB.value as any).avatar.cid).toEqual(uploadA.cid)
     const { data: uploadAfterPermanent } =
       await agent.api.com.atproto.repo.uploadBlob(file, {
diff --git a/packages/pds/tests/moderation.test.ts b/packages/pds/tests/moderation.test.ts
index 9adda3f4a99..a20dcad000e 100644
--- a/packages/pds/tests/moderation.test.ts
+++ b/packages/pds/tests/moderation.test.ts
@@ -1,11 +1,18 @@
+import assert from 'node:assert'
 import { AtpAgent } from '@atproto/api'
 import { ImageRef, SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 import { BlobNotFoundError } from '@atproto/repo'
 import {
   RepoBlobRef,
   RepoRef,
+  isRepoBlobRef,
+  isRepoRef,
 } from '../src/lexicon/types/com/atproto/admin/defs'
-import { Main as StrongRef } from '../src/lexicon/types/com/atproto/repo/strongRef'
+import {
+  Main as StrongRef,
+  isMain as isStrongRef,
+} from '../src/lexicon/types/com/atproto/repo/strongRef'
+import { $Typed } from '../src/lexicon/util'
 import basicSeed from './seeds/basic'
 
 describe('moderation', () => {
@@ -13,9 +20,9 @@ describe('moderation', () => {
   let agent: AtpAgent
   let sc: SeedClient
 
-  let repoSubject: RepoRef
-  let recordSubject: StrongRef
-  let blobSubject: RepoBlobRef
+  let repoSubject: $Typed<RepoRef>
+  let recordSubject: $Typed<StrongRef>
+  let blobSubject: $Typed<RepoBlobRef>
   let blobRef: ImageRef
 
   beforeAll(async () => {
@@ -66,6 +73,7 @@ describe('moderation', () => {
       },
       { headers: network.pds.adminAuthHeaders() },
     )
+    assert(isRepoRef(res.data.subject))
     expect(res.data.subject.did).toEqual(sc.dids.bob)
     expect(res.data.takedown?.applied).toBe(true)
     expect(res.data.takedown?.ref).toBe('test-repo')
@@ -88,6 +96,7 @@ describe('moderation', () => {
       },
       { headers: network.pds.adminAuthHeaders() },
     )
+    assert(isRepoRef(res.data.subject))
     expect(res.data.subject.did).toEqual(sc.dids.bob)
     expect(res.data.takedown?.applied).toBe(false)
     expect(res.data.takedown?.ref).toBeUndefined()
@@ -110,6 +119,7 @@ describe('moderation', () => {
       },
       { headers: network.pds.adminAuthHeaders() },
     )
+    assert(isStrongRef(res.data.subject))
     expect(res.data.subject.uri).toEqual(recordSubject.uri)
     expect(res.data.takedown?.applied).toBe(true)
     expect(res.data.takedown?.ref).toBe('test-record')
@@ -132,6 +142,7 @@ describe('moderation', () => {
       },
       { headers: network.pds.adminAuthHeaders() },
     )
+    assert(isStrongRef(res.data.subject))
     expect(res.data.subject.uri).toEqual(recordSubject.uri)
     expect(res.data.takedown?.applied).toBe(false)
     expect(res.data.takedown?.ref).toBeUndefined()
@@ -156,7 +167,9 @@ describe('moderation', () => {
         },
         { headers: network.pds.adminAuthHeaders() },
       )
+      assert(isRepoBlobRef(res.data.subject))
       expect(res.data.subject.did).toEqual(blobSubject.did)
+      assert(isRepoBlobRef(res.data.subject))
       expect(res.data.subject.cid).toEqual(blobSubject.cid)
       expect(res.data.takedown?.applied).toBe(true)
       expect(res.data.takedown?.ref).toBe('test-blob')
diff --git a/packages/pds/tests/moderator-auth.test.ts b/packages/pds/tests/moderator-auth.test.ts
index a4cb7e60c2e..35ac5d57b7c 100644
--- a/packages/pds/tests/moderator-auth.test.ts
+++ b/packages/pds/tests/moderator-auth.test.ts
@@ -1,10 +1,12 @@
+import assert from 'node:assert'
 import * as plc from '@did-plc/lib'
 import { AtpAgent } from '@atproto/api'
 import { Keypair, Secp256k1Keypair } from '@atproto/crypto'
 import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 import { createServiceAuthHeaders } from '@atproto/xrpc-server'
 import { ids } from '../src/lexicon/lexicons'
-import { RepoRef } from '../src/lexicon/types/com/atproto/admin/defs'
+import { RepoRef, isRepoRef } from '../src/lexicon/types/com/atproto/admin/defs'
+import { $Typed } from '../src/lexicon/util'
 import usersSeed from './seeds/users'
 
 describe('moderator auth', () => {
@@ -12,7 +14,7 @@ describe('moderator auth', () => {
   let agent: AtpAgent
   let sc: SeedClient
 
-  let repoSubject: RepoRef
+  let repoSubject: $Typed<RepoRef>
 
   let modServiceDid: string
   let altModDid: string
@@ -103,6 +105,7 @@ describe('moderator auth', () => {
       },
       getHeaders,
     )
+    assert(isRepoRef(res.data.subject))
     expect(res.data.subject.did).toBe(repoSubject.did)
     expect(res.data.takedown?.applied).toBe(true)
   })
diff --git a/packages/pds/tests/preferences.test.ts b/packages/pds/tests/preferences.test.ts
index eedd3fe1e7d..ef46674f125 100644
--- a/packages/pds/tests/preferences.test.ts
+++ b/packages/pds/tests/preferences.test.ts
@@ -163,6 +163,7 @@ describe('user preferences', () => {
           { $type: 'app.bsky.actor.defs#adultContentPref', enabled: false },
           {
             $type: 'com.atproto.server.defs#unknown',
+            // @ts-expect-error un-spec'ed prop
             hello: 'world',
           },
         ],
@@ -179,6 +180,7 @@ describe('user preferences', () => {
       {
         preferences: [
           { $type: 'app.bsky.actor.defs#adultContentPref', enabled: false },
+          // @ts-expect-error this is what we are testing !
           {
             label: 'dogs',
             visibility: 'warn',
diff --git a/packages/pds/tests/proxied/__snapshots__/admin.test.ts.snap b/packages/pds/tests/proxied/__snapshots__/admin.test.ts.snap
index 9edd80cd413..67049be05b1 100644
--- a/packages/pds/tests/proxied/__snapshots__/admin.test.ts.snap
+++ b/packages/pds/tests/proxied/__snapshots__/admin.test.ts.snap
@@ -136,7 +136,7 @@ Object {
   },
   "id": 2,
   "subject": Object {
-    "$type": "com.atproto.admin.defs#repoView",
+    "$type": "tools.ozone.moderation.defs#repoView",
     "did": "user(0)",
     "handle": "bob.test",
     "indexedAt": "1970-01-01T00:00:00.000Z",
diff --git a/packages/pds/tests/proxied/admin.test.ts b/packages/pds/tests/proxied/admin.test.ts
index 0a725025e12..8ef69664e2b 100644
--- a/packages/pds/tests/proxied/admin.test.ts
+++ b/packages/pds/tests/proxied/admin.test.ts
@@ -116,6 +116,7 @@ describe('proxies admin requests', () => {
           cid: post.ref.cidStr,
         },
         createdBy: 'did:example:admin',
+        // @ts-expect-error
         reason: 'Y',
       },
       {
@@ -132,6 +133,7 @@ describe('proxies admin requests', () => {
           did: sc.dids.bob,
         },
         createdBy: 'did:example:admin',
+        // @ts-expect-error
         reason: 'Y',
       },
       {
@@ -216,6 +218,7 @@ describe('proxies admin requests', () => {
           did: sc.dids.alice,
         },
         createdBy: 'did:example:admin',
+        // @ts-expect-error
         reason: 'Y',
         createLabelVals: ['dogs'],
         negateLabelVals: ['cats'],
@@ -247,6 +250,7 @@ describe('proxies admin requests', () => {
           $type: 'tools.ozone.moderation.defs#modEventReverseTakedown',
         },
         createdBy: 'did:example:admin',
+        // @ts-expect-error
         reason: 'X',
       },
       {
@@ -279,6 +283,7 @@ describe('proxies admin requests', () => {
           cid: post.ref.cidStr,
         },
         createdBy: 'did:example:admin',
+        // @ts-expect-error
         reason: 'Y',
         createLabelVals: ['dogs'],
         negateLabelVals: ['cats'],
@@ -311,6 +316,7 @@ describe('proxies admin requests', () => {
         },
         event: { $type: 'tools.ozone.moderation.defs#modEventReverseTakedown' },
         createdBy: 'did:example:admin',
+        // @ts-expect-error
         reason: 'X',
       },
       {
diff --git a/packages/pds/tests/proxied/read-after-write.test.ts b/packages/pds/tests/proxied/read-after-write.test.ts
index f344d85f443..0bddb08b439 100644
--- a/packages/pds/tests/proxied/read-after-write.test.ts
+++ b/packages/pds/tests/proxied/read-after-write.test.ts
@@ -3,10 +3,13 @@ import util from 'node:util'
 import { request } from 'undici'
 import { AtpAgent } from '@atproto/api'
 import { RecordRef, SeedClient, TestNetwork } from '@atproto/dev-env'
-import { View as ExternalEmbedView } from '../../src/lexicon/types/app/bsky/embed/external'
-import { View as ImagesEmbedView } from '../../src/lexicon/types/app/bsky/embed/images'
-import { View as RecordEmbedView } from '../../src/lexicon/types/app/bsky/embed/record'
-import { ThreadViewPost } from '../../src/lexicon/types/app/bsky/feed/defs'
+import { isView as isExternalEmbedView } from '../../src/lexicon/types/app/bsky/embed/external'
+import { isView as isImagesEmbedView } from '../../src/lexicon/types/app/bsky/embed/images'
+import { isView as isRecordEmbedView } from '../../src/lexicon/types/app/bsky/embed/record'
+import {
+  ThreadViewPost,
+  isThreadViewPost,
+} from '../../src/lexicon/types/app/bsky/feed/defs'
 import basicSeed from '../seeds/basic'
 
 describe('proxy read after write', () => {
@@ -202,11 +205,17 @@ describe('proxy read after write', () => {
       { uri: sc.posts[alice][2].ref.uriStr },
       { headers: { ...sc.getHeaders(alice) } },
     )
-    const replies = res.data.thread.replies as ThreadViewPost[]
+    assert(isThreadViewPost(res.data.thread))
+    // @ts-ignore "pnpm verify:types" fails though VSCode doesn't complain
+    assert(res.data.thread.replies, 'replies is undefined')
+    // @ts-ignore "pnpm verify:types" fails though VSCode doesn't complain
+    const { replies } = res.data.thread
     expect(replies.length).toBe(1)
+    assert(isThreadViewPost(replies[0]))
     expect(replies[0].post.uri).toEqual(replyRes1.uri)
-    const imgs = replies[0].post.embed as ImagesEmbedView
-    expect(imgs.images[0].fullsize).toEqual(
+    const { embed } = replies[0].post
+    assert(isImagesEmbedView(embed))
+    expect(embed.images[0].fullsize).toEqual(
       util.format(
         network.pds.ctx.cfg.bskyAppView.cdnUrlPattern,
         'feed_fullsize',
@@ -214,13 +223,14 @@ describe('proxy read after write', () => {
         img.image.ref.toString(),
       ),
     )
-    expect(imgs.images[0].aspectRatio).toEqual({ height: 2, width: 1 })
-    expect(imgs.images[0].alt).toBe('alt text')
-    expect(replies[0].replies?.length).toBe(1)
-    // @ts-ignore
+    expect(embed.images[0].aspectRatio).toEqual({ height: 2, width: 1 })
+    expect(embed.images[0].alt).toBe('alt text')
+    assert(replies[0].replies, 'replies[0].replies is undefined')
+    expect(replies[0].replies.length).toBe(1)
+    assert(isThreadViewPost(replies[0].replies[0]))
     expect(replies[0].replies[0].post.uri).toEqual(replyRes2.uri)
-    // @ts-ignore
-    const external = replies[0].replies[0].post.embed as ExternalEmbedView
+    const external = replies[0].replies[0].post.embed
+    assert(isExternalEmbedView(external))
     expect(external.external.title).toEqual('TestImage')
     expect(external.external.thumb).toEqual(
       util.format(
@@ -253,10 +263,15 @@ describe('proxy read after write', () => {
       { uri: sc.posts[carol][0].ref.uriStr },
       { headers: { ...sc.getHeaders(alice) } },
     )
-    const replies = res.data.thread.replies as ThreadViewPost[]
+    assert(isThreadViewPost(res.data.thread))
+    assert(res.data.thread.replies, 'replies is undefined')
+    const { replies } = res.data.thread
     expect(replies.length).toBe(1)
+    assert(isThreadViewPost(replies[0]))
     expect(replies[0].post.uri).toEqual(replyRes.uri)
-    const embed = replies[0].post.embed as RecordEmbedView
+    const embed = replies[0].post.embed
+    assert(isRecordEmbedView(embed))
+    assert('uri' in embed.record) // @TODO: assert based in "$type"
     expect(embed.record.uri).toEqual(sc.posts[alice][0].ref.uriStr)
   })
 
diff --git a/packages/pds/tests/seeds/basic.ts b/packages/pds/tests/seeds/basic.ts
index 7aa6ac9942c..d5b5137c17f 100644
--- a/packages/pds/tests/seeds/basic.ts
+++ b/packages/pds/tests/seeds/basic.ts
@@ -61,7 +61,7 @@ export default async (
         index: { byteStart: 0, byteEnd: 18 },
         features: [
           {
-            $type: `${ids.AppBskyRichtextFacet}#mention`,
+            $type: `${ids.AppBskyRichtextFacet}#mention` as const,
             did: alice,
           },
         ],
diff --git a/packages/repo/jest.config.js b/packages/repo/jest.config.js
index 3c34b5882cf..ff4a8545820 100644
--- a/packages/repo/jest.config.js
+++ b/packages/repo/jest.config.js
@@ -3,4 +3,5 @@ module.exports = {
   displayName: 'Repo',
   transform: { '^.+\\.(t|j)s$': '@swc/jest' },
   setupFiles: ['<rootDir>/../../jest.setup.ts'],
+  moduleNameMapper: { '^(\\.\\.?\\/.+)\\.js$': ['$1.ts', '$1.js'] },
 }
diff --git a/packages/sync/jest.config.js b/packages/sync/jest.config.js
index 022b62b3158..c877eeded75 100644
--- a/packages/sync/jest.config.js
+++ b/packages/sync/jest.config.js
@@ -4,4 +4,5 @@ module.exports = {
   transform: { '^.+\\.ts$': '@swc/jest' },
   testTimeout: 60000,
   setupFiles: ['<rootDir>/../../jest.setup.ts'],
+  moduleNameMapper: { '^(\\.\\.?\\/.+)\\.js$': ['$1.ts', '$1.js'] },
 }
diff --git a/packages/syntax/jest.config.js b/packages/syntax/jest.config.js
index 90d955c21ab..b06cd32b336 100644
--- a/packages/syntax/jest.config.js
+++ b/packages/syntax/jest.config.js
@@ -3,4 +3,5 @@ module.exports = {
   displayName: 'Syntax',
   transform: { '^.+\\.(t|j)s$': '@swc/jest' },
   setupFiles: ['<rootDir>/../../jest.setup.ts'],
+  moduleNameMapper: { '^(\\.\\.?\\/.+)\\.js$': ['$1.ts', '$1.js'] },
 }
diff --git a/packages/syntax/src/tid.ts b/packages/syntax/src/tid.ts
index 4a280a4e377..115d2cde5ac 100644
--- a/packages/syntax/src/tid.ts
+++ b/packages/syntax/src/tid.ts
@@ -1,24 +1,18 @@
+const TID_LENGTH = 13
+const TID_REGEX = /^[234567abcdefghij][234567abcdefghijklmnopqrstuvwxyz]{12}$/
+
 export const ensureValidTid = (tid: string): void => {
-  if (tid.length !== 13) {
-    throw new InvalidTidError('TID must be 13 characters')
+  if (tid.length !== TID_LENGTH) {
+    throw new InvalidTidError(`TID must be ${TID_LENGTH} characters`)
   }
   // simple regex to enforce most constraints via just regex and length.
-  if (!/^[234567abcdefghij][234567abcdefghijklmnopqrstuvwxyz]{12}$/.test(tid)) {
+  if (!TID_REGEX.test(tid)) {
     throw new InvalidTidError('TID syntax not valid (regex)')
   }
 }
 
 export const isValidTid = (tid: string): boolean => {
-  try {
-    ensureValidTid(tid)
-  } catch (err) {
-    if (err instanceof InvalidTidError) {
-      return false
-    }
-    throw err
-  }
-
-  return true
+  return tid.length === TID_LENGTH && TID_REGEX.test(tid)
 }
 
 export class InvalidTidError extends Error {}
diff --git a/packages/xrpc-server/jest.config.js b/packages/xrpc-server/jest.config.js
index 351e8a35a8b..a055d49ba88 100644
--- a/packages/xrpc-server/jest.config.js
+++ b/packages/xrpc-server/jest.config.js
@@ -4,4 +4,5 @@ module.exports = {
   transform: { '^.+\\.(j|t)s$': '@swc/jest' },
   transformIgnorePatterns: ['/node_modules/.pnpm/(?!(get-port)@)'],
   setupFiles: ['<rootDir>/../../jest.setup.ts'],
+  moduleNameMapper: { '^(\\.\\.?\\/.+)\\.js$': ['$1.ts', '$1.js'] },
 }
diff --git a/tsconfig/browser.json b/tsconfig/browser.json
index e60c4970688..baa8f8e16d6 100644
--- a/tsconfig/browser.json
+++ b/tsconfig/browser.json
@@ -2,7 +2,7 @@
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "./base.json",
   "compilerOptions": {
-    "lib": ["ES2022", "DOM", "DOM.Iterable", "ESNext.Disposable"],
+    "lib": ["ES2023", "DOM", "DOM.Iterable", "ESNext.Disposable"],
     "jsx": "react-jsx"
   }
 }
diff --git a/tsconfig/isomorphic.json b/tsconfig/isomorphic.json
index 43bff8bf979..36221a23051 100644
--- a/tsconfig/isomorphic.json
+++ b/tsconfig/isomorphic.json
@@ -8,7 +8,7 @@
     // https://github.com/microsoft/TypeScript-DOM-lib-generator/issues/1685
     // https://github.com/microsoft/TypeScript/issues/31535
     // https://github.com/microsoft/TypeScript/issues/41727
-    "lib": ["ES2022", "DOM", "DOM.Iterable"],
+    "lib": ["ES2023", "DOM", "DOM.Iterable"],
     "types": ["node"]
   }
 }
diff --git a/tsconfig/node.json b/tsconfig/node.json
index f69da239387..3e59f51fa18 100644
--- a/tsconfig/node.json
+++ b/tsconfig/node.json
@@ -2,7 +2,7 @@
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "./base.json",
   "compilerOptions": {
-    "lib": ["ES2022", "ScriptHost"],
+    "lib": ["ES2023", "ScriptHost"],
     "types": ["node"]
   }
 }
diff --git a/tsconfig/nodenext.json b/tsconfig/nodenext.json
index 5072557d696..c541e7be093 100644
--- a/tsconfig/nodenext.json
+++ b/tsconfig/nodenext.json
@@ -2,10 +2,10 @@
   "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "./base.json",
   "compilerOptions": {
-    "lib": ["ES2022", "ScriptHost"],
+    "lib": ["ES2023", "ScriptHost"],
     "types": ["node"],
     "module": "Node16",
-    "target": "ES2022",
+    "target": "ES2023",
     "moduleResolution": "Node16"
   }
 }
diff --git a/tsconfig/tests.json b/tsconfig/tests.json
index 07573723164..602bc4c4d76 100644
--- a/tsconfig/tests.json
+++ b/tsconfig/tests.json
@@ -3,7 +3,7 @@
   "extends": "./node.json",
   "compilerOptions": {
     "types": ["node", "jest"],
-    "lib": ["ES2022", "DOM", "DOM.Iterable"],
+    "lib": ["ES2023", "DOM", "DOM.Iterable"],
     "noEmit": true
   }
 }

From 03351a5818f4722651dcaaa1285c96d00004f4f7 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 13 Feb 2025 15:27:09 +0100
Subject: [PATCH 056/101] Version packages (#3529)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/beige-trees-float.md               |  5 -----
 .changeset/brown-flies-stare.md               | 10 ----------
 .changeset/fast-points-walk.md                |  5 -----
 .changeset/fast-waves-jog.md                  |  5 -----
 .changeset/green-cherries-shave.md            |  5 -----
 .changeset/green-forks-lie.md                 |  5 -----
 .changeset/late-worms-travel.md               |  5 -----
 .changeset/popular-shirts-rescue.md           |  5 -----
 .changeset/shiny-suns-walk.md                 |  5 -----
 .changeset/silly-starfishes-pay.md            |  5 -----
 .changeset/spotty-bottles-march.md            |  5 -----
 .changeset/tiny-carpets-impress.md            |  5 -----
 packages/api/CHANGELOG.md                     | 17 ++++++++++++++++
 packages/api/package.json                     |  2 +-
 packages/aws/CHANGELOG.md                     |  7 +++++++
 packages/aws/package.json                     |  2 +-
 packages/bsky/CHANGELOG.md                    | 15 ++++++++++++++
 packages/bsky/package.json                    |  2 +-
 packages/bsync/CHANGELOG.md                   |  7 +++++++
 packages/bsync/package.json                   |  2 +-
 packages/dev-env/CHANGELOG.md                 | 15 ++++++++++++++
 packages/dev-env/package.json                 |  2 +-
 .../internal/identity-resolver/CHANGELOG.md   |  7 +++++++
 .../internal/identity-resolver/package.json   |  2 +-
 packages/internal/xrpc-utils/CHANGELOG.md     |  8 ++++++++
 packages/internal/xrpc-utils/package.json     |  2 +-
 packages/lex-cli/CHANGELOG.md                 | 20 +++++++++++++++++++
 packages/lex-cli/package.json                 |  2 +-
 packages/lexicon/CHANGELOG.md                 | 11 ++++++++++
 packages/lexicon/package.json                 |  2 +-
 .../oauth/oauth-client-browser/CHANGELOG.md   |  7 +++++++
 .../oauth/oauth-client-browser/package.json   |  2 +-
 packages/oauth/oauth-client-node/CHANGELOG.md |  7 +++++++
 packages/oauth/oauth-client-node/package.json |  2 +-
 packages/oauth/oauth-client/CHANGELOG.md      |  8 ++++++++
 packages/oauth/oauth-client/package.json      |  2 +-
 packages/ozone/CHANGELOG.md                   | 13 ++++++++++++
 packages/ozone/package.json                   |  2 +-
 packages/pds/CHANGELOG.md                     | 18 +++++++++++++++++
 packages/pds/package.json                     |  2 +-
 packages/repo/CHANGELOG.md                    |  7 +++++++
 packages/repo/package.json                    |  2 +-
 packages/sync/CHANGELOG.md                    | 10 ++++++++++
 packages/sync/package.json                    |  2 +-
 packages/syntax/CHANGELOG.md                  |  6 ++++++
 packages/syntax/package.json                  |  2 +-
 packages/xrpc-server/CHANGELOG.md             |  8 ++++++++
 packages/xrpc-server/package.json             |  2 +-
 packages/xrpc/CHANGELOG.md                    |  7 +++++++
 packages/xrpc/package.json                    |  2 +-
 50 files changed, 217 insertions(+), 84 deletions(-)
 delete mode 100644 .changeset/beige-trees-float.md
 delete mode 100644 .changeset/brown-flies-stare.md
 delete mode 100644 .changeset/fast-points-walk.md
 delete mode 100644 .changeset/fast-waves-jog.md
 delete mode 100644 .changeset/green-cherries-shave.md
 delete mode 100644 .changeset/green-forks-lie.md
 delete mode 100644 .changeset/late-worms-travel.md
 delete mode 100644 .changeset/popular-shirts-rescue.md
 delete mode 100644 .changeset/shiny-suns-walk.md
 delete mode 100644 .changeset/silly-starfishes-pay.md
 delete mode 100644 .changeset/spotty-bottles-march.md
 delete mode 100644 .changeset/tiny-carpets-impress.md

diff --git a/.changeset/beige-trees-float.md b/.changeset/beige-trees-float.md
deleted file mode 100644
index 06b11c8fd2d..00000000000
--- a/.changeset/beige-trees-float.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/api": patch
----
-
-Fixes a bug that would clear interests prefs when updating hidden posts
diff --git a/.changeset/brown-flies-stare.md b/.changeset/brown-flies-stare.md
deleted file mode 100644
index e31e8c5f2f4..00000000000
--- a/.changeset/brown-flies-stare.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-"@atproto/ozone": patch
-"@atproto/bsky": patch
-"@atproto/api": minor
-"@atproto/pds": patch
----
-
-Update Lexicon derived code to better reflect data typings. In particular, Lexicon derived interfaces will now explicitly include the `$type` property that can be present in the data.
-
-
diff --git a/.changeset/fast-points-walk.md b/.changeset/fast-points-walk.md
deleted file mode 100644
index 697405d5178..00000000000
--- a/.changeset/fast-points-walk.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/syntax": patch
----
-
-Improve performance of isValidTid
diff --git a/.changeset/fast-waves-jog.md b/.changeset/fast-waves-jog.md
deleted file mode 100644
index 17daee73935..00000000000
--- a/.changeset/fast-waves-jog.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/lex-cli": minor
----
-
-Update the code generation to better reflect the data typings. In particular this change will cause generated code to explicit the `$type` property that can be present in the data.
diff --git a/.changeset/green-cherries-shave.md b/.changeset/green-cherries-shave.md
deleted file mode 100644
index 13326d6d967..00000000000
--- a/.changeset/green-cherries-shave.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/pds": patch
----
-
-Minor typing fixes
diff --git a/.changeset/green-forks-lie.md b/.changeset/green-forks-lie.md
deleted file mode 100644
index d00a1e5b694..00000000000
--- a/.changeset/green-forks-lie.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/api": minor
----
-
-Helper functions (e.g. `NS.isRecord`) no longer casts the output value. Use `asPredicate(NS.validateRecord)` to create a predicate function that will ensure that an unknown value is indeed an `NS.Record`. The `isX` helper function's purpose is to discriminate between `$type`d values from unions.
diff --git a/.changeset/late-worms-travel.md b/.changeset/late-worms-travel.md
deleted file mode 100644
index 68f63285d98..00000000000
--- a/.changeset/late-worms-travel.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/lex-cli": patch
----
-
-Add `.js` file extension to `import` statements in generated code.
diff --git a/.changeset/popular-shirts-rescue.md b/.changeset/popular-shirts-rescue.md
deleted file mode 100644
index 3e7b8ed68bb..00000000000
--- a/.changeset/popular-shirts-rescue.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/lexicon": patch
----
-
-Various performance improvements
diff --git a/.changeset/shiny-suns-walk.md b/.changeset/shiny-suns-walk.md
deleted file mode 100644
index 65068e336df..00000000000
--- a/.changeset/shiny-suns-walk.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/lex-cli": patch
----
-
-Type the generated `ids` object (that contains all the lexicon namespace ids) as `const`.
diff --git a/.changeset/silly-starfishes-pay.md b/.changeset/silly-starfishes-pay.md
deleted file mode 100644
index af95fb425c4..00000000000
--- a/.changeset/silly-starfishes-pay.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/lexicon": patch
----
-
-Fully type `ValidationResult`'s `value` property, allowing `NS.validateMyType` helper functions to return a typed value in case of success.
diff --git a/.changeset/spotty-bottles-march.md b/.changeset/spotty-bottles-march.md
deleted file mode 100644
index 9dfc33703aa..00000000000
--- a/.changeset/spotty-bottles-march.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/lex-cli": minor
----
-
-Remove `[string]: unknown` index signature from custom user objects, input and output schemas.
diff --git a/.changeset/tiny-carpets-impress.md b/.changeset/tiny-carpets-impress.md
deleted file mode 100644
index 8d7699990dc..00000000000
--- a/.changeset/tiny-carpets-impress.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/lex-cli": patch
----
-
-Ensures that empty `schemas` arrays are typed as `LexiconDoc[]`.
diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md
index c0054b021da..17ef9f3dcb7 100644
--- a/packages/api/CHANGELOG.md
+++ b/packages/api/CHANGELOG.md
@@ -1,5 +1,22 @@
 # @atproto/api
 
+## 0.14.0
+
+### Minor Changes
+
+- [#2999](https://github.com/bluesky-social/atproto/pull/2999) [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Update Lexicon derived code to better reflect data typings. In particular, Lexicon derived interfaces will now explicitly include the `$type` property that can be present in the data.
+
+- [#2999](https://github.com/bluesky-social/atproto/pull/2999) [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Helper functions (e.g. `NS.isRecord`) no longer casts the output value. Use `asPredicate(NS.validateRecord)` to create a predicate function that will ensure that an unknown value is indeed an `NS.Record`. The `isX` helper function's purpose is to discriminate between `$type`d values from unions.
+
+### Patch Changes
+
+- [#2999](https://github.com/bluesky-social/atproto/pull/2999) [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Fixes a bug that would clear interests prefs when updating hidden posts
+
+- Updated dependencies [[`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c), [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c), [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c)]:
+  - @atproto/syntax@0.3.3
+  - @atproto/lexicon@0.4.7
+  - @atproto/xrpc@0.6.9
+
 ## 0.13.35
 
 ### Patch Changes
diff --git a/packages/api/package.json b/packages/api/package.json
index 9d35bae35c2..0cd6bbc2d9d 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/api",
-  "version": "0.13.35",
+  "version": "0.14.0",
   "license": "MIT",
   "description": "Client library for atproto and Bluesky",
   "keywords": [
diff --git a/packages/aws/CHANGELOG.md b/packages/aws/CHANGELOG.md
index 5ed9649eec0..2ed95ff626d 100644
--- a/packages/aws/CHANGELOG.md
+++ b/packages/aws/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/aws
 
+## 0.2.15
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atproto/repo@0.6.5
+
 ## 0.2.14
 
 ### Patch Changes
diff --git a/packages/aws/package.json b/packages/aws/package.json
index 16febea5d8e..5b16fe4c93d 100644
--- a/packages/aws/package.json
+++ b/packages/aws/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/aws",
-  "version": "0.2.14",
+  "version": "0.2.15",
   "license": "MIT",
   "description": "Shared AWS cloud API helpers for atproto services",
   "keywords": [
diff --git a/packages/bsky/CHANGELOG.md b/packages/bsky/CHANGELOG.md
index f4909155352..0a87ec18f1e 100644
--- a/packages/bsky/CHANGELOG.md
+++ b/packages/bsky/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @atproto/bsky
 
+## 0.0.117
+
+### Patch Changes
+
+- [#2999](https://github.com/bluesky-social/atproto/pull/2999) [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Update Lexicon derived code to better reflect data typings. In particular, Lexicon derived interfaces will now explicitly include the `$type` property that can be present in the data.
+
+- Updated dependencies [[`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c), [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c), [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c), [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c), [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c), [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c)]:
+  - @atproto/api@0.14.0
+  - @atproto/syntax@0.3.3
+  - @atproto/lexicon@0.4.7
+  - @atproto/sync@0.1.14
+  - @atproto/repo@0.6.5
+  - @atproto/xrpc-server@0.7.11
+  - @atproto-labs/xrpc-utils@0.0.7
+
 ## 0.0.116
 
 ### Patch Changes
diff --git a/packages/bsky/package.json b/packages/bsky/package.json
index fee7c0d0d07..f62af52de95 100644
--- a/packages/bsky/package.json
+++ b/packages/bsky/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.116",
+  "version": "0.0.117",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
diff --git a/packages/bsync/CHANGELOG.md b/packages/bsync/CHANGELOG.md
index 4391302876f..f413bfd4ae2 100644
--- a/packages/bsync/CHANGELOG.md
+++ b/packages/bsync/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/bsync
 
+## 0.0.14
+
+### Patch Changes
+
+- Updated dependencies [[`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c)]:
+  - @atproto/syntax@0.3.3
+
 ## 0.0.13
 
 ### Patch Changes
diff --git a/packages/bsync/package.json b/packages/bsync/package.json
index decbd546134..3b6707eb312 100644
--- a/packages/bsync/package.json
+++ b/packages/bsync/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsync",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "license": "MIT",
   "description": "Sychronizing service for app.bsky App View (Bluesky API)",
   "keywords": [
diff --git a/packages/dev-env/CHANGELOG.md b/packages/dev-env/CHANGELOG.md
index 3e369cc578d..8c22cf3bc91 100644
--- a/packages/dev-env/CHANGELOG.md
+++ b/packages/dev-env/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @atproto/dev-env
 
+## 0.3.87
+
+### Patch Changes
+
+- Updated dependencies [[`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c), [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c), [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c), [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c), [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c), [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c), [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c)]:
+  - @atproto/api@0.14.0
+  - @atproto/ozone@0.1.78
+  - @atproto/bsky@0.0.117
+  - @atproto/pds@0.4.95
+  - @atproto/syntax@0.3.3
+  - @atproto/lexicon@0.4.7
+  - @atproto/bsync@0.0.14
+  - @atproto/sync@0.1.14
+  - @atproto/xrpc-server@0.7.11
+
 ## 0.3.86
 
 ### Patch Changes
diff --git a/packages/dev-env/package.json b/packages/dev-env/package.json
index 5c4966bac59..a41d2bb8260 100644
--- a/packages/dev-env/package.json
+++ b/packages/dev-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/dev-env",
-  "version": "0.3.86",
+  "version": "0.3.87",
   "license": "MIT",
   "description": "Local development environment helper for atproto development",
   "keywords": [
diff --git a/packages/internal/identity-resolver/CHANGELOG.md b/packages/internal/identity-resolver/CHANGELOG.md
index 1d45e3b5dd4..4c8c5068b5d 100644
--- a/packages/internal/identity-resolver/CHANGELOG.md
+++ b/packages/internal/identity-resolver/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto-labs/identity-resolver
 
+## 0.1.13
+
+### Patch Changes
+
+- Updated dependencies [[`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c)]:
+  - @atproto/syntax@0.3.3
+
 ## 0.1.12
 
 ### Patch Changes
diff --git a/packages/internal/identity-resolver/package.json b/packages/internal/identity-resolver/package.json
index 71140c9be97..00ab6469b0b 100644
--- a/packages/internal/identity-resolver/package.json
+++ b/packages/internal/identity-resolver/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto-labs/identity-resolver",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "license": "MIT",
   "description": "A library resolving ATPROTO identities",
   "keywords": [
diff --git a/packages/internal/xrpc-utils/CHANGELOG.md b/packages/internal/xrpc-utils/CHANGELOG.md
index 7bb6be2e535..f955202ed08 100644
--- a/packages/internal/xrpc-utils/CHANGELOG.md
+++ b/packages/internal/xrpc-utils/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @atproto-labs/xrpc-utils
 
+## 0.0.7
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atproto/xrpc@0.6.9
+  - @atproto/xrpc-server@0.7.11
+
 ## 0.0.6
 
 ### Patch Changes
diff --git a/packages/internal/xrpc-utils/package.json b/packages/internal/xrpc-utils/package.json
index cd440e57898..2ec69b13659 100644
--- a/packages/internal/xrpc-utils/package.json
+++ b/packages/internal/xrpc-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto-labs/xrpc-utils",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "license": "MIT",
   "description": "XRPC server utilities for Node.JS",
   "keywords": [
diff --git a/packages/lex-cli/CHANGELOG.md b/packages/lex-cli/CHANGELOG.md
index 282c296fc96..bda7992d090 100644
--- a/packages/lex-cli/CHANGELOG.md
+++ b/packages/lex-cli/CHANGELOG.md
@@ -1,5 +1,25 @@
 # @atproto/lex-cli
 
+## 0.6.0
+
+### Minor Changes
+
+- [#2999](https://github.com/bluesky-social/atproto/pull/2999) [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Update the code generation to better reflect the data typings. In particular this change will cause generated code to explicit the `$type` property that can be present in the data.
+
+- [#2999](https://github.com/bluesky-social/atproto/pull/2999) [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Remove `[string]: unknown` index signature from custom user objects, input and output schemas.
+
+### Patch Changes
+
+- [#2999](https://github.com/bluesky-social/atproto/pull/2999) [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Add `.js` file extension to `import` statements in generated code.
+
+- [#2999](https://github.com/bluesky-social/atproto/pull/2999) [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Type the generated `ids` object (that contains all the lexicon namespace ids) as `const`.
+
+- [#2999](https://github.com/bluesky-social/atproto/pull/2999) [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Ensures that empty `schemas` arrays are typed as `LexiconDoc[]`.
+
+- Updated dependencies [[`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c), [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c), [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c)]:
+  - @atproto/syntax@0.3.3
+  - @atproto/lexicon@0.4.7
+
 ## 0.5.7
 
 ### Patch Changes
diff --git a/packages/lex-cli/package.json b/packages/lex-cli/package.json
index 408c3161e45..2ccbf350eb3 100644
--- a/packages/lex-cli/package.json
+++ b/packages/lex-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/lex-cli",
-  "version": "0.5.7",
+  "version": "0.6.0",
   "license": "MIT",
   "description": "TypeScript codegen tool for atproto Lexicon schemas",
   "keywords": [
diff --git a/packages/lexicon/CHANGELOG.md b/packages/lexicon/CHANGELOG.md
index f9b3746d268..d90eece13cc 100644
--- a/packages/lexicon/CHANGELOG.md
+++ b/packages/lexicon/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @atproto/lexicon
 
+## 0.4.7
+
+### Patch Changes
+
+- [#2999](https://github.com/bluesky-social/atproto/pull/2999) [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Various performance improvements
+
+- [#2999](https://github.com/bluesky-social/atproto/pull/2999) [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Fully type `ValidationResult`'s `value` property, allowing `NS.validateMyType` helper functions to return a typed value in case of success.
+
+- Updated dependencies [[`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c)]:
+  - @atproto/syntax@0.3.3
+
 ## 0.4.6
 
 ### Patch Changes
diff --git a/packages/lexicon/package.json b/packages/lexicon/package.json
index dc5e2a925cf..70299e3760c 100644
--- a/packages/lexicon/package.json
+++ b/packages/lexicon/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/lexicon",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "license": "MIT",
   "description": "atproto Lexicon schema language library",
   "keywords": [
diff --git a/packages/oauth/oauth-client-browser/CHANGELOG.md b/packages/oauth/oauth-client-browser/CHANGELOG.md
index 2422ffb9089..3d3ef4dcaa6 100644
--- a/packages/oauth/oauth-client-browser/CHANGELOG.md
+++ b/packages/oauth/oauth-client-browser/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/oauth-client-browser
 
+## 0.3.10
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atproto/oauth-client@0.3.10
+
 ## 0.3.9
 
 ### Patch Changes
diff --git a/packages/oauth/oauth-client-browser/package.json b/packages/oauth/oauth-client-browser/package.json
index b34ee4d9de8..0b5123ec68e 100644
--- a/packages/oauth/oauth-client-browser/package.json
+++ b/packages/oauth/oauth-client-browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/oauth-client-browser",
-  "version": "0.3.9",
+  "version": "0.3.10",
   "license": "MIT",
   "description": "ATPROTO OAuth client for the browser (relies on WebCrypto & Indexed DB)",
   "keywords": [
diff --git a/packages/oauth/oauth-client-node/CHANGELOG.md b/packages/oauth/oauth-client-node/CHANGELOG.md
index 4b57a36282e..8aa7c4805a5 100644
--- a/packages/oauth/oauth-client-node/CHANGELOG.md
+++ b/packages/oauth/oauth-client-node/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/oauth-client-node
 
+## 0.2.11
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atproto/oauth-client@0.3.10
+
 ## 0.2.10
 
 ### Patch Changes
diff --git a/packages/oauth/oauth-client-node/package.json b/packages/oauth/oauth-client-node/package.json
index 6c3e192e74d..0bef52e5706 100644
--- a/packages/oauth/oauth-client-node/package.json
+++ b/packages/oauth/oauth-client-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/oauth-client-node",
-  "version": "0.2.10",
+  "version": "0.2.11",
   "license": "MIT",
   "description": "ATPROTO OAuth client for the NodeJS",
   "keywords": [
diff --git a/packages/oauth/oauth-client/CHANGELOG.md b/packages/oauth/oauth-client/CHANGELOG.md
index 76033774fe7..62c9b240e48 100644
--- a/packages/oauth/oauth-client/CHANGELOG.md
+++ b/packages/oauth/oauth-client/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @atproto/oauth-client
 
+## 0.3.10
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atproto-labs/identity-resolver@0.1.13
+  - @atproto/xrpc@0.6.9
+
 ## 0.3.9
 
 ### Patch Changes
diff --git a/packages/oauth/oauth-client/package.json b/packages/oauth/oauth-client/package.json
index 3ea8f8f7496..0f941078db6 100644
--- a/packages/oauth/oauth-client/package.json
+++ b/packages/oauth/oauth-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/oauth-client",
-  "version": "0.3.9",
+  "version": "0.3.10",
   "license": "MIT",
   "description": "OAuth client for ATPROTO PDS. This package serves as common base for environment-specific implementations (NodeJS, Browser, React-Native).",
   "keywords": [
diff --git a/packages/ozone/CHANGELOG.md b/packages/ozone/CHANGELOG.md
index 084bac4a2c0..2002f0ae7df 100644
--- a/packages/ozone/CHANGELOG.md
+++ b/packages/ozone/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @atproto/ozone
 
+## 0.1.78
+
+### Patch Changes
+
+- [#2999](https://github.com/bluesky-social/atproto/pull/2999) [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Update Lexicon derived code to better reflect data typings. In particular, Lexicon derived interfaces will now explicitly include the `$type` property that can be present in the data.
+
+- Updated dependencies [[`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c), [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c), [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c), [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c), [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c), [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c)]:
+  - @atproto/api@0.14.0
+  - @atproto/syntax@0.3.3
+  - @atproto/lexicon@0.4.7
+  - @atproto/xrpc@0.6.9
+  - @atproto/xrpc-server@0.7.11
+
 ## 0.1.77
 
 ### Patch Changes
diff --git a/packages/ozone/package.json b/packages/ozone/package.json
index bbc547f5b18..5a0cc0e0f59 100644
--- a/packages/ozone/package.json
+++ b/packages/ozone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.1.77",
+  "version": "0.1.78",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
diff --git a/packages/pds/CHANGELOG.md b/packages/pds/CHANGELOG.md
index 5d57baf2af5..e2aa814da77 100644
--- a/packages/pds/CHANGELOG.md
+++ b/packages/pds/CHANGELOG.md
@@ -1,5 +1,23 @@
 # @atproto/pds
 
+## 0.4.95
+
+### Patch Changes
+
+- [#2999](https://github.com/bluesky-social/atproto/pull/2999) [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Update Lexicon derived code to better reflect data typings. In particular, Lexicon derived interfaces will now explicitly include the `$type` property that can be present in the data.
+
+- [#2999](https://github.com/bluesky-social/atproto/pull/2999) [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Minor typing fixes
+
+- Updated dependencies [[`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c), [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c), [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c), [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c), [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c), [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c)]:
+  - @atproto/api@0.14.0
+  - @atproto/syntax@0.3.3
+  - @atproto/lexicon@0.4.7
+  - @atproto/repo@0.6.5
+  - @atproto/xrpc@0.6.9
+  - @atproto/xrpc-server@0.7.11
+  - @atproto/aws@0.2.15
+  - @atproto-labs/xrpc-utils@0.0.7
+
 ## 0.4.94
 
 ### Patch Changes
diff --git a/packages/pds/package.json b/packages/pds/package.json
index ed1d3a5fb42..869c88b6b62 100644
--- a/packages/pds/package.json
+++ b/packages/pds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/pds",
-  "version": "0.4.94",
+  "version": "0.4.95",
   "license": "MIT",
   "description": "Reference implementation of atproto Personal Data Server (PDS)",
   "keywords": [
diff --git a/packages/repo/CHANGELOG.md b/packages/repo/CHANGELOG.md
index f972303de06..75d7940762b 100644
--- a/packages/repo/CHANGELOG.md
+++ b/packages/repo/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/repo
 
+## 0.6.5
+
+### Patch Changes
+
+- Updated dependencies [[`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c), [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c)]:
+  - @atproto/lexicon@0.4.7
+
 ## 0.6.4
 
 ### Patch Changes
diff --git a/packages/repo/package.json b/packages/repo/package.json
index 06a3cc4f585..190679fe9a7 100644
--- a/packages/repo/package.json
+++ b/packages/repo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/repo",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "license": "MIT",
   "description": "atproto repo and MST implementation",
   "keywords": [
diff --git a/packages/sync/CHANGELOG.md b/packages/sync/CHANGELOG.md
index 806ae256a19..bd29b398d71 100644
--- a/packages/sync/CHANGELOG.md
+++ b/packages/sync/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @atproto/sync
 
+## 0.1.14
+
+### Patch Changes
+
+- Updated dependencies [[`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c), [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c), [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c)]:
+  - @atproto/syntax@0.3.3
+  - @atproto/lexicon@0.4.7
+  - @atproto/repo@0.6.5
+  - @atproto/xrpc-server@0.7.11
+
 ## 0.1.13
 
 ### Patch Changes
diff --git a/packages/sync/package.json b/packages/sync/package.json
index 3c14022e625..c162bd4a792 100644
--- a/packages/sync/package.json
+++ b/packages/sync/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/sync",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "license": "MIT",
   "description": "atproto sync library",
   "keywords": [
diff --git a/packages/syntax/CHANGELOG.md b/packages/syntax/CHANGELOG.md
index ee1a46ceb05..f42bb1a51a3 100644
--- a/packages/syntax/CHANGELOG.md
+++ b/packages/syntax/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @atproto/syntax
 
+## 0.3.3
+
+### Patch Changes
+
+- [#2999](https://github.com/bluesky-social/atproto/pull/2999) [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Improve performance of isValidTid
+
 ## 0.3.2
 
 ### Patch Changes
diff --git a/packages/syntax/package.json b/packages/syntax/package.json
index 5c49ed335a6..8333ba6718d 100644
--- a/packages/syntax/package.json
+++ b/packages/syntax/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/syntax",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "license": "MIT",
   "description": "Validation for atproto identifiers and formats: DID, handle, NSID, AT URI, etc",
   "keywords": [
diff --git a/packages/xrpc-server/CHANGELOG.md b/packages/xrpc-server/CHANGELOG.md
index 04fb0b013c2..0ad68ce2d22 100644
--- a/packages/xrpc-server/CHANGELOG.md
+++ b/packages/xrpc-server/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @atproto/xrpc-server
 
+## 0.7.11
+
+### Patch Changes
+
+- Updated dependencies [[`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c), [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c)]:
+  - @atproto/lexicon@0.4.7
+  - @atproto/xrpc@0.6.9
+
 ## 0.7.10
 
 ### Patch Changes
diff --git a/packages/xrpc-server/package.json b/packages/xrpc-server/package.json
index 76529d04835..83268ef9c23 100644
--- a/packages/xrpc-server/package.json
+++ b/packages/xrpc-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/xrpc-server",
-  "version": "0.7.10",
+  "version": "0.7.11",
   "license": "MIT",
   "description": "atproto HTTP API (XRPC) server library",
   "keywords": [
diff --git a/packages/xrpc/CHANGELOG.md b/packages/xrpc/CHANGELOG.md
index b0f307427d2..91afd349655 100644
--- a/packages/xrpc/CHANGELOG.md
+++ b/packages/xrpc/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/xrpc
 
+## 0.6.9
+
+### Patch Changes
+
+- Updated dependencies [[`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c), [`c53d943c8`](https://github.com/bluesky-social/atproto/commit/c53d943c8be5b8886254e020970a68c0f745b14c)]:
+  - @atproto/lexicon@0.4.7
+
 ## 0.6.8
 
 ### Patch Changes
diff --git a/packages/xrpc/package.json b/packages/xrpc/package.json
index 8e67dad33a3..1ed4ccf8e5f 100644
--- a/packages/xrpc/package.json
+++ b/packages/xrpc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/xrpc",
-  "version": "0.6.8",
+  "version": "0.6.9",
   "license": "MIT",
   "description": "atproto HTTP API (XRPC) client library",
   "keywords": [

From 809c7ac5e319f3344edfc78bbdbd8a72ff624d13 Mon Sep 17 00:00:00 2001
From: rafael <rafael@blueskyweb.xyz>
Date: Thu, 13 Feb 2025 10:34:01 -0800
Subject: [PATCH 057/101] Label expiration (#3510)

---
 .../20250207T174822012Z-add-label-exp.ts      |  9 +++
 .../data-plane/server/db/migrations/index.ts  |  1 +
 .../src/data-plane/server/db/tables/label.ts  |  1 +
 .../src/data-plane/server/routes/labels.ts    |  7 +-
 packages/bsky/tests/label-hydration.test.ts   | 64 ++++++++++++++++---
 packages/bsky/tests/query-labels.test.ts      |  1 +
 .../tests/views/labels-needs-review.test.ts   |  1 +
 .../bsky/tests/views/labels-takedown.test.ts  |  1 +
 packages/bsky/tests/views/timeline.test.ts    |  1 +
 9 files changed, 77 insertions(+), 9 deletions(-)
 create mode 100644 packages/bsky/src/data-plane/server/db/migrations/20250207T174822012Z-add-label-exp.ts

diff --git a/packages/bsky/src/data-plane/server/db/migrations/20250207T174822012Z-add-label-exp.ts b/packages/bsky/src/data-plane/server/db/migrations/20250207T174822012Z-add-label-exp.ts
new file mode 100644
index 00000000000..4fc3f9db02a
--- /dev/null
+++ b/packages/bsky/src/data-plane/server/db/migrations/20250207T174822012Z-add-label-exp.ts
@@ -0,0 +1,9 @@
+import { Kysely } from 'kysely'
+
+export async function up(db: Kysely<unknown>): Promise<void> {
+  await db.schema.alterTable('label').addColumn('exp', 'varchar').execute()
+}
+
+export async function down(db: Kysely<unknown>): Promise<void> {
+  await db.schema.alterTable('label').dropColumn('exp').execute()
+}
diff --git a/packages/bsky/src/data-plane/server/db/migrations/index.ts b/packages/bsky/src/data-plane/server/db/migrations/index.ts
index 90356eca865..890658bd43f 100644
--- a/packages/bsky/src/data-plane/server/db/migrations/index.ts
+++ b/packages/bsky/src/data-plane/server/db/migrations/index.ts
@@ -46,3 +46,4 @@ export * as _20240829T211238293Z from './20240829T211238293Z-simplify-actor-sync
 export * as _20240831T134810923Z from './20240831T134810923Z-pinned-posts'
 export * as _20241114T153108102Z from './20241114T153108102Z-add-starter-packs-name'
 export * as _20250116T222618297Z from './20250116T222618297Z-post-embed-video'
+export * as _20250207T174822012Z from './20250207T174822012Z-add-label-exp'
diff --git a/packages/bsky/src/data-plane/server/db/tables/label.ts b/packages/bsky/src/data-plane/server/db/tables/label.ts
index 0c8a398a7db..a2e783f3a65 100644
--- a/packages/bsky/src/data-plane/server/db/tables/label.ts
+++ b/packages/bsky/src/data-plane/server/db/tables/label.ts
@@ -7,6 +7,7 @@ export interface Label {
   val: string
   neg: boolean
   cts: string
+  exp: string | null
 }
 
 export type PartialDB = { [tableName]: Label }
diff --git a/packages/bsky/src/data-plane/server/routes/labels.ts b/packages/bsky/src/data-plane/server/routes/labels.ts
index 045279f8238..9c1e5438731 100644
--- a/packages/bsky/src/data-plane/server/routes/labels.ts
+++ b/packages/bsky/src/data-plane/server/routes/labels.ts
@@ -1,5 +1,5 @@
 import { ServiceImpl } from '@connectrpc/connect'
-import { Selectable } from 'kysely'
+import { Selectable, sql } from 'kysely'
 import * as ui8 from 'uint8arrays'
 import { noUndefinedVals } from '@atproto/common'
 import { Service } from '../../../proto/bsky_connect'
@@ -14,10 +14,14 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
     if (subjects.length === 0 || issuers.length === 0) {
       return { labels: [] }
     }
+
     const res: LabelRow[] = await db.db
       .selectFrom('label')
       .where('uri', 'in', subjects)
       .where('src', 'in', issuers)
+      .where((qb) =>
+        qb.where('exp', 'is', null).orWhere(sql`exp::timestamp > now()`),
+      )
       .selectAll()
       .execute()
 
@@ -34,6 +38,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       return labelsForSub.map((l) => {
         const formatted = noUndefinedVals({
           ...l,
+          exp: l.exp === null ? undefined : l.exp,
           cid: l.cid === '' ? undefined : l.cid,
           neg: l.neg === true ? true : undefined,
         })
diff --git a/packages/bsky/tests/label-hydration.test.ts b/packages/bsky/tests/label-hydration.test.ts
index c9711b24d40..88beb902684 100644
--- a/packages/bsky/tests/label-hydration.test.ts
+++ b/packages/bsky/tests/label-hydration.test.ts
@@ -1,4 +1,6 @@
+import assert from 'node:assert'
 import { AtpAgent } from '@atproto/api'
+import { MINUTE } from '@atproto/common'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 
 describe('label hydration', () => {
@@ -10,6 +12,7 @@ describe('label hydration', () => {
   let bob: string
   let carol: string
   let labelerDid: string
+  let labeler2Did: string
 
   beforeAll(async () => {
     network = await TestNetwork.create({
@@ -22,6 +25,7 @@ describe('label hydration', () => {
     bob = sc.dids.bob
     carol = sc.dids.carol
     labelerDid = network.bsky.ctx.cfg.labelsFromIssuerDids[0]
+    labeler2Did = network.bsky.ctx.cfg.labelsFromIssuerDids[1]
     await createLabel({ src: alice, uri: carol, cid: '', val: 'spam' })
     await createLabel({ src: bob, uri: carol, cid: '', val: 'impersonation' })
     await createLabel({
@@ -30,6 +34,20 @@ describe('label hydration', () => {
       cid: '',
       val: 'misleading',
     })
+    await createLabel({
+      src: labeler2Did,
+      uri: carol,
+      cid: '',
+      val: 'expired',
+      exp: new Date(Date.now() - MINUTE).toISOString(),
+    })
+    await createLabel({
+      src: labeler2Did,
+      uri: carol,
+      cid: '',
+      val: 'not-expired',
+      exp: new Date(Date.now() + MINUTE).toISOString(),
+    })
     await network.processAll()
   })
 
@@ -39,17 +57,33 @@ describe('label hydration', () => {
 
   it('hydrates labels based on a supplied labeler header', async () => {
     AtpAgent.configure({ appLabelers: [alice] })
-    pdsAgent.configureLabelers([])
+    pdsAgent.configureLabelers([labeler2Did])
     const res = await pdsAgent.api.app.bsky.actor.getProfile(
       { actor: carol },
       {
         headers: sc.getHeaders(bob),
       },
     )
-    expect(res.data.labels?.length).toBe(1)
-    expect(res.data.labels?.[0].src).toBe(alice)
-    expect(res.data.labels?.[0].val).toBe('spam')
-    expect(res.headers['atproto-content-labelers']).toEqual(`${alice};redact`)
+    expect(res.data.labels?.length).toBe(2)
+    assert(res.data.labels)
+
+    const sortedLabels = res.data.labels.sort((a, b) =>
+      a.src.localeCompare(b.src),
+    )
+    const sortedExpected = [
+      { src: labeler2Did, val: 'not-expired' },
+      { src: alice, val: 'spam' },
+    ].sort((a, b) => a.src.localeCompare(b.src))
+
+    expect(sortedLabels[0].src).toBe(sortedExpected[0].src)
+    expect(sortedLabels[0].val).toBe(sortedExpected[0].val)
+
+    expect(sortedLabels[1].src).toBe(sortedExpected[1].src)
+    expect(sortedLabels[1].val).toBe(sortedExpected[1].val)
+
+    expect(res.headers['atproto-content-labelers']).toEqual(
+      `${alice};redact,${labeler2Did}`,
+    )
   })
 
   it('hydrates labels based on multiple a supplied labelers', async () => {
@@ -88,9 +122,21 @@ describe('label hydration', () => {
       { headers: sc.getHeaders(bob) },
     )
     const data = await res.json()
-    expect(data.labels?.length).toBe(1)
-    expect(data.labels?.[0].src).toBe(labelerDid)
-    expect(data.labels?.[0].val).toBe('misleading')
+
+    expect(data.labels?.length).toBe(2)
+    assert(data.labels)
+
+    const sortedLabels = data.labels.sort((a, b) => a.src.localeCompare(b.src))
+    const sortedExpected = [
+      { src: labeler2Did, val: 'not-expired' },
+      { src: labelerDid, val: 'misleading' },
+    ].sort((a, b) => a.src.localeCompare(b.src))
+
+    expect(sortedLabels[0].src).toBe(sortedExpected[0].src)
+    expect(sortedLabels[0].val).toBe(sortedExpected[0].val)
+
+    expect(sortedLabels[1].src).toBe(sortedExpected[1].src)
+    expect(sortedLabels[1].val).toBe(sortedExpected[1].val)
 
     expect(res.headers.get('atproto-content-labelers')).toEqual(
       network.bsky.ctx.cfg.labelsFromIssuerDids
@@ -181,6 +227,7 @@ describe('label hydration', () => {
     uri: string
     cid: string
     val: string
+    exp?: string
   }) => {
     await network.bsky.db.db
       .insertInto('label')
@@ -189,6 +236,7 @@ describe('label hydration', () => {
         cid: opts.cid,
         val: opts.val,
         cts: new Date().toISOString(),
+        exp: opts.exp ?? null,
         neg: false,
         src: opts.src ?? labelerDid,
       })
diff --git a/packages/bsky/tests/query-labels.test.ts b/packages/bsky/tests/query-labels.test.ts
index 401bba89ecd..059575322a5 100644
--- a/packages/bsky/tests/query-labels.test.ts
+++ b/packages/bsky/tests/query-labels.test.ts
@@ -76,6 +76,7 @@ describe('label hydration', () => {
         cid: opts.cid,
         val: opts.val,
         cts: new Date().toISOString(),
+        exp: null,
         neg: false,
         src: opts.src ?? labelerDid,
       })
diff --git a/packages/bsky/tests/views/labels-needs-review.test.ts b/packages/bsky/tests/views/labels-needs-review.test.ts
index dbd37bdb1c3..02e23f18cd8 100644
--- a/packages/bsky/tests/views/labels-needs-review.test.ts
+++ b/packages/bsky/tests/views/labels-needs-review.test.ts
@@ -50,6 +50,7 @@ describe('bsky needs-review labels', () => {
         uri: sc.dids.geoff,
         cid: '',
         val: 'needs-review',
+        exp: null,
         neg: false,
         cts: new Date().toISOString(),
       })
diff --git a/packages/bsky/tests/views/labels-takedown.test.ts b/packages/bsky/tests/views/labels-takedown.test.ts
index 0cb2bbbbbac..d4a9dd2dd63 100644
--- a/packages/bsky/tests/views/labels-takedown.test.ts
+++ b/packages/bsky/tests/views/labels-takedown.test.ts
@@ -122,6 +122,7 @@ describe('bsky takedown labels', () => {
       uri,
       cid: '',
       val: '!takedown',
+      exp: null,
       neg: false,
       cts,
     }))
diff --git a/packages/bsky/tests/views/timeline.test.ts b/packages/bsky/tests/views/timeline.test.ts
index 46727b0740f..831fba5eabf 100644
--- a/packages/bsky/tests/views/timeline.test.ts
+++ b/packages/bsky/tests/views/timeline.test.ts
@@ -315,6 +315,7 @@ const createLabel = async (
       cid: opts.cid,
       val: opts.val,
       cts: new Date().toISOString(),
+      exp: null,
       neg: false,
       src: EXAMPLE_LABELER,
     })

From 3c7976a0d1349d2e48d0e363f21a672753996562 Mon Sep 17 00:00:00 2001
From: devin ivy <devinivy@gmail.com>
Date: Thu, 13 Feb 2025 22:56:50 -0500
Subject: [PATCH 058/101] Appview: apply needs-review to individual records
 (#3532)

appview: apply needs-review to individual records
---
 .../bsky/src/api/app/bsky/feed/getQuotes.ts   |   2 +-
 .../bsky/notification/listNotifications.ts    |   2 +-
 packages/bsky/src/views/index.ts              |  24 +-
 .../tests/views/labels-needs-review.test.ts   | 359 ++++++++++++------
 4 files changed, 271 insertions(+), 116 deletions(-)

diff --git a/packages/bsky/src/api/app/bsky/feed/getQuotes.ts b/packages/bsky/src/api/app/bsky/feed/getQuotes.ts
index d7c7f95d3dc..3f91befa08e 100644
--- a/packages/bsky/src/api/app/bsky/feed/getQuotes.ts
+++ b/packages/bsky/src/api/app/bsky/feed/getQuotes.ts
@@ -82,7 +82,7 @@ const noBlocksOrNeedsReview = (inputs: {
     return (
       !ctx.views.viewerBlockExists(authorDid, hydration) &&
       !hydration.postBlocks?.get(uri)?.embed &&
-      ctx.views.viewerSeesNeedsReview(authorDid, hydration)
+      ctx.views.viewerSeesNeedsReview({ did: authorDid, uri }, hydration)
     )
   })
   return skeleton
diff --git a/packages/bsky/src/api/app/bsky/notification/listNotifications.ts b/packages/bsky/src/api/app/bsky/notification/listNotifications.ts
index 07d11dac56e..106cdafd490 100644
--- a/packages/bsky/src/api/app/bsky/notification/listNotifications.ts
+++ b/packages/bsky/src/api/app/bsky/notification/listNotifications.ts
@@ -182,7 +182,7 @@ const noBlockOrMutesOrNeedsReview = (
       item.reason === 'like' ||
       item.reason === 'follow'
     ) {
-      if (!ctx.views.viewerSeesNeedsReview(did, hydration)) {
+      if (!ctx.views.viewerSeesNeedsReview({ did, uri: item.uri }, hydration)) {
         return false
       }
     }
diff --git a/packages/bsky/src/views/index.ts b/packages/bsky/src/views/index.ts
index ec40166e4dd..3dd6d17446f 100644
--- a/packages/bsky/src/views/index.ts
+++ b/packages/bsky/src/views/index.ts
@@ -176,13 +176,23 @@ export class Views {
     return uri
   }
 
-  viewerSeesNeedsReview(did: string, state: HydrationState): boolean {
+  viewerSeesNeedsReview(
+    { did, uri }: { did?: string; uri?: string },
+    state: HydrationState,
+  ): boolean {
     const { labels, profileViewers, ctx } = state
-    return (
-      !labels?.get(did)?.needsReview ||
-      ctx?.viewer === did ||
-      !!profileViewers?.get(did)?.following
-    )
+    did = did || (uri && uriToDid(uri))
+    if (!did) {
+      return true
+    }
+    if (
+      labels?.get(did)?.needsReview ||
+      (uri && labels?.get(uri)?.needsReview)
+    ) {
+      // content marked as needs review
+      return ctx?.viewer === did || !!profileViewers?.get(did)?.following
+    }
+    return true
   }
 
   replyIsHiddenByThreadgate(
@@ -972,7 +982,7 @@ export class Views {
       if (this.viewerBlockExists(post.author.did, state)) {
         return this.blockedPost(uri, post.author.did, state)
       }
-      if (!this.viewerSeesNeedsReview(post.author.did, state)) {
+      if (!this.viewerSeesNeedsReview({ uri, did: post.author.did }, state)) {
         return undefined
       }
       return {
diff --git a/packages/bsky/tests/views/labels-needs-review.test.ts b/packages/bsky/tests/views/labels-needs-review.test.ts
index 02e23f18cd8..179fb8f3e3d 100644
--- a/packages/bsky/tests/views/labels-needs-review.test.ts
+++ b/packages/bsky/tests/views/labels-needs-review.test.ts
@@ -43,127 +43,272 @@ describe('bsky needs-review labels', () => {
     await network.processAll()
 
     AtpAgent.configure({ appLabelers: [network.ozone.ctx.cfg.service.did] })
-    await network.bsky.db.db
-      .insertInto('label')
-      .values({
-        src: network.ozone.ctx.cfg.service.did,
-        uri: sc.dids.geoff,
-        cid: '',
-        val: 'needs-review',
-        exp: null,
-        neg: false,
-        cts: new Date().toISOString(),
-      })
-      .execute()
   })
 
   afterAll(async () => {
     await network.close()
   })
 
-  it('applies to thread replies.', async () => {
-    const {
-      data: { thread },
-    } = await agent.app.bsky.feed.getPostThread({
-      uri: sc.posts[sc.dids.alice][0].ref.uriStr,
+  describe('account-level', () => {
+    beforeAll(async () => {
+      await network.bsky.db.db
+        .insertInto('label')
+        .values({
+          src: network.ozone.ctx.cfg.service.did,
+          uri: sc.dids.geoff,
+          cid: '',
+          val: 'needs-review',
+          exp: null,
+          neg: false,
+          cts: new Date().toISOString(),
+        })
+        .execute()
     })
-    assert(isThreadViewPost(thread))
-    expect(
-      thread.replies?.some((reply) => {
-        return (
-          isThreadViewPost(reply) && reply.post.author.did === sc.dids.geoff
-        )
-      }),
-    ).toBe(false)
-  })
 
-  it('applies to quote lists.', async () => {
-    const {
-      data: { posts },
-    } = await agent.app.bsky.feed.getQuotes({
-      uri: sc.posts[sc.dids.alice][0].ref.uriStr,
+    afterAll(async () => {
+      await network.bsky.db.db
+        .deleteFrom('label')
+        .where('src', '=', network.ozone.ctx.cfg.service.did)
+        .execute()
     })
-    expect(
-      posts.some((post) => {
-        return post.author.did === sc.dids.geoff
-      }),
-    ).toBe(false)
-  })
 
-  it('applies to reply, quote, and mention notifications.', async () => {
-    const {
-      data: { notifications },
-    } = await agent.app.bsky.notification.listNotifications(
-      {},
-      {
-        headers: await network.serviceHeaders(
-          sc.dids.alice,
-          ids.AppBskyNotificationListNotifications,
-        ),
-      },
-    )
-    expect(
-      notifications.some((notif) => {
-        return notif.reason === 'reply' && notif.author.did === sc.dids.geoff
-      }),
-    ).toBe(false)
-    expect(
-      notifications.some((notif) => {
-        return notif.reason === 'quote' && notif.author.did === sc.dids.geoff
-      }),
-    ).toBe(false)
-    expect(
-      notifications.some((notif) => {
-        return notif.reason === 'mention' && notif.author.did === sc.dids.geoff
-      }),
-    ).toBe(false)
-  })
+    it('applies to thread replies.', async () => {
+      const {
+        data: { thread },
+      } = await agent.app.bsky.feed.getPostThread({
+        uri: sc.posts[sc.dids.alice][0].ref.uriStr,
+      })
+      assert(isThreadViewPost(thread))
+      expect(
+        thread.replies?.some((reply) => {
+          return (
+            isThreadViewPost(reply) && reply.post.author.did === sc.dids.geoff
+          )
+        }),
+      ).toBe(false)
+    })
 
-  it('does not apply to self.', async () => {
-    const {
-      data: { thread },
-    } = await agent.app.bsky.feed.getPostThread(
-      {
+    it('applies to quote lists.', async () => {
+      const {
+        data: { posts },
+      } = await agent.app.bsky.feed.getQuotes({
         uri: sc.posts[sc.dids.alice][0].ref.uriStr,
-      },
-      {
-        headers: await network.serviceHeaders(
-          sc.dids.geoff,
-          ids.AppBskyFeedGetPostThread,
-        ),
-      },
-    )
-    assert(isThreadViewPost(thread))
-    expect(
-      thread.replies?.some((reply) => {
-        return (
-          isThreadViewPost(reply) && reply.post.author.did === sc.dids.geoff
-        )
-      }),
-    ).toBe(true)
+      })
+      expect(
+        posts.some((post) => {
+          return post.author.did === sc.dids.geoff
+        }),
+      ).toBe(false)
+    })
+
+    it('applies to reply, quote, and mention notifications.', async () => {
+      const {
+        data: { notifications },
+      } = await agent.app.bsky.notification.listNotifications(
+        {},
+        {
+          headers: await network.serviceHeaders(
+            sc.dids.alice,
+            ids.AppBskyNotificationListNotifications,
+          ),
+        },
+      )
+      expect(
+        notifications.some((notif) => {
+          return notif.reason === 'reply' && notif.author.did === sc.dids.geoff
+        }),
+      ).toBe(false)
+      expect(
+        notifications.some((notif) => {
+          return notif.reason === 'quote' && notif.author.did === sc.dids.geoff
+        }),
+      ).toBe(false)
+      expect(
+        notifications.some((notif) => {
+          return (
+            notif.reason === 'mention' && notif.author.did === sc.dids.geoff
+          )
+        }),
+      ).toBe(false)
+    })
+
+    it('does not apply to self.', async () => {
+      const {
+        data: { thread },
+      } = await agent.app.bsky.feed.getPostThread(
+        {
+          uri: sc.posts[sc.dids.alice][0].ref.uriStr,
+        },
+        {
+          headers: await network.serviceHeaders(
+            sc.dids.geoff,
+            ids.AppBskyFeedGetPostThread,
+          ),
+        },
+      )
+      assert(isThreadViewPost(thread))
+      expect(
+        thread.replies?.some((reply) => {
+          return (
+            isThreadViewPost(reply) && reply.post.author.did === sc.dids.geoff
+          )
+        }),
+      ).toBe(true)
+    })
+
+    it('does not apply to followers.', async () => {
+      const {
+        data: { thread },
+      } = await agent.app.bsky.feed.getPostThread(
+        {
+          uri: sc.posts[sc.dids.alice][0].ref.uriStr,
+        },
+        {
+          headers: await network.serviceHeaders(
+            sc.dids.bob, // follows geoff
+            ids.AppBskyFeedGetPostThread,
+          ),
+        },
+      )
+      assert(isThreadViewPost(thread))
+      expect(
+        thread.replies?.some((reply) => {
+          return (
+            isThreadViewPost(reply) && reply.post.author.did === sc.dids.geoff
+          )
+        }),
+      ).toBe(true)
+    })
   })
 
-  it('does not apply to followers.', async () => {
-    const {
-      data: { thread },
-    } = await agent.app.bsky.feed.getPostThread(
-      {
-        uri: sc.posts[sc.dids.alice][0].ref.uriStr,
-      },
-      {
-        headers: await network.serviceHeaders(
-          sc.dids.bob, // follows geoff
-          ids.AppBskyFeedGetPostThread,
-        ),
-      },
-    )
-    assert(isThreadViewPost(thread))
-    expect(
-      thread.replies?.some((reply) => {
-        return (
-          isThreadViewPost(reply) && reply.post.author.did === sc.dids.geoff
+  describe('record-level', () => {
+    beforeAll(async () => {
+      const geoffPostUris = [
+        ...sc.posts[sc.dids.geoff],
+        ...sc.replies[sc.dids.geoff],
+      ].map((post) => post.ref.uriStr)
+      await network.bsky.db.db
+        .insertInto('label')
+        .values(
+          geoffPostUris.map((uri) => ({
+            src: network.ozone.ctx.cfg.service.did,
+            uri,
+            cid: '',
+            val: 'needs-review',
+            exp: null,
+            neg: false,
+            cts: new Date().toISOString(),
+          })),
         )
-      }),
-    ).toBe(true)
+        .execute()
+    })
+
+    it('applies to thread replies.', async () => {
+      const {
+        data: { thread },
+      } = await agent.app.bsky.feed.getPostThread({
+        uri: sc.posts[sc.dids.alice][0].ref.uriStr,
+      })
+      assert(isThreadViewPost(thread))
+      expect(
+        thread.replies?.some((reply) => {
+          return (
+            isThreadViewPost(reply) && reply.post.author.did === sc.dids.geoff
+          )
+        }),
+      ).toBe(false)
+    })
+
+    it('applies to quote lists.', async () => {
+      const {
+        data: { posts },
+      } = await agent.app.bsky.feed.getQuotes({
+        uri: sc.posts[sc.dids.alice][0].ref.uriStr,
+      })
+      expect(
+        posts.some((post) => {
+          return post.author.did === sc.dids.geoff
+        }),
+      ).toBe(false)
+    })
+
+    it('applies to reply, quote, and mention notifications.', async () => {
+      const {
+        data: { notifications },
+      } = await agent.app.bsky.notification.listNotifications(
+        {},
+        {
+          headers: await network.serviceHeaders(
+            sc.dids.alice,
+            ids.AppBskyNotificationListNotifications,
+          ),
+        },
+      )
+      expect(
+        notifications.some((notif) => {
+          return notif.reason === 'reply' && notif.author.did === sc.dids.geoff
+        }),
+      ).toBe(false)
+      expect(
+        notifications.some((notif) => {
+          return notif.reason === 'quote' && notif.author.did === sc.dids.geoff
+        }),
+      ).toBe(false)
+      expect(
+        notifications.some((notif) => {
+          return (
+            notif.reason === 'mention' && notif.author.did === sc.dids.geoff
+          )
+        }),
+      ).toBe(false)
+    })
+
+    it('does not apply to self.', async () => {
+      const {
+        data: { thread },
+      } = await agent.app.bsky.feed.getPostThread(
+        {
+          uri: sc.posts[sc.dids.alice][0].ref.uriStr,
+        },
+        {
+          headers: await network.serviceHeaders(
+            sc.dids.geoff,
+            ids.AppBskyFeedGetPostThread,
+          ),
+        },
+      )
+      assert(isThreadViewPost(thread))
+      expect(
+        thread.replies?.some((reply) => {
+          return (
+            isThreadViewPost(reply) && reply.post.author.did === sc.dids.geoff
+          )
+        }),
+      ).toBe(true)
+    })
+
+    it('does not apply to followers.', async () => {
+      const {
+        data: { thread },
+      } = await agent.app.bsky.feed.getPostThread(
+        {
+          uri: sc.posts[sc.dids.alice][0].ref.uriStr,
+        },
+        {
+          headers: await network.serviceHeaders(
+            sc.dids.bob, // follows geoff
+            ids.AppBskyFeedGetPostThread,
+          ),
+        },
+      )
+      assert(isThreadViewPost(thread))
+      expect(
+        thread.replies?.some((reply) => {
+          return (
+            isThreadViewPost(reply) && reply.post.author.did === sc.dids.geoff
+          )
+        }),
+      ).toBe(true)
+    })
   })
 })

From 6ea9c961af964cd9b0d00b5073c695c5e0b3345a Mon Sep 17 00:00:00 2001
From: Matthieu Sieben <matthieusieben@users.noreply.github.com>
Date: Fri, 14 Feb 2025 09:38:57 +0100
Subject: [PATCH 059/101] Rework of authorization request hooks (#3525)

* Rework of authorization request hooks

* add device details to `onAuthorized` hook

* Expose port number in DeviceDetails, allow passing options to DeviceManager

* tidy

* tidy

* tidy

* tidy

* changeset

* Expose client request metadata in hooks

* tidy

* tidy

* docs
---
 .changeset/friendly-berries-kick.md           |   6 +
 .changeset/gentle-islands-impress.md          |   9 +
 .changeset/seven-falcons-pump.md              |   5 +
 packages/oauth/oauth-provider/package.json    |   2 -
 .../src/client/client-manager.ts              |  20 +--
 .../oauth-provider/src/device/device-data.ts  |   5 +-
 .../src/device/device-details.ts              |  42 -----
 .../src/device/device-manager.ts              | 168 ++++++++++--------
 .../oauth-provider/src/lib/http/accept.ts     |   8 +-
 .../oauth-provider/src/lib/http/method.ts     |   2 +-
 .../oauth-provider/src/lib/http/request.ts    |  65 ++++++-
 .../oauth-provider/src/lib/http/response.ts   |   5 +-
 .../oauth-provider/src/lib/http/route.ts      |   3 +-
 .../oauth-provider/src/lib/http/router.ts     |   3 +-
 .../oauth-provider/src/lib/http/stream.ts     |   2 +-
 .../oauth-provider/src/lib/http/types.ts      |   1 -
 .../oauth-provider/src/lib/util/function.ts   |  21 ++-
 .../oauth/oauth-provider/src/oauth-hooks.ts   |  86 +++++++--
 .../oauth-provider/src/oauth-provider.ts      |  97 +++++++---
 .../src/output/output-manager.ts              |   2 +-
 .../src/output/send-authorize-redirect.ts     |   2 +-
 .../src/output/send-web-page.ts               |   2 +-
 .../src/request/request-manager.ts            |  15 +-
 .../oauth-provider/src/token/token-manager.ts |  75 +++++---
 packages/pds/src/oauth/provider.ts            |   6 -
 pnpm-lock.yaml                                |  24 ---
 26 files changed, 429 insertions(+), 247 deletions(-)
 create mode 100644 .changeset/friendly-berries-kick.md
 create mode 100644 .changeset/gentle-islands-impress.md
 create mode 100644 .changeset/seven-falcons-pump.md
 delete mode 100644 packages/oauth/oauth-provider/src/device/device-details.ts

diff --git a/.changeset/friendly-berries-kick.md b/.changeset/friendly-berries-kick.md
new file mode 100644
index 00000000000..3943d923f7e
--- /dev/null
+++ b/.changeset/friendly-berries-kick.md
@@ -0,0 +1,6 @@
+---
+"@atproto/oauth-provider": minor
+---
+
+Rename `onClientInfo` and `onAuthorizationDetails` hooks to `getClientInfo` and `getAuthorizationDetails` respectively.
+
diff --git a/.changeset/gentle-islands-impress.md b/.changeset/gentle-islands-impress.md
new file mode 100644
index 00000000000..8fdcd01e1c1
--- /dev/null
+++ b/.changeset/gentle-islands-impress.md
@@ -0,0 +1,9 @@
+---
+"@atproto/oauth-provider": patch
+---
+
+Add the following hooks in the `OAuthProvider`:
+
+- `onAuthorized` which is triggered when the user "authorized" a client (a `code` is issued)
+- `onTokenCreated` which is triggered when the code is exchanged for a token
+- `onTokenRefreshed` which is triggered when a refresh token is exchanged for a new access token
diff --git a/.changeset/seven-falcons-pump.md b/.changeset/seven-falcons-pump.md
new file mode 100644
index 00000000000..368df048493
--- /dev/null
+++ b/.changeset/seven-falcons-pump.md
@@ -0,0 +1,5 @@
+---
+"@atproto/pds": patch
+---
+
+Dead code cleanup.
diff --git a/packages/oauth/oauth-provider/package.json b/packages/oauth/oauth-provider/package.json
index 248bb61a394..d35765d8bb1 100644
--- a/packages/oauth/oauth-provider/package.json
+++ b/packages/oauth/oauth-provider/package.json
@@ -47,7 +47,6 @@
     "http-errors": "^2.0.0",
     "ioredis": "^5.3.2",
     "jose": "^5.2.0",
-    "keygrip": "^1.1.0",
     "psl": "^1.9.0",
     "zod": "^3.23.8"
   },
@@ -59,7 +58,6 @@
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^11.1.6",
     "@types/cookie": "^0.6.0",
-    "@types/keygrip": "^1.0.6",
     "@types/psl": "1.1.3",
     "@types/react": "^18.2.50",
     "@types/react-dom": "^18.2.18",
diff --git a/packages/oauth/oauth-provider/src/client/client-manager.ts b/packages/oauth/oauth-provider/src/client/client-manager.ts
index 677448642b9..b58c7a941f3 100644
--- a/packages/oauth/oauth-provider/src/client/client-manager.ts
+++ b/packages/oauth/oauth-provider/src/client/client-manager.ts
@@ -110,17 +110,15 @@ export class ClientManager {
         })
       : undefined
 
-    const partialInfo = this.hooks.onClientInfo
-      ? await callAsync(this.hooks.onClientInfo, clientId, {
-          metadata,
-          jwks,
-        }).catch((err) => {
-          throw InvalidClientMetadataError.from(
-            err,
-            `Rejected client information for "${clientId}"`,
-          )
-        })
-      : undefined
+    const partialInfo = await callAsync(this.hooks.getClientInfo, clientId, {
+      metadata,
+      jwks,
+    }).catch((err) => {
+      throw InvalidClientMetadataError.from(
+        err,
+        `Rejected client information for "${clientId}"`,
+      )
+    })
 
     const isFirstParty = partialInfo?.isFirstParty ?? false
     const isTrusted = partialInfo?.isTrusted ?? isFirstParty
diff --git a/packages/oauth/oauth-provider/src/device/device-data.ts b/packages/oauth/oauth-provider/src/device/device-data.ts
index c9ef01ab680..aa3fd0366a0 100644
--- a/packages/oauth/oauth-provider/src/device/device-data.ts
+++ b/packages/oauth/oauth-provider/src/device/device-data.ts
@@ -1,10 +1,11 @@
 import { z } from 'zod'
-import { deviceDetailsSchema } from './device-details.js'
 import { sessionIdSchema } from './session-id.js'
 
-export const deviceDataSchema = deviceDetailsSchema.extend({
+export const deviceDataSchema = z.object({
   sessionId: sessionIdSchema,
   lastSeenAt: z.date(),
+  userAgent: z.string().nullable(),
+  ipAddress: z.string(),
 })
 
 export type DeviceData = z.infer<typeof deviceDataSchema>
diff --git a/packages/oauth/oauth-provider/src/device/device-details.ts b/packages/oauth/oauth-provider/src/device/device-details.ts
deleted file mode 100644
index 21ae8dd55dc..00000000000
--- a/packages/oauth/oauth-provider/src/device/device-details.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { IncomingMessage } from 'node:http'
-import { z } from 'zod'
-
-export const deviceDetailsSchema = z.object({
-  userAgent: z.string().nullable(),
-  ipAddress: z.string(),
-})
-export type DeviceDetails = z.infer<typeof deviceDetailsSchema>
-
-export function extractDeviceDetails(
-  req: IncomingMessage,
-  trustProxy: boolean,
-): DeviceDetails {
-  const userAgent = req.headers['user-agent'] || null
-  const ipAddress = extractIpAddress(req, trustProxy) || null
-
-  if (!ipAddress) {
-    throw new Error('Could not determine IP address')
-  }
-
-  return { userAgent, ipAddress }
-}
-
-export function extractIpAddress(
-  req: IncomingMessage,
-  trustProxy: boolean,
-): string | undefined {
-  // Express app compatibility
-  if ('ip' in req && typeof req.ip === 'string') {
-    return req.ip
-  }
-
-  if (trustProxy) {
-    const forwardedFor = req.headers['x-forwarded-for']
-    if (typeof forwardedFor === 'string') {
-      const firstForward = forwardedFor.split(',')[0]!.trim()
-      if (firstForward) return firstForward
-    }
-  }
-
-  return req.socket.remoteAddress
-}
diff --git a/packages/oauth/oauth-provider/src/device/device-manager.ts b/packages/oauth/oauth-provider/src/device/device-manager.ts
index 5a2c540f6f1..a9f18965d66 100644
--- a/packages/oauth/oauth-provider/src/device/device-manager.ts
+++ b/packages/oauth/oauth-provider/src/device/device-manager.ts
@@ -1,84 +1,89 @@
-import { IncomingMessage, ServerResponse } from 'node:http'
+import type { IncomingMessage, ServerResponse } from 'node:http'
 import { serialize as serializeCookie } from 'cookie'
-import type Keygrip from 'keygrip'
 import { z } from 'zod'
 import { SESSION_FIXATION_MAX_AGE } from '../constants.js'
 import { appendHeader, parseHttpCookies } from '../lib/http/index.js'
+import { RequestMetadata, extractRequestMetadata } from '../lib/http/request.js'
 import { DeviceData } from './device-data.js'
-import { extractDeviceDetails } from './device-details.js'
 import { DeviceId, deviceIdSchema, generateDeviceId } from './device-id.js'
 import { DeviceStore } from './device-store.js'
 import { generateSessionId, sessionIdSchema } from './session-id.js'
 
-export const DEFAULT_OPTIONS = {
+/**
+ * @see {@link https://www.npmjs.com/package/keygrip | Keygrip}
+ */
+export const keygripSchema = z.object({
+  sign: z.function().args(z.any()).returns(z.string()),
+  verify: z.function().args(z.any(), z.string()).returns(z.boolean()),
+  index: z.function().args(z.any(), z.string()).returns(z.number()),
+})
+
+export const deviceManagerOptionsSchema = z.object({
   /**
    * Controls whether the IP address is read from the `X-Forwarded-For` header
    * (if `true`), or from the `req.socket.remoteAddress` property (if `false`).
    *
    * @default true // (nowadays, most requests are proxied)
    */
-  trustProxy: true,
-
+  trustProxy: z.boolean().default(true),
   /**
    * Amount of time (in ms) after which session IDs will be rotated
    *
    * @default 300e3 // (5 minutes)
    */
-  rotationRate: 5 * 60e3,
-
+  rotationRate: z.number().default(300e3),
   /**
    * Cookie options
    */
-  cookie: {
-    keys: undefined as undefined | Keygrip,
-
-    /**
-     * Name of the cookie used to identify the device
-     *
-     * @default 'session-id'
-     */
-    device: 'device-id',
-
-    /**
-     * Name of the cookie used to identify the session
-     *
-     * @default 'session-id'
-     */
-    session: 'session-id',
-
-    /**
-     * Url path for the cookie
-     *
-     * @default '/oauth/authorize'
-     */
-    path: '/oauth/authorize',
-
-    /**
-     * Amount of time (in ms) after which the session cookie will expire.
-     * If set to `null`, the cookie will be a session cookie (deleted when the
-     * browser is closed).
-     *
-     * @default 10 * 365.2 * 24 * 60 * 60e3 // 10 years (in ms)
-     */
-    age: <number | null>(10 * 365.2 * 24 * 60 * 60e3),
-
-    /**
-     * Controls whether the cookie is only sent over HTTPS (if `true`), or also
-     * over HTTP (if `false`). This should **NOT** be set to `false` in
-     * production.
-     */
-    secure: true,
-
-    /**
-     * Controls whether the cookie is sent along with cross-site requests.
-     *
-     * @default 'lax'
-     */
-    sameSite: 'lax' as 'lax' | 'strict',
-  },
-}
+  cookie: z
+    .object({
+      keys: keygripSchema.optional(),
+      /**
+       * Name of the cookie used to identify the device
+       *
+       * @default 'session-id'
+       */
+      device: z.string().default('device-id'),
+      /**
+       * Name of the cookie used to identify the session
+       *
+       * @default 'session-id'
+       */
+      session: z.string().default('session-id'),
+      /**
+       * Url path for the cookie
+       *
+       * @default '/oauth/authorize'
+       */
+      path: z.string().default('/oauth/authorize'),
+      /**
+       * Amount of time (in ms) after which the session cookie will expire.
+       * If set to `null`, the cookie will be a session cookie (deleted when the
+       * browser is closed).
+       *
+       * @default 10 years
+       */
+      age: z
+        .number()
+        .nullable()
+        .default(10 * 365.2 * 24 * 60 * 60e3),
+      /**
+       * Controls whether the cookie is only sent over HTTPS (if `true`), or also
+       * over HTTP (if `false`). This should **NOT** be set to `false` in
+       * production.
+       */
+      secure: z.boolean().default(true),
+      /**
+       * Controls whether the cookie is sent along with cross-site requests.
+       *
+       * @default 'lax'
+       */
+      sameSite: z.enum(['lax', 'strict']).default('lax'),
+    })
+    .default({}),
+})
 
-export type DeviceDeviceManagerOptions = typeof DEFAULT_OPTIONS
+export type DeviceManagerOptions = z.input<typeof deviceManagerOptionsSchema>
 
 const cookieValueSchema = z.tuple([deviceIdSchema, sessionIdSchema])
 type CookieValue = z.infer<typeof cookieValueSchema>
@@ -89,16 +94,23 @@ type CookieValue = z.infer<typeof cookieValueSchema>
  * identify the session.
  */
 export class DeviceManager {
+  private readonly options: z.infer<typeof deviceManagerOptionsSchema>
+
   constructor(
     private readonly store: DeviceStore,
-    private readonly options: DeviceDeviceManagerOptions = DEFAULT_OPTIONS,
-  ) {}
+    options: DeviceManagerOptions = {},
+  ) {
+    this.options = deviceManagerOptionsSchema.parse(options)
+  }
 
   public async load(
     req: IncomingMessage,
     res: ServerResponse,
     forceRotate = false,
-  ): Promise<{ deviceId: DeviceId }> {
+  ): Promise<{
+    deviceId: DeviceId
+    deviceMetadata: RequestMetadata
+  }> {
     const cookie = await this.getCookie(req)
     if (cookie) {
       return this.refresh(
@@ -115,8 +127,11 @@ export class DeviceManager {
   private async create(
     req: IncomingMessage,
     res: ServerResponse,
-  ): Promise<{ deviceId: DeviceId }> {
-    const { userAgent, ipAddress } = this.getDeviceDetails(req)
+  ): Promise<{
+    deviceId: DeviceId
+    deviceMetadata: RequestMetadata
+  }> {
+    const deviceMetadata = this.getRequestMetadata(req)
 
     const [deviceId, sessionId] = await Promise.all([
       generateDeviceId(),
@@ -126,13 +141,13 @@ export class DeviceManager {
     await this.store.createDevice(deviceId, {
       sessionId,
       lastSeenAt: new Date(),
-      userAgent,
-      ipAddress,
+      userAgent: deviceMetadata.userAgent,
+      ipAddress: deviceMetadata.ipAddress,
     })
 
     this.setCookie(res, [deviceId, sessionId])
 
-    return { deviceId }
+    return { deviceId, deviceMetadata }
   }
 
   private async refresh(
@@ -140,7 +155,10 @@ export class DeviceManager {
     res: ServerResponse,
     [deviceId, sessionId]: CookieValue,
     forceRotate = false,
-  ): Promise<{ deviceId: DeviceId }> {
+  ): Promise<{
+    deviceId: DeviceId
+    deviceMetadata: RequestMetadata
+  }> {
     const data = await this.store.readDevice(deviceId)
     if (!data) return this.create(req, res)
 
@@ -159,24 +177,24 @@ export class DeviceManager {
       }
     }
 
-    const details = this.getDeviceDetails(req)
+    const deviceMetadata = this.getRequestMetadata(req)
 
     if (
       forceRotate ||
-      details.ipAddress !== data.ipAddress ||
-      details.userAgent !== data.userAgent ||
+      deviceMetadata.ipAddress !== data.ipAddress ||
+      deviceMetadata.userAgent !== data.userAgent ||
       age > this.options.rotationRate
     ) {
       await this.rotate(req, res, deviceId, {
-        ipAddress: details.ipAddress,
-        userAgent: details.userAgent || data.userAgent,
+        ipAddress: deviceMetadata.ipAddress,
+        userAgent: deviceMetadata.userAgent || data.userAgent,
       })
     }
 
-    return { deviceId }
+    return { deviceId, deviceMetadata }
   }
 
-  public async rotate(
+  private async rotate(
     req: IncomingMessage,
     res: ServerResponse,
     deviceId: DeviceId,
@@ -284,7 +302,7 @@ export class DeviceManager {
     }
   }
 
-  private getDeviceDetails(req: IncomingMessage) {
-    return extractDeviceDetails(req, this.options.trustProxy)
+  public getRequestMetadata(req: IncomingMessage) {
+    return extractRequestMetadata(req, this.options)
   }
 }
diff --git a/packages/oauth/oauth-provider/src/lib/http/accept.ts b/packages/oauth/oauth-provider/src/lib/http/accept.ts
index b51641ecdb0..a5eef96676f 100644
--- a/packages/oauth/oauth-provider/src/lib/http/accept.ts
+++ b/packages/oauth/oauth-provider/src/lib/http/accept.ts
@@ -1,11 +1,7 @@
+import type { IncomingMessage, ServerResponse } from 'node:http'
 import { mediaType } from '@hapi/accept'
 import { SubCtx, subCtx } from './context.js'
-import {
-  IncomingMessage,
-  Middleware,
-  NextFunction,
-  ServerResponse,
-} from './types.js'
+import { Middleware, NextFunction } from './types.js'
 
 type View<
   T,
diff --git a/packages/oauth/oauth-provider/src/lib/http/method.ts b/packages/oauth/oauth-provider/src/lib/http/method.ts
index 8459bbc77ac..2f2975a23c5 100644
--- a/packages/oauth/oauth-provider/src/lib/http/method.ts
+++ b/packages/oauth/oauth-provider/src/lib/http/method.ts
@@ -1,4 +1,4 @@
-import { IncomingMessage } from './types.js'
+import type { IncomingMessage } from 'node:http'
 
 export type MethodMatcherInput = string | Iterable<string> | MethodMatcher
 export type MethodMatcher = (req: IncomingMessage) => boolean
diff --git a/packages/oauth/oauth-provider/src/lib/http/request.ts b/packages/oauth/oauth-provider/src/lib/http/request.ts
index e9b0ef4e016..226d11dbc0d 100644
--- a/packages/oauth/oauth-provider/src/lib/http/request.ts
+++ b/packages/oauth/oauth-provider/src/lib/http/request.ts
@@ -1,8 +1,8 @@
 import { randomBytes } from 'node:crypto'
+import type { IncomingMessage, ServerResponse } from 'node:http'
 import { parse as parseCookie, serialize as serializeCookie } from 'cookie'
 import createHttpError from 'http-errors'
 import { appendHeader } from './response.js'
-import { IncomingMessage, ServerResponse } from './types.js'
 import { UrlReference, urlMatch } from './url.js'
 
 export function validateHeaderValue(
@@ -162,3 +162,66 @@ export function parseHttpCookies(
       ? ((req as any).cookies = parseCookie(req.headers['cookie']))
       : null
 }
+
+export type ExtractRequestMetadataOptions = {
+  trustProxy?: boolean
+}
+
+export type RequestMetadata = {
+  userAgent: string | null
+  ipAddress: string
+  port: number
+}
+
+export function extractRequestMetadata(
+  req: IncomingMessage,
+  options?: ExtractRequestMetadataOptions,
+): RequestMetadata {
+  const userAgent = req.headers['user-agent'] || null
+  const ipAddress = extractIpAddress(req, options) || null
+  const port = extractPort(req, options)
+
+  if (ipAddress == null || port == null) {
+    throw new Error('Could not determine IP address')
+  }
+
+  return { userAgent, ipAddress, port }
+}
+
+function extractIpAddress(
+  req: IncomingMessage,
+  options?: ExtractRequestMetadataOptions,
+): string | undefined {
+  // Express app compatibility
+  if ('ip' in req && typeof req.ip === 'string') {
+    return req.ip
+  }
+
+  if (options?.trustProxy) {
+    const forwardedFor = req.headers['x-forwarded-for']
+    if (typeof forwardedFor === 'string') {
+      const firstForward = forwardedFor.split(',')[0]!.trim()
+      if (firstForward) return firstForward
+    }
+  }
+
+  return req.socket.remoteAddress
+}
+
+function extractPort(
+  req: IncomingMessage,
+  options?: ExtractRequestMetadataOptions,
+): number | undefined {
+  if (options?.trustProxy) {
+    const forwardedPort = req.headers['x-forwarded-port']
+    if (typeof forwardedPort === 'string') {
+      const port = Number(forwardedPort.trim())
+      if (!Number.isInteger(port) || port < 0 || port > 65535) {
+        throw new Error('Invalid forwarded port')
+      }
+      return port
+    }
+  }
+
+  return req.socket.remotePort
+}
diff --git a/packages/oauth/oauth-provider/src/lib/http/response.ts b/packages/oauth/oauth-provider/src/lib/http/response.ts
index ba66df01116..12ba2627a27 100644
--- a/packages/oauth/oauth-provider/src/lib/http/response.ts
+++ b/packages/oauth/oauth-provider/src/lib/http/response.ts
@@ -1,5 +1,6 @@
-import { Readable, pipeline } from 'node:stream'
-import { Handler, ServerResponse } from './types.js'
+import type { ServerResponse } from 'node:http'
+import { type Readable, pipeline } from 'node:stream'
+import { Handler } from './types.js'
 
 export function appendHeader(
   res: ServerResponse,
diff --git a/packages/oauth/oauth-provider/src/lib/http/route.ts b/packages/oauth/oauth-provider/src/lib/http/route.ts
index 346ab3d4b22..43f89b0f59f 100644
--- a/packages/oauth/oauth-provider/src/lib/http/route.ts
+++ b/packages/oauth/oauth-provider/src/lib/http/route.ts
@@ -1,8 +1,9 @@
+import type { IncomingMessage, ServerResponse } from 'node:http'
 import { SubCtx, subCtx } from './context.js'
 import { MethodMatcherInput, createMethodMatcher } from './method.js'
 import { combineMiddlewares } from './middleware.js'
 import { Params, Path, createPathMatcher } from './path.js'
-import { IncomingMessage, Middleware, ServerResponse } from './types.js'
+import { Middleware } from './types.js'
 
 export type RouteCtx<T, P extends Params> = SubCtx<T, { params: Readonly<P> }>
 export type RouteMiddleware<
diff --git a/packages/oauth/oauth-provider/src/lib/http/router.ts b/packages/oauth/oauth-provider/src/lib/http/router.ts
index a767867ae49..db43fdb9a9a 100644
--- a/packages/oauth/oauth-provider/src/lib/http/router.ts
+++ b/packages/oauth/oauth-provider/src/lib/http/router.ts
@@ -1,9 +1,10 @@
+import type { IncomingMessage, ServerResponse } from 'node:http'
 import { SubCtx, subCtx } from './context.js'
 import { MethodMatcherInput } from './method.js'
 import { asHandler, combineMiddlewares } from './middleware.js'
 import { Params, Path } from './path.js'
 import { RouteMiddleware, createRoute } from './route.js'
-import { IncomingMessage, Middleware, ServerResponse } from './types.js'
+import { Middleware } from './types.js'
 
 export type RouterCtx<T> = SubCtx<T, { url: Readonly<URL> }>
 export type RouterMiddleware<
diff --git a/packages/oauth/oauth-provider/src/lib/http/stream.ts b/packages/oauth/oauth-provider/src/lib/http/stream.ts
index cd995531607..f03bef700c5 100644
--- a/packages/oauth/oauth-provider/src/lib/http/stream.ts
+++ b/packages/oauth/oauth-provider/src/lib/http/stream.ts
@@ -1,4 +1,4 @@
-import { IncomingMessage } from 'node:http'
+import type { IncomingMessage } from 'node:http'
 import { Readable } from 'node:stream'
 import createHttpError from 'http-errors'
 import { decodeStream, streamToNodeBuffer } from '@atproto/common'
diff --git a/packages/oauth/oauth-provider/src/lib/http/types.ts b/packages/oauth/oauth-provider/src/lib/http/types.ts
index d3f7cbf1244..0a8a7a9ea63 100644
--- a/packages/oauth/oauth-provider/src/lib/http/types.ts
+++ b/packages/oauth/oauth-provider/src/lib/http/types.ts
@@ -1,5 +1,4 @@
 import type { IncomingMessage, ServerResponse } from 'node:http'
-export { IncomingMessage, ServerResponse }
 
 export type NextFunction = (err?: unknown) => void
 
diff --git a/packages/oauth/oauth-provider/src/lib/util/function.ts b/packages/oauth/oauth-provider/src/lib/util/function.ts
index 6f7c65e7e9a..e755ebc4bf0 100644
--- a/packages/oauth/oauth-provider/src/lib/util/function.ts
+++ b/packages/oauth/oauth-provider/src/lib/util/function.ts
@@ -1,7 +1,24 @@
+/**
+ * This function serves two purposes:
+ * - It ensures that the return value is a Promise, even if the function returns
+ *   a "thenable" (i.e. a Promise-like object).
+ * - It allows to avoid assigning a `this` context to the function, which is
+ *   particularly useful when the function is a member of a "private" object.
+ */
 export async function callAsync<F extends (...args: any[]) => unknown>(
   this: ThisParameterType<F>,
   fn: F,
   ...args: Parameters<F>
-): Promise<Awaited<ReturnType<F>>> {
-  return await (fn(...args) as ReturnType<F>)
+): Promise<Awaited<ReturnType<F>>>
+export async function callAsync<F extends (...args: any[]) => unknown>(
+  this: ThisParameterType<F>,
+  fn?: F,
+  ...args: Parameters<F>
+): Promise<Awaited<ReturnType<F>> | undefined>
+export async function callAsync<F extends (...args: any[]) => unknown>(
+  this: ThisParameterType<F>,
+  fn?: F,
+  ...args: Parameters<F>
+): Promise<Awaited<ReturnType<F>> | undefined> {
+  return (await fn?.(...args)) as Awaited<ReturnType<F>> | undefined
 }
diff --git a/packages/oauth/oauth-provider/src/oauth-hooks.ts b/packages/oauth/oauth-provider/src/oauth-hooks.ts
index 75e0f0bf7c3..b5cf3784fb0 100644
--- a/packages/oauth/oauth-provider/src/oauth-hooks.ts
+++ b/packages/oauth/oauth-provider/src/oauth-hooks.ts
@@ -11,21 +11,29 @@ import { ClientId } from './client/client-id.js'
 import { ClientInfo } from './client/client-info.js'
 import { Client } from './client/client.js'
 import { InvalidAuthorizationDetailsError } from './errors/invalid-authorization-details-error.js'
+import { RequestMetadata } from './lib/http/request.js'
 import { Awaitable } from './lib/util/type.js'
+import { AccessDeniedError, OAuthError } from './oauth-errors.js'
+import { DeviceId } from './oauth-store.js'
 
 // Make sure all types needed to implement the OAuthHooks are exported
-export type {
-  Account,
+export {
+  AccessDeniedError,
+  type Account,
+  type Awaitable,
   Client,
-  ClientAuth,
-  ClientId,
-  ClientInfo,
+  type ClientAuth,
+  type ClientId,
+  type ClientInfo,
+  type DeviceId,
   InvalidAuthorizationDetailsError,
-  Jwks,
-  OAuthAuthorizationDetails,
-  OAuthAuthorizationRequestParameters,
-  OAuthClientMetadata,
-  OAuthTokenResponse,
+  type Jwks,
+  type OAuthAuthorizationDetails,
+  type OAuthAuthorizationRequestParameters,
+  type OAuthClientMetadata,
+  OAuthError,
+  type OAuthTokenResponse,
+  type RequestMetadata,
 }
 
 export type OAuthHooks = {
@@ -36,10 +44,10 @@ export type OAuthHooks = {
    * @throws {InvalidClientMetadataError} if the metadata is invalid
    * @see {@link InvalidClientMetadataError}
    */
-  onClientInfo?: (
+  getClientInfo?: (
     clientId: ClientId,
     data: { metadata: OAuthClientMetadata; jwks?: Jwks },
-  ) => Awaitable<void | undefined | Partial<ClientInfo>>
+  ) => Awaitable<undefined | Partial<ClientInfo>>
 
   /**
    * Allows enriching the authorization details with additional information
@@ -47,9 +55,61 @@ export type OAuthHooks = {
    *
    * @see {@link https://datatracker.ietf.org/doc/html/rfc9396 | RFC 9396}
    */
-  onAuthorizationDetails?: (data: {
+  getAuthorizationDetails?: (data: {
     client: Client
+    clientAuth: ClientAuth
+    clientMetadata: RequestMetadata
     parameters: OAuthAuthorizationRequestParameters
     account: Account
   }) => Awaitable<undefined | OAuthAuthorizationDetails>
+
+  /**
+   * This hook is called when a client is authorized.
+   *
+   * @throws {AccessDeniedError} to deny the authorization request and redirect
+   * the user to the client with an OAuth error (other errors will result in an
+   * internal server error being displayed to the user)
+   *
+   * @note We use `deviceMetadata` instead of `clientMetadata` to make it clear
+   * that this metadata is from the user device, which might be different from
+   * the client metadata (because the OAuth client could live in a backend).
+   */
+  onAuthorized?: (data: {
+    client: Client
+    account: Account
+    parameters: OAuthAuthorizationRequestParameters
+    deviceId: DeviceId
+    deviceMetadata: RequestMetadata
+  }) => Awaitable<void>
+
+  /**
+   * This hook is called when an authorized client exchanges an authorization
+   * code for an access token.
+   *
+   * @throws {OAuthError} to cancel the token creation and revoke the session
+   */
+  onTokenCreated?: (data: {
+    client: Client
+    clientAuth: ClientAuth
+    clientMetadata: RequestMetadata
+    account: Account
+    parameters: OAuthAuthorizationRequestParameters
+    /** null when "password grant" used (in which case {@link onAuthorized} won't have been called) */
+    deviceId: null | DeviceId
+  }) => Awaitable<void>
+
+  /**
+   * This hook is called when an authorized client refreshes an access token.
+   *
+   * @throws {OAuthError} to cancel the token refresh and revoke the session
+   */
+  onTokenRefreshed?: (data: {
+    client: Client
+    clientAuth: ClientAuth
+    clientMetadata: RequestMetadata
+    account: Account
+    parameters: OAuthAuthorizationRequestParameters
+    /** null when "password grant" used (in which case {@link onAuthorized} won't have been called) */
+    deviceId: null | DeviceId
+  }) => Awaitable<void>
 }
diff --git a/packages/oauth/oauth-provider/src/oauth-provider.ts b/packages/oauth/oauth-provider/src/oauth-provider.ts
index e2987a3a108..dea0140e5e3 100644
--- a/packages/oauth/oauth-provider/src/oauth-provider.ts
+++ b/packages/oauth/oauth-provider/src/oauth-provider.ts
@@ -1,3 +1,4 @@
+import type { IncomingMessage, ServerResponse } from 'node:http'
 import { mediaType } from '@hapi/accept'
 import createHttpError from 'http-errors'
 import type { Redis, RedisOptions } from 'ioredis'
@@ -54,7 +55,7 @@ import { ClientStore, ifClientStore } from './client/client-store.js'
 import { Client } from './client/client.js'
 import { AUTHENTICATION_MAX_AGE, TOKEN_MAX_AGE } from './constants.js'
 import { DeviceId } from './device/device-id.js'
-import { DeviceManager } from './device/device-manager.js'
+import { DeviceManager, DeviceManagerOptions } from './device/device-manager.js'
 import { DeviceStore, asDeviceStore } from './device/device-store.js'
 import { AccessDeniedError } from './errors/access-denied-error.js'
 import { AccountSelectionRequiredError } from './errors/account-selection-required-error.js'
@@ -69,10 +70,8 @@ import { UnauthorizedClientError } from './errors/unauthorized-client-error.js'
 import { WWWAuthenticateError } from './errors/www-authenticate-error.js'
 import {
   Handler,
-  IncomingMessage,
   Middleware,
   Router,
-  ServerResponse,
   combineMiddlewares,
   parseHttpRequest,
   setupCsrfToken,
@@ -85,6 +84,7 @@ import {
   validateSameOrigin,
   writeJson,
 } from './lib/http/index.js'
+import { RequestMetadata } from './lib/http/request.js'
 import { dateToEpoch, dateToRelativeSeconds } from './lib/util/date.js'
 import { Override } from './lib/util/type.js'
 import { CustomMetadata, buildMetadata } from './metadata/build-metadata.js'
@@ -134,7 +134,7 @@ export {
 export type RouterOptions<
   Req extends IncomingMessage = IncomingMessage,
   Res extends ServerResponse = ServerResponse,
-> = {
+> = DeviceManagerOptions & {
   onError?: (req: Req, res: Res, err: unknown, message: string) => void
 }
 
@@ -529,9 +529,10 @@ export class OAuthProvider extends OAuthVerifier {
    * @see {@link https://datatracker.ietf.org/doc/html/draft-ietf-oauth-v2-1-11#section-4.1.1}
    */
   protected async authorize(
-    deviceId: DeviceId,
-    credentials: OAuthClientCredentialsNone,
+    clientCredentials: OAuthClientCredentialsNone,
     query: OAuthAuthorizationRequestQuery,
+    deviceId: DeviceId,
+    deviceMetadata: RequestMetadata,
   ): Promise<AuthorizationResultRedirect | AuthorizationResultAuthorize> {
     const { issuer } = this
 
@@ -546,7 +547,7 @@ export class OAuthProvider extends OAuthVerifier {
         : null
 
     const client = await this.clientManager
-      .getClient(credentials.client_id)
+      .getClient(clientCredentials.client_id)
       .catch(accessDeniedCatcher)
 
     const { clientAuth, parameters, uri } =
@@ -580,10 +581,11 @@ export class OAuthProvider extends OAuthVerifier {
         }
 
         const code = await this.requestManager.setAuthorized(
-          client,
           uri,
-          deviceId,
+          client,
           ssoSession.account,
+          deviceId,
+          deviceMetadata,
         )
 
         return { issuer, client, parameters, redirect: { code } }
@@ -596,10 +598,11 @@ export class OAuthProvider extends OAuthVerifier {
           const ssoSession = ssoSessions[0]!
           if (!ssoSession.loginRequired && !ssoSession.consentRequired) {
             const code = await this.requestManager.setAuthorized(
-              client,
               uri,
-              deviceId,
+              client,
               ssoSession.account,
+              deviceId,
+              deviceMetadata,
             )
 
             return { issuer, client, parameters, redirect: { code } }
@@ -720,10 +723,11 @@ export class OAuthProvider extends OAuthVerifier {
   }
 
   protected async acceptRequest(
-    deviceId: DeviceId,
     uri: RequestUri,
     clientId: ClientId,
     sub: string,
+    deviceId: DeviceId,
+    deviceMetadata: RequestMetadata,
   ): Promise<AuthorizationResultRedirect> {
     const { issuer } = this
     const client = await this.clientManager.getClient(clientId)
@@ -746,10 +750,11 @@ export class OAuthProvider extends OAuthVerifier {
       }
 
       const code = await this.requestManager.setAuthorized(
-        client,
         uri,
-        deviceId,
+        client,
         account,
+        deviceId,
+        deviceMetadata,
       )
 
       await this.accountManager.addAuthorizedClient(
@@ -791,11 +796,13 @@ export class OAuthProvider extends OAuthVerifier {
   }
 
   protected async token(
-    credentials: OAuthClientCredentials,
+    clientCredentials: OAuthClientCredentials,
+    clientMetadata: RequestMetadata,
     request: OAuthTokenRequest,
     dpopJkt: null | string,
   ): Promise<OAuthTokenResponse> {
-    const [client, clientAuth] = await this.authenticateClient(credentials)
+    const [client, clientAuth] =
+      await this.authenticateClient(clientCredentials)
 
     if (!this.metadata.grant_types_supported?.includes(request.grant_type)) {
       throw new InvalidGrantError(
@@ -810,11 +817,23 @@ export class OAuthProvider extends OAuthVerifier {
     }
 
     if (request.grant_type === 'authorization_code') {
-      return this.codeGrant(client, clientAuth, request, dpopJkt)
+      return this.codeGrant(
+        client,
+        clientAuth,
+        clientMetadata,
+        request,
+        dpopJkt,
+      )
     }
 
     if (request.grant_type === 'refresh_token') {
-      return this.refreshTokenGrant(client, clientAuth, request, dpopJkt)
+      return this.refreshTokenGrant(
+        client,
+        clientAuth,
+        clientMetadata,
+        request,
+        dpopJkt,
+      )
     }
 
     throw new InvalidGrantError(
@@ -825,6 +844,7 @@ export class OAuthProvider extends OAuthVerifier {
   protected async codeGrant(
     client: Client,
     clientAuth: ClientAuth,
+    clientMetadata: RequestMetadata,
     input: OAuthAuthorizationCodeGrantTokenRequest,
     dpopJkt: null | string,
   ): Promise<OAuthTokenResponse> {
@@ -868,6 +888,7 @@ export class OAuthProvider extends OAuthVerifier {
       return await this.tokenManager.create(
         client,
         clientAuth,
+        clientMetadata,
         account,
         { id: deviceId, info },
         parameters,
@@ -890,10 +911,17 @@ export class OAuthProvider extends OAuthVerifier {
   async refreshTokenGrant(
     client: Client,
     clientAuth: ClientAuth,
+    clientMetadata: RequestMetadata,
     input: OAuthRefreshTokenGrantTokenRequest,
     dpopJkt: null | string,
   ): Promise<OAuthTokenResponse> {
-    return this.tokenManager.refresh(client, clientAuth, input, dpopJkt)
+    return this.tokenManager.refresh(
+      client,
+      clientAuth,
+      clientMetadata,
+      input,
+      dpopJkt,
+    )
   }
 
   /**
@@ -998,7 +1026,7 @@ export class OAuthProvider extends OAuthVerifier {
     Req extends IncomingMessage = IncomingMessage,
     Res extends ServerResponse = ServerResponse,
   >(options?: RouterOptions<Req, Res>) {
-    const deviceManager = new DeviceManager(this.deviceStore)
+    const deviceManager = new DeviceManager(this.deviceStore, options)
     const outputManager = new OutputManager(this.customization)
 
     // eslint-disable-next-line @typescript-eslint/no-this-alias
@@ -1224,7 +1252,9 @@ export class OAuthProvider extends OAuthVerifier {
       jsonHandler(async function (req, _res) {
         const payload = await parseHttpRequest(req, ['json', 'urlencoded'])
 
-        const credentials = await oauthClientCredentialsSchema
+        const clientMetadata = await deviceManager.getRequestMetadata(req)
+
+        const clientCredentials = await oauthClientCredentialsSchema
           .parseAsync(payload, { path: ['body'] })
           .catch(throwInvalidClient)
 
@@ -1238,7 +1268,12 @@ export class OAuthProvider extends OAuthVerifier {
           this.url,
         )
 
-        return server.token(credentials, tokenRequest, dpopJkt)
+        return server.token(
+          clientCredentials,
+          clientMetadata,
+          tokenRequest,
+          dpopJkt,
+        )
       }),
     )
 
@@ -1313,11 +1348,11 @@ export class OAuthProvider extends OAuthVerifier {
 
         const query = Object.fromEntries(this.url.searchParams)
 
-        const credentials = await oauthClientCredentialsSchema
+        const clientCredentials = await oauthClientCredentialsSchema
           .parseAsync(query, { path: ['body'] })
           .catch(throwInvalidRequest)
 
-        if ('client_secret' in credentials) {
+        if ('client_secret' in clientCredentials) {
           throw new InvalidRequestError('Client secret must not be provided')
         }
 
@@ -1325,10 +1360,15 @@ export class OAuthProvider extends OAuthVerifier {
           .parseAsync(query, { path: ['query'] })
           .catch(throwInvalidRequest)
 
-        const { deviceId } = await deviceManager.load(req, res)
+        const { deviceId, deviceMetadata } = await deviceManager.load(req, res)
 
         const data = await server
-          .authorize(deviceId, credentials, authorizationRequest)
+          .authorize(
+            clientCredentials,
+            authorizationRequest,
+            deviceId,
+            deviceMetadata,
+          )
           .catch((err) => accessDeniedToRedirectCatcher(req, res, err))
 
         switch (true) {
@@ -1431,14 +1471,15 @@ export class OAuthProvider extends OAuthVerifier {
           true,
         )
 
-        const { deviceId } = await deviceManager.load(req, res)
+        const { deviceId, deviceMetadata } = await deviceManager.load(req, res)
 
         const data = await server
           .acceptRequest(
-            deviceId,
             input.request_uri,
             input.client_id,
             input.account_sub,
+            deviceId,
+            deviceMetadata,
           )
           .catch((err) => accessDeniedToRedirectCatcher(req, res, err))
 
diff --git a/packages/oauth/oauth-provider/src/output/output-manager.ts b/packages/oauth/oauth-provider/src/output/output-manager.ts
index 22a6c141bb2..c8a35d4f73b 100644
--- a/packages/oauth/oauth-provider/src/output/output-manager.ts
+++ b/packages/oauth/oauth-provider/src/output/output-manager.ts
@@ -1,4 +1,4 @@
-import { ServerResponse } from 'node:http'
+import type { ServerResponse } from 'node:http'
 import { Asset } from '../assets/asset.js'
 import { getAsset } from '../assets/index.js'
 import { Html, cssCode, html } from '../lib/html/index.js'
diff --git a/packages/oauth/oauth-provider/src/output/send-authorize-redirect.ts b/packages/oauth/oauth-provider/src/output/send-authorize-redirect.ts
index 3220ebff690..7d5aa46a7c6 100644
--- a/packages/oauth/oauth-provider/src/output/send-authorize-redirect.ts
+++ b/packages/oauth/oauth-provider/src/output/send-authorize-redirect.ts
@@ -1,4 +1,4 @@
-import { ServerResponse } from 'node:http'
+import type { ServerResponse } from 'node:http'
 import {
   OAuthAuthorizationRequestParameters,
   OAuthTokenType,
diff --git a/packages/oauth/oauth-provider/src/output/send-web-page.ts b/packages/oauth/oauth-provider/src/output/send-web-page.ts
index 9c3eb1ebac0..32e6ba77ca6 100644
--- a/packages/oauth/oauth-provider/src/output/send-web-page.ts
+++ b/packages/oauth/oauth-provider/src/output/send-web-page.ts
@@ -1,5 +1,5 @@
 import { createHash } from 'node:crypto'
-import { ServerResponse } from 'node:http'
+import type { ServerResponse } from 'node:http'
 import {
   AssetRef,
   BuildDocumentOptions,
diff --git a/packages/oauth/oauth-provider/src/request/request-manager.ts b/packages/oauth/oauth-provider/src/request/request-manager.ts
index 58c7d911dec..9fa872a814a 100644
--- a/packages/oauth/oauth-provider/src/request/request-manager.ts
+++ b/packages/oauth/oauth-provider/src/request/request-manager.ts
@@ -20,6 +20,8 @@ import { InvalidGrantError } from '../errors/invalid-grant-error.js'
 import { InvalidParametersError } from '../errors/invalid-parameters-error.js'
 import { InvalidRequestError } from '../errors/invalid-request-error.js'
 import { InvalidScopeError } from '../errors/invalid-scope-error.js'
+import { RequestMetadata } from '../lib/http/request.js'
+import { callAsync } from '../lib/util/function.js'
 import { OAuthHooks } from '../oauth-hooks.js'
 import { Signer } from '../signer/signer.js'
 import { Code, generateCode } from './code.js'
@@ -369,10 +371,11 @@ export class RequestManager {
   }
 
   async setAuthorized(
-    client: Client,
     uri: RequestUri,
-    deviceId: DeviceId,
+    client: Client,
     account: Account,
+    deviceId: DeviceId,
+    deviceMetadata: RequestMetadata,
   ): Promise<Code> {
     const id = decodeRequestUri(uri)
 
@@ -413,6 +416,14 @@ export class RequestManager {
         expiresAt: new Date(Date.now() + AUTHORIZATION_INACTIVITY_TIMEOUT),
       })
 
+      await callAsync(this.hooks.onAuthorized, {
+        client,
+        account,
+        parameters: data.parameters,
+        deviceId,
+        deviceMetadata,
+      })
+
       return code
     } catch (err) {
       await this.store.deleteRequest(id)
diff --git a/packages/oauth/oauth-provider/src/token/token-manager.ts b/packages/oauth/oauth-provider/src/token/token-manager.ts
index 31946248c7e..aea903c02fe 100644
--- a/packages/oauth/oauth-provider/src/token/token-manager.ts
+++ b/packages/oauth/oauth-provider/src/token/token-manager.ts
@@ -29,6 +29,7 @@ import { InvalidDpopProofError } from '../errors/invalid-dpop-proof-error.js'
 import { InvalidGrantError } from '../errors/invalid-grant-error.js'
 import { InvalidRequestError } from '../errors/invalid-request-error.js'
 import { InvalidTokenError } from '../errors/invalid-token-error.js'
+import { RequestMetadata } from '../lib/http/request.js'
 import { dateToEpoch, dateToRelativeSeconds } from '../lib/util/date.js'
 import { callAsync } from '../lib/util/function.js'
 import { OAuthHooks } from '../oauth-hooks.js'
@@ -82,6 +83,7 @@ export class TokenManager {
   async create(
     client: Client,
     clientAuth: ClientAuth,
+    clientMetadata: RequestMetadata,
     account: Account,
     device: null | { id: DeviceId; info: DeviceAccountInfo },
     parameters: OAuthAuthorizationRequestParameters,
@@ -207,13 +209,16 @@ export class TokenManager {
     const now = new Date()
     const expiresAt = this.createTokenExpiry(now)
 
-    const authorizationDetails = this.hooks.onAuthorizationDetails
-      ? await callAsync(this.hooks.onAuthorizationDetails, {
-          client,
-          parameters,
-          account,
-        })
-      : undefined
+    const authorizationDetails = await callAsync(
+      this.hooks.getAuthorizationDetails,
+      {
+        client,
+        clientAuth,
+        clientMetadata,
+        parameters,
+        account,
+      },
+    )
 
     const tokenData: TokenData = {
       createdAt: now,
@@ -246,7 +251,7 @@ export class TokenManager {
             authorization_details: authorizationDetails,
           })
 
-      return this.buildTokenResponse(
+      const response = await this.buildTokenResponse(
         client,
         accessToken,
         refreshToken,
@@ -255,6 +260,17 @@ export class TokenManager {
         account,
         authorizationDetails,
       )
+
+      await callAsync(this.hooks.onTokenCreated, {
+        client,
+        clientAuth,
+        clientMetadata,
+        account,
+        parameters,
+        deviceId: device ? device.id : null,
+      })
+
+      return response
     } catch (err) {
       // Just in case the token could not be issued, we delete it from the store
       await this.store.deleteToken(tokenId)
@@ -316,6 +332,7 @@ export class TokenManager {
   async refresh(
     client: Client,
     clientAuth: ClientAuth,
+    clientMetadata: RequestMetadata,
     input: OAuthRefreshTokenGrantTokenRequest,
     dpopJkt: null | string,
   ): Promise<OAuthTokenResponse> {
@@ -377,13 +394,16 @@ export class TokenManager {
         throw new InvalidGrantError(`Refresh token expired`)
       }
 
-      const authorization_details = this.hooks.onAuthorizationDetails
-        ? await callAsync(this.hooks.onAuthorizationDetails, {
-            client,
-            parameters,
-            account,
-          })
-        : undefined
+      const authorizationDetails = await callAsync(
+        this.hooks.getAuthorizationDetails,
+        {
+          client,
+          clientAuth,
+          clientMetadata,
+          parameters,
+          account,
+        },
+      )
 
       const nextTokenId = await generateTokenId()
       const nextRefreshToken = await generateRefreshToken()
@@ -426,24 +446,33 @@ export class TokenManager {
             iat: now,
             jti: nextTokenId,
             cnf: parameters.dpop_jkt ? { jkt: parameters.dpop_jkt } : undefined,
-            authorization_details,
+            authorization_details: authorizationDetails,
           })
 
-      return this.buildTokenResponse(
+      const response = await this.buildTokenResponse(
         client,
         accessToken,
         nextRefreshToken,
         expiresAt,
         parameters,
         account,
-        authorization_details,
+        authorizationDetails,
       )
+
+      await callAsync(this.hooks.onTokenRefreshed, {
+        client,
+        clientAuth,
+        clientMetadata,
+        account,
+        parameters,
+        deviceId: tokenInfo.data.deviceId,
+      })
+
+      return response
     } catch (err) {
-      if (err instanceof InvalidRequestError) {
-        // Consider the refresh token might be compromised if sanity checks
-        // failed.
-        await this.store.deleteToken(tokenInfo.id)
-      }
+      // Just in case the token could not be refreshed, we delete it from the store
+      await this.store.deleteToken(tokenInfo.id)
+
       throw err
     }
   }
diff --git a/packages/pds/src/oauth/provider.ts b/packages/pds/src/oauth/provider.ts
index e5cbccbe580..fa1d50bee6d 100644
--- a/packages/pds/src/oauth/provider.ts
+++ b/packages/pds/src/oauth/provider.ts
@@ -46,12 +46,6 @@ export class PdsOAuthProvider extends OAuthProvider {
       // the PDS can use tokenId as access tokens. This allows the PDS to
       // always use up-to-date token data from the token store.
       accessTokenType: AccessTokenType.id,
-
-      onClientInfo: (clientId) => ({
-        isFirstParty: clientId === 'https://bsky.app/',
-        // @TODO make client client list configurable:
-        isTrusted: undefined,
-      }),
     })
   }
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 79b4911ec5e..2e4023cfbb7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1068,9 +1068,6 @@ importers:
       jose:
         specifier: ^5.2.0
         version: 5.3.0
-      keygrip:
-        specifier: ^1.1.0
-        version: 1.1.0
       psl:
         specifier: ^1.9.0
         version: 1.9.0
@@ -1099,9 +1096,6 @@ importers:
       '@types/cookie':
         specifier: ^0.6.0
         version: 0.6.0
-      '@types/keygrip':
-        specifier: ^1.0.6
-        version: 1.0.6
       '@types/psl':
         specifier: 1.1.3
         version: 1.1.3
@@ -6392,10 +6386,6 @@ packages:
     resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==}
     dev: true
 
-  /@types/keygrip@1.0.6:
-    resolution: {integrity: sha512-lZuNAY9xeJt7Bx4t4dx0rYCDqGPW8RXhQZK1td7d4H6E9zYbLoOtjBvfwdTKpsyxQI/2jv+armjX/RW+ZNpXOQ==}
-    dev: true
-
   /@types/mime@1.3.2:
     resolution: {integrity: sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==}
 
@@ -11003,14 +10993,6 @@ packages:
       bn.js: 4.12.0
       elliptic: 6.5.4
 
-  /keygrip@1.1.0:
-    resolution: {integrity: sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==}
-    engines: {node: '>= 0.6'}
-    requiresBuild: true
-    dependencies:
-      tsscmp: 1.0.6
-    dev: false
-
   /kind-of@6.0.3:
     resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
     engines: {node: '>=0.10.0'}
@@ -14163,12 +14145,6 @@ packages:
     resolution: {integrity: sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA==}
     dev: false
 
-  /tsscmp@1.0.6:
-    resolution: {integrity: sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==}
-    engines: {node: '>=0.6.x'}
-    requiresBuild: true
-    dev: false
-
   /tty-table@4.2.1:
     resolution: {integrity: sha512-xz0uKo+KakCQ+Dxj1D/tKn2FSyreSYWzdkL/BYhgN6oMW808g8QRMuh1atAV9fjTPbWBjfbkKQpI/5rEcnAc7g==}
     engines: {node: '>=8.0.0'}

From eb83ae176df8e2bb4c8458cec5fd1757a1d4cbf8 Mon Sep 17 00:00:00 2001
From: Tatsuya Yamamoto / T28_tatsuya <t28.is.tatsuya@gmail.com>
Date: Fri, 14 Feb 2025 17:41:28 +0900
Subject: [PATCH 060/101] fix(api): pass refreshJwt to `deleteSession` on
 `logout()` (#3530)

fix: set refreshJwt
---
 packages/api/src/atp-agent.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/api/src/atp-agent.ts b/packages/api/src/atp-agent.ts
index e82c78772bc..03217df3441 100644
--- a/packages/api/src/atp-agent.ts
+++ b/packages/api/src/atp-agent.ts
@@ -337,7 +337,7 @@ export class CredentialSession implements SessionManager {
       try {
         await this.server.deleteSession(undefined, {
           headers: {
-            authorization: `Bearer ${this.session.accessJwt}`,
+            authorization: `Bearer ${this.session.refreshJwt}`,
           },
         })
       } catch {

From 20e57bacf9bb2ae8a118eadbfc291f3213b8dc2f Mon Sep 17 00:00:00 2001
From: Matthieu Sieben <matthieusieben@users.noreply.github.com>
Date: Fri, 14 Feb 2025 09:44:07 +0100
Subject: [PATCH 061/101] Improve indexing for
 chat.bsky.moderation.getMessageContext (#3520)

* Improve indexing for chat.bsky.moderation.getMessageContext

* tidy
---
 .changeset/fuzzy-buttons-yawn.md              |  5 ++++
 .../ozone/src/api/chat/getMessageContext.ts   |  2 ++
 ...0Z-moderation-event-message-partial-idx.ts | 26 +++++++++++++++++++
 packages/ozone/src/db/migrations/index.ts     |  1 +
 4 files changed, 34 insertions(+)
 create mode 100644 .changeset/fuzzy-buttons-yawn.md
 create mode 100644 packages/ozone/src/db/migrations/20250211T132135150Z-moderation-event-message-partial-idx.ts

diff --git a/.changeset/fuzzy-buttons-yawn.md b/.changeset/fuzzy-buttons-yawn.md
new file mode 100644
index 00000000000..5b93e8721d0
--- /dev/null
+++ b/.changeset/fuzzy-buttons-yawn.md
@@ -0,0 +1,5 @@
+---
+"@atproto/ozone": patch
+---
+
+Improve indexing for "chat.bsky.moderation.getMessageContext"
diff --git a/packages/ozone/src/api/chat/getMessageContext.ts b/packages/ozone/src/api/chat/getMessageContext.ts
index a0e70855215..476d5a8fd54 100644
--- a/packages/ozone/src/api/chat/getMessageContext.ts
+++ b/packages/ozone/src/api/chat/getMessageContext.ts
@@ -19,6 +19,8 @@ export default function (server: Server, ctx: AppContext) {
         .selectFrom('moderation_event')
         .select('id')
         .where('subjectMessageId', '=', params.messageId)
+        // uses "moderation_event_message_id_idx" index
+        .where('subjectMessageId', 'is not', null)
         .where('action', '=', 'tools.ozone.moderation.defs#modEventReport')
         .limit(1)
         .executeTakeFirst()
diff --git a/packages/ozone/src/db/migrations/20250211T132135150Z-moderation-event-message-partial-idx.ts b/packages/ozone/src/db/migrations/20250211T132135150Z-moderation-event-message-partial-idx.ts
new file mode 100644
index 00000000000..a3edc00891d
--- /dev/null
+++ b/packages/ozone/src/db/migrations/20250211T132135150Z-moderation-event-message-partial-idx.ts
@@ -0,0 +1,26 @@
+import { Kysely, sql } from 'kysely'
+
+// support lookup for chat.bsky.moderation.getMessageContext
+
+export async function up(db: Kysely<unknown>): Promise<void> {
+  // @NOTE: These queries should be run with the "CONCURRENTLY" option in
+  // production to avoid locking the table. This is not supported by Kysely.
+  await db.schema.dropIndex('moderation_event_message_id_index').execute()
+  await db.schema
+    .createIndex('moderation_event_message_id_idx')
+    .on('moderation_event')
+    // https://github.com/kysely-org/kysely/issues/302
+    .expression(
+      sql`"subjectMessageId") WHERE ("subjectMessageId" IS NOT NULL AND "action" = 'tools.ozone.moderation.defs#modEventReport'`,
+    )
+    .execute()
+}
+
+export async function down(db: Kysely<unknown>): Promise<void> {
+  await db.schema.dropIndex('moderation_event_message_id_idx').execute()
+  await db.schema
+    .createIndex('moderation_event_message_id_index')
+    .on('moderation_event')
+    .column('subjectMessageId')
+    .execute()
+}
diff --git a/packages/ozone/src/db/migrations/index.ts b/packages/ozone/src/db/migrations/index.ts
index 609f4366572..82923722c54 100644
--- a/packages/ozone/src/db/migrations/index.ts
+++ b/packages/ozone/src/db/migrations/index.ts
@@ -19,3 +19,4 @@ export * as _20241018T205730722Z from './20241018T205730722Z-setting'
 export * as _20241026T205730722Z from './20241026T205730722Z-add-hosting-status-to-subject-status'
 export * as _20241220T144630860Z from './20241220T144630860Z-stats-materialized-views'
 export * as _20250204T003647759Z from './20250204T003647759Z-add-subject-priority-score'
+export * as _20250211T132135150Z from './20250211T132135150Z-moderation-event-message-partial-idx'

From e69e89a037829bd4f6656d6aa42b77b97b4934e5 Mon Sep 17 00:00:00 2001
From: Matthieu Sieben <matthieusieben@users.noreply.github.com>
Date: Fri, 14 Feb 2025 09:53:53 +0100
Subject: [PATCH 062/101] Properly compute sleep time in contantTime util
 (#3514)

---
 .changeset/yellow-cows-impress.md             |  5 ++
 .../oauth/oauth-provider/src/lib/util/time.ts | 53 ++++++++++++-------
 2 files changed, 40 insertions(+), 18 deletions(-)
 create mode 100644 .changeset/yellow-cows-impress.md

diff --git a/.changeset/yellow-cows-impress.md b/.changeset/yellow-cows-impress.md
new file mode 100644
index 00000000000..2dfeb08d2a2
--- /dev/null
+++ b/.changeset/yellow-cows-impress.md
@@ -0,0 +1,5 @@
+---
+"@atproto/oauth-provider": patch
+---
+
+Properly compute sleep time in contantTime util
diff --git a/packages/oauth/oauth-provider/src/lib/util/time.ts b/packages/oauth/oauth-provider/src/lib/util/time.ts
index dcbf372f83d..3975e2b6593 100644
--- a/packages/oauth/oauth-provider/src/lib/util/time.ts
+++ b/packages/oauth/oauth-provider/src/lib/util/time.ts
@@ -1,33 +1,50 @@
+import { setTimeout as sleep } from 'node:timers/promises'
 import { Awaitable } from './type.js'
 
+export function onOvertimeDefault(options: {
+  start: number
+  end: number
+  elapsed: number
+  time: number
+}): void {
+  console.warn(
+    `constantTime: execution time was ${options.elapsed}ms (which is greater than ${options.time}ms). You should increase the "time" to properly defend against timing attacks.`,
+  )
+}
+
 /**
  * Utility function to protect against timing attacks.
  */
-export async function constantTime<T>(
-  delay: number,
-  fn: () => Awaitable<T>,
-): Promise<T> {
-  if (!Number.isFinite(delay) || delay <= 0) {
-    throw new TypeError('Delay must be greater than 0')
+export async function constantTime<R, T = unknown>(
+  this: T,
+  time: number,
+  fn: (this: T) => Awaitable<R>,
+  onOvertime = onOvertimeDefault,
+): Promise<R> {
+  if (!Number.isFinite(time) || time <= 0) {
+    throw new TypeError(`"time" must be a positive number`)
   }
 
   const start = Date.now()
   try {
-    return await fn()
+    return await fn.call(this)
   } finally {
-    const delta = Date.now() - start
+    const end = Date.now()
+    const elapsed = end - start
 
-    // Let's make sure we always wait for a multiple of `delay` milliseconds.
-    const n = Math.max(1, Math.ceil(delta / delay))
+    const remaining = time - elapsed
+    if (remaining >= 0) {
+      // Happy path, execution time was smaller than "time"
+      await sleep(remaining)
+    } else {
+      // The function execution took longer than "time"
+      onOvertime({ start, end, elapsed, time })
 
-    // Ideally, the multiple should always be 1 in order to to properly defend
-    // against timing attacks. Show a warning if it's not.
-    if (n > 1) {
-      console.warn(
-        `constantTime: execution time was ${delta}ms, waiting for the next multiple of ${delay}ms. You should increase the delay to properly defend against timing attacks.`,
-      )
-    }
+      // Sleep until the next multiple of "time" to mitigate any attack
+      const multiplier = Math.ceil(elapsed / time)
+      const remaining = multiplier * time - elapsed
 
-    await new Promise((resolve) => setTimeout(resolve, n * delay))
+      await sleep(remaining)
+    }
   }
 }

From 175f89f8fe0e570518e32b48e49f5bbf63395b67 Mon Sep 17 00:00:00 2001
From: Matthieu Sieben <matthieusieben@users.noreply.github.com>
Date: Fri, 14 Feb 2025 10:10:10 +0100
Subject: [PATCH 063/101] Fix lex-cli Windows compatibility (#3534)

Windows compatibility

Fixes #3327
---
 .changeset/few-rice-enjoy.md            | 5 +++++
 packages/lex-cli/src/codegen/lex-gen.ts | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/few-rice-enjoy.md

diff --git a/.changeset/few-rice-enjoy.md b/.changeset/few-rice-enjoy.md
new file mode 100644
index 00000000000..842fc546137
--- /dev/null
+++ b/.changeset/few-rice-enjoy.md
@@ -0,0 +1,5 @@
+---
+"@atproto/lex-cli": patch
+---
+
+Improve compatibility with Windows runtimes.
diff --git a/packages/lex-cli/src/codegen/lex-gen.ts b/packages/lex-cli/src/codegen/lex-gen.ts
index 271e212a4ba..bd7071b1c05 100644
--- a/packages/lex-cli/src/codegen/lex-gen.ts
+++ b/packages/lex-cli/src/codegen/lex-gen.ts
@@ -1,4 +1,4 @@
-import { relative as getRelativePath } from 'node:path'
+import { relative as getRelativePath } from 'node:path/posix'
 import { SourceFile, VariableDeclarationKind } from 'ts-morph'
 import {
   LexArray,

From ba5bb6e667fb58bbefd332844957de575e102ca3 Mon Sep 17 00:00:00 2001
From: Matthieu Sieben <matthieusieben@users.noreply.github.com>
Date: Fri, 14 Feb 2025 10:15:33 +0100
Subject: [PATCH 064/101] Add missing changeset for bugfix in api package
 (#3535)

---
 .changeset/plenty-cows-notice.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/plenty-cows-notice.md

diff --git a/.changeset/plenty-cows-notice.md b/.changeset/plenty-cows-notice.md
new file mode 100644
index 00000000000..4a87f854eb7
--- /dev/null
+++ b/.changeset/plenty-cows-notice.md
@@ -0,0 +1,5 @@
+---
+"@atproto/api": patch
+---
+
+Fix bug preventing "logout()" calls from working.

From 3f58dd0e742cdfed9c3eae0118bc57f539de78f1 Mon Sep 17 00:00:00 2001
From: Matthieu Sieben <matthieusieben@users.noreply.github.com>
Date: Fri, 14 Feb 2025 10:49:42 +0100
Subject: [PATCH 065/101] changeset for Appview: apply needs-review to
 individual records (#3537)

---
 .changeset/dirty-islands-dance.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/dirty-islands-dance.md

diff --git a/.changeset/dirty-islands-dance.md b/.changeset/dirty-islands-dance.md
new file mode 100644
index 00000000000..eef587dd7b3
--- /dev/null
+++ b/.changeset/dirty-islands-dance.md
@@ -0,0 +1,5 @@
+---
+"@atproto/bsky": patch
+---
+
+Apply needs-review to individual records

From a3d2204a7e6803bfb87c124cc3e03852bc9ec5c2 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 14 Feb 2025 10:57:36 +0100
Subject: [PATCH 066/101] Version packages (#3533)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/dirty-islands-dance.md          |  5 -----
 .changeset/few-rice-enjoy.md               |  5 -----
 .changeset/friendly-berries-kick.md        |  6 ------
 .changeset/fuzzy-buttons-yawn.md           |  5 -----
 .changeset/gentle-islands-impress.md       |  9 ---------
 .changeset/plenty-cows-notice.md           |  5 -----
 .changeset/seven-falcons-pump.md           |  5 -----
 .changeset/yellow-cows-impress.md          |  5 -----
 packages/api/CHANGELOG.md                  |  6 ++++++
 packages/api/package.json                  |  2 +-
 packages/bsky/CHANGELOG.md                 |  9 +++++++++
 packages/bsky/package.json                 |  2 +-
 packages/dev-env/CHANGELOG.md              | 10 ++++++++++
 packages/dev-env/package.json              |  2 +-
 packages/lex-cli/CHANGELOG.md              |  6 ++++++
 packages/lex-cli/package.json              |  2 +-
 packages/oauth/oauth-provider/CHANGELOG.md | 16 ++++++++++++++++
 packages/oauth/oauth-provider/package.json |  2 +-
 packages/ozone/CHANGELOG.md                |  9 +++++++++
 packages/ozone/package.json                |  2 +-
 packages/pds/CHANGELOG.md                  | 10 ++++++++++
 packages/pds/package.json                  |  2 +-
 22 files changed, 73 insertions(+), 52 deletions(-)
 delete mode 100644 .changeset/dirty-islands-dance.md
 delete mode 100644 .changeset/few-rice-enjoy.md
 delete mode 100644 .changeset/friendly-berries-kick.md
 delete mode 100644 .changeset/fuzzy-buttons-yawn.md
 delete mode 100644 .changeset/gentle-islands-impress.md
 delete mode 100644 .changeset/plenty-cows-notice.md
 delete mode 100644 .changeset/seven-falcons-pump.md
 delete mode 100644 .changeset/yellow-cows-impress.md

diff --git a/.changeset/dirty-islands-dance.md b/.changeset/dirty-islands-dance.md
deleted file mode 100644
index eef587dd7b3..00000000000
--- a/.changeset/dirty-islands-dance.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/bsky": patch
----
-
-Apply needs-review to individual records
diff --git a/.changeset/few-rice-enjoy.md b/.changeset/few-rice-enjoy.md
deleted file mode 100644
index 842fc546137..00000000000
--- a/.changeset/few-rice-enjoy.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/lex-cli": patch
----
-
-Improve compatibility with Windows runtimes.
diff --git a/.changeset/friendly-berries-kick.md b/.changeset/friendly-berries-kick.md
deleted file mode 100644
index 3943d923f7e..00000000000
--- a/.changeset/friendly-berries-kick.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"@atproto/oauth-provider": minor
----
-
-Rename `onClientInfo` and `onAuthorizationDetails` hooks to `getClientInfo` and `getAuthorizationDetails` respectively.
-
diff --git a/.changeset/fuzzy-buttons-yawn.md b/.changeset/fuzzy-buttons-yawn.md
deleted file mode 100644
index 5b93e8721d0..00000000000
--- a/.changeset/fuzzy-buttons-yawn.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/ozone": patch
----
-
-Improve indexing for "chat.bsky.moderation.getMessageContext"
diff --git a/.changeset/gentle-islands-impress.md b/.changeset/gentle-islands-impress.md
deleted file mode 100644
index 8fdcd01e1c1..00000000000
--- a/.changeset/gentle-islands-impress.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-"@atproto/oauth-provider": patch
----
-
-Add the following hooks in the `OAuthProvider`:
-
-- `onAuthorized` which is triggered when the user "authorized" a client (a `code` is issued)
-- `onTokenCreated` which is triggered when the code is exchanged for a token
-- `onTokenRefreshed` which is triggered when a refresh token is exchanged for a new access token
diff --git a/.changeset/plenty-cows-notice.md b/.changeset/plenty-cows-notice.md
deleted file mode 100644
index 4a87f854eb7..00000000000
--- a/.changeset/plenty-cows-notice.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/api": patch
----
-
-Fix bug preventing "logout()" calls from working.
diff --git a/.changeset/seven-falcons-pump.md b/.changeset/seven-falcons-pump.md
deleted file mode 100644
index 368df048493..00000000000
--- a/.changeset/seven-falcons-pump.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/pds": patch
----
-
-Dead code cleanup.
diff --git a/.changeset/yellow-cows-impress.md b/.changeset/yellow-cows-impress.md
deleted file mode 100644
index 2dfeb08d2a2..00000000000
--- a/.changeset/yellow-cows-impress.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/oauth-provider": patch
----
-
-Properly compute sleep time in contantTime util
diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md
index 17ef9f3dcb7..d6218dc62e3 100644
--- a/packages/api/CHANGELOG.md
+++ b/packages/api/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @atproto/api
 
+## 0.14.1
+
+### Patch Changes
+
+- [#3535](https://github.com/bluesky-social/atproto/pull/3535) [`ba5bb6e66`](https://github.com/bluesky-social/atproto/commit/ba5bb6e667fb58bbefd332844957de575e102ca3) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Fix bug preventing "logout()" calls from working.
+
 ## 0.14.0
 
 ### Minor Changes
diff --git a/packages/api/package.json b/packages/api/package.json
index 0cd6bbc2d9d..333abfd3627 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/api",
-  "version": "0.14.0",
+  "version": "0.14.1",
   "license": "MIT",
   "description": "Client library for atproto and Bluesky",
   "keywords": [
diff --git a/packages/bsky/CHANGELOG.md b/packages/bsky/CHANGELOG.md
index 0a87ec18f1e..12d5e7cba81 100644
--- a/packages/bsky/CHANGELOG.md
+++ b/packages/bsky/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @atproto/bsky
 
+## 0.0.118
+
+### Patch Changes
+
+- [#3537](https://github.com/bluesky-social/atproto/pull/3537) [`3f58dd0e7`](https://github.com/bluesky-social/atproto/commit/3f58dd0e742cdfed9c3eae0118bc57f539de78f1) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Apply needs-review to individual records
+
+- Updated dependencies [[`ba5bb6e66`](https://github.com/bluesky-social/atproto/commit/ba5bb6e667fb58bbefd332844957de575e102ca3)]:
+  - @atproto/api@0.14.1
+
 ## 0.0.117
 
 ### Patch Changes
diff --git a/packages/bsky/package.json b/packages/bsky/package.json
index f62af52de95..46fcae1b753 100644
--- a/packages/bsky/package.json
+++ b/packages/bsky/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.117",
+  "version": "0.0.118",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
diff --git a/packages/dev-env/CHANGELOG.md b/packages/dev-env/CHANGELOG.md
index 8c22cf3bc91..0baa19efdc7 100644
--- a/packages/dev-env/CHANGELOG.md
+++ b/packages/dev-env/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @atproto/dev-env
 
+## 0.3.88
+
+### Patch Changes
+
+- Updated dependencies [[`3f58dd0e7`](https://github.com/bluesky-social/atproto/commit/3f58dd0e742cdfed9c3eae0118bc57f539de78f1), [`20e57bacf`](https://github.com/bluesky-social/atproto/commit/20e57bacf9bb2ae8a118eadbfc291f3213b8dc2f), [`ba5bb6e66`](https://github.com/bluesky-social/atproto/commit/ba5bb6e667fb58bbefd332844957de575e102ca3), [`6ea9c961a`](https://github.com/bluesky-social/atproto/commit/6ea9c961af964cd9b0d00b5073c695c5e0b3345a)]:
+  - @atproto/bsky@0.0.118
+  - @atproto/ozone@0.1.79
+  - @atproto/api@0.14.1
+  - @atproto/pds@0.4.96
+
 ## 0.3.87
 
 ### Patch Changes
diff --git a/packages/dev-env/package.json b/packages/dev-env/package.json
index a41d2bb8260..5569e0e8de0 100644
--- a/packages/dev-env/package.json
+++ b/packages/dev-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/dev-env",
-  "version": "0.3.87",
+  "version": "0.3.88",
   "license": "MIT",
   "description": "Local development environment helper for atproto development",
   "keywords": [
diff --git a/packages/lex-cli/CHANGELOG.md b/packages/lex-cli/CHANGELOG.md
index bda7992d090..6ed1b9e2adf 100644
--- a/packages/lex-cli/CHANGELOG.md
+++ b/packages/lex-cli/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @atproto/lex-cli
 
+## 0.6.1
+
+### Patch Changes
+
+- [#3534](https://github.com/bluesky-social/atproto/pull/3534) [`175f89f8f`](https://github.com/bluesky-social/atproto/commit/175f89f8fe0e570518e32b48e49f5bbf63395b67) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Improve compatibility with Windows runtimes.
+
 ## 0.6.0
 
 ### Minor Changes
diff --git a/packages/lex-cli/package.json b/packages/lex-cli/package.json
index 2ccbf350eb3..1ac629dba4f 100644
--- a/packages/lex-cli/package.json
+++ b/packages/lex-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/lex-cli",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "license": "MIT",
   "description": "TypeScript codegen tool for atproto Lexicon schemas",
   "keywords": [
diff --git a/packages/oauth/oauth-provider/CHANGELOG.md b/packages/oauth/oauth-provider/CHANGELOG.md
index 3f470db43d1..93b3997181d 100644
--- a/packages/oauth/oauth-provider/CHANGELOG.md
+++ b/packages/oauth/oauth-provider/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @atproto/oauth-provider
 
+## 0.3.0
+
+### Minor Changes
+
+- [#3525](https://github.com/bluesky-social/atproto/pull/3525) [`6ea9c961a`](https://github.com/bluesky-social/atproto/commit/6ea9c961af964cd9b0d00b5073c695c5e0b3345a) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Rename `onClientInfo` and `onAuthorizationDetails` hooks to `getClientInfo` and `getAuthorizationDetails` respectively.
+
+### Patch Changes
+
+- [#3525](https://github.com/bluesky-social/atproto/pull/3525) [`6ea9c961a`](https://github.com/bluesky-social/atproto/commit/6ea9c961af964cd9b0d00b5073c695c5e0b3345a) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Add the following hooks in the `OAuthProvider`:
+
+  - `onAuthorized` which is triggered when the user "authorized" a client (a `code` is issued)
+  - `onTokenCreated` which is triggered when the code is exchanged for a token
+  - `onTokenRefreshed` which is triggered when a refresh token is exchanged for a new access token
+
+- [#3514](https://github.com/bluesky-social/atproto/pull/3514) [`e69e89a03`](https://github.com/bluesky-social/atproto/commit/e69e89a037829bd4f6656d6aa42b77b97b4934e5) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Properly compute sleep time in contantTime util
+
 ## 0.2.17
 
 ### Patch Changes
diff --git a/packages/oauth/oauth-provider/package.json b/packages/oauth/oauth-provider/package.json
index d35765d8bb1..9e4e6586430 100644
--- a/packages/oauth/oauth-provider/package.json
+++ b/packages/oauth/oauth-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/oauth-provider",
-  "version": "0.2.17",
+  "version": "0.3.0",
   "license": "MIT",
   "description": "Generic OAuth2 and OpenID Connect provider for Node.js. Currently only supports features needed for Atproto.",
   "keywords": [
diff --git a/packages/ozone/CHANGELOG.md b/packages/ozone/CHANGELOG.md
index 2002f0ae7df..a21e9e1a199 100644
--- a/packages/ozone/CHANGELOG.md
+++ b/packages/ozone/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @atproto/ozone
 
+## 0.1.79
+
+### Patch Changes
+
+- [#3520](https://github.com/bluesky-social/atproto/pull/3520) [`20e57bacf`](https://github.com/bluesky-social/atproto/commit/20e57bacf9bb2ae8a118eadbfc291f3213b8dc2f) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Improve indexing for "chat.bsky.moderation.getMessageContext"
+
+- Updated dependencies [[`ba5bb6e66`](https://github.com/bluesky-social/atproto/commit/ba5bb6e667fb58bbefd332844957de575e102ca3)]:
+  - @atproto/api@0.14.1
+
 ## 0.1.78
 
 ### Patch Changes
diff --git a/packages/ozone/package.json b/packages/ozone/package.json
index 5a0cc0e0f59..e9731faf910 100644
--- a/packages/ozone/package.json
+++ b/packages/ozone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.1.78",
+  "version": "0.1.79",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
diff --git a/packages/pds/CHANGELOG.md b/packages/pds/CHANGELOG.md
index e2aa814da77..bfbcbf46bef 100644
--- a/packages/pds/CHANGELOG.md
+++ b/packages/pds/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @atproto/pds
 
+## 0.4.96
+
+### Patch Changes
+
+- [#3525](https://github.com/bluesky-social/atproto/pull/3525) [`6ea9c961a`](https://github.com/bluesky-social/atproto/commit/6ea9c961af964cd9b0d00b5073c695c5e0b3345a) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Dead code cleanup.
+
+- Updated dependencies [[`6ea9c961a`](https://github.com/bluesky-social/atproto/commit/6ea9c961af964cd9b0d00b5073c695c5e0b3345a), [`6ea9c961a`](https://github.com/bluesky-social/atproto/commit/6ea9c961af964cd9b0d00b5073c695c5e0b3345a), [`ba5bb6e66`](https://github.com/bluesky-social/atproto/commit/ba5bb6e667fb58bbefd332844957de575e102ca3), [`e69e89a03`](https://github.com/bluesky-social/atproto/commit/e69e89a037829bd4f6656d6aa42b77b97b4934e5)]:
+  - @atproto/oauth-provider@0.3.0
+  - @atproto/api@0.14.1
+
 ## 0.4.95
 
 ### Patch Changes
diff --git a/packages/pds/package.json b/packages/pds/package.json
index 869c88b6b62..308385ab0d3 100644
--- a/packages/pds/package.json
+++ b/packages/pds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/pds",
-  "version": "0.4.95",
+  "version": "0.4.96",
   "license": "MIT",
   "description": "Reference implementation of atproto Personal Data Server (PDS)",
   "keywords": [

From bde6f71c4cd33022d29da0ff23463a5838c4de24 Mon Sep 17 00:00:00 2001
From: Matthieu Sieben <matthieusieben@users.noreply.github.com>
Date: Fri, 14 Feb 2025 14:20:18 +0100
Subject: [PATCH 067/101] Mark "userAgent" as optional in `RequestMetadata`
 (#3538)

---
 .changeset/brown-eggs-rhyme.md                             | 5 +++++
 packages/oauth/oauth-provider/src/device/device-manager.ts | 2 +-
 packages/oauth/oauth-provider/src/lib/http/request.ts      | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/brown-eggs-rhyme.md

diff --git a/.changeset/brown-eggs-rhyme.md b/.changeset/brown-eggs-rhyme.md
new file mode 100644
index 00000000000..bac78315f9d
--- /dev/null
+++ b/.changeset/brown-eggs-rhyme.md
@@ -0,0 +1,5 @@
+---
+"@atproto/oauth-provider": patch
+---
+
+Mark "userAgent" as optional in `RequestMetadata`
diff --git a/packages/oauth/oauth-provider/src/device/device-manager.ts b/packages/oauth/oauth-provider/src/device/device-manager.ts
index a9f18965d66..7efa0c7fa89 100644
--- a/packages/oauth/oauth-provider/src/device/device-manager.ts
+++ b/packages/oauth/oauth-provider/src/device/device-manager.ts
@@ -141,7 +141,7 @@ export class DeviceManager {
     await this.store.createDevice(deviceId, {
       sessionId,
       lastSeenAt: new Date(),
-      userAgent: deviceMetadata.userAgent,
+      userAgent: deviceMetadata.userAgent ?? null,
       ipAddress: deviceMetadata.ipAddress,
     })
 
diff --git a/packages/oauth/oauth-provider/src/lib/http/request.ts b/packages/oauth/oauth-provider/src/lib/http/request.ts
index 226d11dbc0d..47ebca73004 100644
--- a/packages/oauth/oauth-provider/src/lib/http/request.ts
+++ b/packages/oauth/oauth-provider/src/lib/http/request.ts
@@ -168,7 +168,7 @@ export type ExtractRequestMetadataOptions = {
 }
 
 export type RequestMetadata = {
-  userAgent: string | null
+  userAgent?: string
   ipAddress: string
   port: number
 }
@@ -177,7 +177,7 @@ export function extractRequestMetadata(
   req: IncomingMessage,
   options?: ExtractRequestMetadataOptions,
 ): RequestMetadata {
-  const userAgent = req.headers['user-agent'] || null
+  const userAgent = req.headers['user-agent'] || undefined
   const ipAddress = extractIpAddress(req, options) || null
   const port = extractPort(req, options)
 

From f1d323a6ef11fa7703ba208d53603064bb553e94 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 14 Feb 2025 14:24:57 +0100
Subject: [PATCH 068/101] Version packages (#3539)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/brown-eggs-rhyme.md             | 5 -----
 packages/dev-env/CHANGELOG.md              | 9 +++++++++
 packages/dev-env/package.json              | 2 +-
 packages/oauth/oauth-provider/CHANGELOG.md | 6 ++++++
 packages/oauth/oauth-provider/package.json | 2 +-
 packages/pds/CHANGELOG.md                  | 7 +++++++
 packages/pds/package.json                  | 2 +-
 7 files changed, 25 insertions(+), 8 deletions(-)
 delete mode 100644 .changeset/brown-eggs-rhyme.md

diff --git a/.changeset/brown-eggs-rhyme.md b/.changeset/brown-eggs-rhyme.md
deleted file mode 100644
index bac78315f9d..00000000000
--- a/.changeset/brown-eggs-rhyme.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/oauth-provider": patch
----
-
-Mark "userAgent" as optional in `RequestMetadata`
diff --git a/packages/dev-env/CHANGELOG.md b/packages/dev-env/CHANGELOG.md
index 0baa19efdc7..121bcab6c1a 100644
--- a/packages/dev-env/CHANGELOG.md
+++ b/packages/dev-env/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @atproto/dev-env
 
+## 0.3.89
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atproto/pds@0.4.97
+  - @atproto/bsky@0.0.118
+  - @atproto/ozone@0.1.79
+
 ## 0.3.88
 
 ### Patch Changes
diff --git a/packages/dev-env/package.json b/packages/dev-env/package.json
index 5569e0e8de0..c929d6376e2 100644
--- a/packages/dev-env/package.json
+++ b/packages/dev-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/dev-env",
-  "version": "0.3.88",
+  "version": "0.3.89",
   "license": "MIT",
   "description": "Local development environment helper for atproto development",
   "keywords": [
diff --git a/packages/oauth/oauth-provider/CHANGELOG.md b/packages/oauth/oauth-provider/CHANGELOG.md
index 93b3997181d..e9c72e5eadd 100644
--- a/packages/oauth/oauth-provider/CHANGELOG.md
+++ b/packages/oauth/oauth-provider/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @atproto/oauth-provider
 
+## 0.3.1
+
+### Patch Changes
+
+- [#3538](https://github.com/bluesky-social/atproto/pull/3538) [`bde6f71c4`](https://github.com/bluesky-social/atproto/commit/bde6f71c4cd33022d29da0ff23463a5838c4de24) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Mark "userAgent" as optional in `RequestMetadata`
+
 ## 0.3.0
 
 ### Minor Changes
diff --git a/packages/oauth/oauth-provider/package.json b/packages/oauth/oauth-provider/package.json
index 9e4e6586430..05e6f45b2c4 100644
--- a/packages/oauth/oauth-provider/package.json
+++ b/packages/oauth/oauth-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/oauth-provider",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "license": "MIT",
   "description": "Generic OAuth2 and OpenID Connect provider for Node.js. Currently only supports features needed for Atproto.",
   "keywords": [
diff --git a/packages/pds/CHANGELOG.md b/packages/pds/CHANGELOG.md
index bfbcbf46bef..51d2b9c97eb 100644
--- a/packages/pds/CHANGELOG.md
+++ b/packages/pds/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/pds
 
+## 0.4.97
+
+### Patch Changes
+
+- Updated dependencies [[`bde6f71c4`](https://github.com/bluesky-social/atproto/commit/bde6f71c4cd33022d29da0ff23463a5838c4de24)]:
+  - @atproto/oauth-provider@0.3.1
+
 ## 0.4.96
 
 ### Patch Changes
diff --git a/packages/pds/package.json b/packages/pds/package.json
index 308385ab0d3..f37d305f0a9 100644
--- a/packages/pds/package.json
+++ b/packages/pds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/pds",
-  "version": "0.4.96",
+  "version": "0.4.97",
   "license": "MIT",
   "description": "Reference implementation of atproto Personal Data Server (PDS)",
   "keywords": [

From b41ff4b4e309f5c1594a79d64f4090eaa4587a3c Mon Sep 17 00:00:00 2001
From: Foysal Ahamed <foysal@blueskyweb.xyz>
Date: Mon, 17 Feb 2025 21:17:43 +0000
Subject: [PATCH 069/101] :sparkles: Add reporter_stats materialized view and
 endpoint to fetch reporter stats (#3509)

* :sparkles: Add reporter_stats materialized view and endpoint to fetch reporter stats

* :rotating_light: Fix linter issues

* :sparkles: Change reporter stats query from materialized view to on demand select

* Add "createdAt" as part of the index

---------

Co-authored-by: Matthieu Sieben <matthieu.sieben@gmail.com>
Co-authored-by: Matthieu Sieben <matthieusieben@users.noreply.github.com>
---
 lexicons/tools/ozone/moderation/defs.json     |  52 ++++++++
 .../ozone/moderation/getReporterStats.json    |  40 ++++++
 packages/api/src/client/index.ts              |  14 ++
 packages/api/src/client/lexicons.ts           | 100 ++++++++++++++
 .../types/tools/ozone/moderation/defs.ts      |  31 +++++
 .../ozone/moderation/getReporterStats.ts      |  38 ++++++
 packages/dev-env/src/moderator-client.ts      |  13 ++
 packages/ozone/src/api/index.ts               |   2 +
 .../src/api/moderation/getReporterStats.ts    |  18 +++
 .../src/daemon/materialized-view-refresher.ts |   1 +
 ...211T003647759Z-add-reporter-stats-index.ts |  38 ++++++
 packages/ozone/src/db/migrations/index.ts     |   1 +
 packages/ozone/src/lexicon/index.ts           |  12 ++
 packages/ozone/src/lexicon/lexicons.ts        | 100 ++++++++++++++
 .../types/tools/ozone/moderation/defs.ts      |  31 +++++
 .../ozone/moderation/getReporterStats.ts      |  50 +++++++
 packages/ozone/src/mod-service/index.ts       | 126 ++++++++++++++++++
 packages/ozone/src/mod-service/types.ts       |  23 ++++
 .../ozone/tests/get-reporter-stats.test.ts    | 117 ++++++++++++++++
 packages/pds/src/lexicon/index.ts             |  12 ++
 packages/pds/src/lexicon/lexicons.ts          | 100 ++++++++++++++
 .../types/tools/ozone/moderation/defs.ts      |  31 +++++
 .../ozone/moderation/getReporterStats.ts      |  50 +++++++
 23 files changed, 1000 insertions(+)
 create mode 100644 lexicons/tools/ozone/moderation/getReporterStats.json
 create mode 100644 packages/api/src/client/types/tools/ozone/moderation/getReporterStats.ts
 create mode 100644 packages/ozone/src/api/moderation/getReporterStats.ts
 create mode 100644 packages/ozone/src/db/migrations/20250211T003647759Z-add-reporter-stats-index.ts
 create mode 100644 packages/ozone/src/lexicon/types/tools/ozone/moderation/getReporterStats.ts
 create mode 100644 packages/ozone/tests/get-reporter-stats.test.ts
 create mode 100644 packages/pds/src/lexicon/types/tools/ozone/moderation/getReporterStats.ts

diff --git a/lexicons/tools/ozone/moderation/defs.json b/lexicons/tools/ozone/moderation/defs.json
index 4a2e8fa9415..b0be0ed51b1 100644
--- a/lexicons/tools/ozone/moderation/defs.json
+++ b/lexicons/tools/ozone/moderation/defs.json
@@ -812,6 +812,58 @@
           "format": "datetime"
         }
       }
+    },
+    "reporterStats": {
+      "type": "object",
+      "required": [
+        "did",
+        "accountReportCount",
+        "recordReportCount",
+        "reportedAccountCount",
+        "reportedRecordCount",
+        "takendownAccountCount",
+        "takendownRecordCount",
+        "labeledAccountCount",
+        "labeledRecordCount"
+      ],
+      "properties": {
+        "did": {
+          "type": "string",
+          "format": "did"
+        },
+        "accountReportCount": {
+          "type": "integer",
+          "description": "The total number of reports made by the user on accounts."
+        },
+        "recordReportCount": {
+          "type": "integer",
+          "description": "The total number of reports made by the user on records."
+        },
+        "reportedAccountCount": {
+          "type": "integer",
+          "description": "The total number of accounts reported by the user."
+        },
+        "reportedRecordCount": {
+          "type": "integer",
+          "description": "The total number of records reported by the user."
+        },
+        "takendownAccountCount": {
+          "type": "integer",
+          "description": "The total number of accounts taken down as a result of the user's reports."
+        },
+        "takendownRecordCount": {
+          "type": "integer",
+          "description": "The total number of records taken down as a result of the user's reports."
+        },
+        "labeledAccountCount": {
+          "type": "integer",
+          "description": "The total number of accounts labeled as a result of the user's reports."
+        },
+        "labeledRecordCount": {
+          "type": "integer",
+          "description": "The total number of records labeled as a result of the user's reports."
+        }
+      }
     }
   }
 }
diff --git a/lexicons/tools/ozone/moderation/getReporterStats.json b/lexicons/tools/ozone/moderation/getReporterStats.json
new file mode 100644
index 00000000000..51f445417c6
--- /dev/null
+++ b/lexicons/tools/ozone/moderation/getReporterStats.json
@@ -0,0 +1,40 @@
+{
+  "lexicon": 1,
+  "id": "tools.ozone.moderation.getReporterStats",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Get reporter stats for a list of users.",
+      "parameters": {
+        "type": "params",
+        "required": ["dids"],
+        "properties": {
+          "dids": {
+            "type": "array",
+            "maxLength": 100,
+            "items": {
+              "type": "string",
+              "format": "did"
+            }
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["stats"],
+          "properties": {
+            "stats": {
+              "type": "array",
+              "items": {
+                "type": "ref",
+                "ref": "tools.ozone.moderation.defs#reporterStats"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/packages/api/src/client/index.ts b/packages/api/src/client/index.ts
index 691d9cab6cc..0f0c06dfbb1 100644
--- a/packages/api/src/client/index.ts
+++ b/packages/api/src/client/index.ts
@@ -208,6 +208,7 @@ import * as ToolsOzoneModerationGetEvent from './types/tools/ozone/moderation/ge
 import * as ToolsOzoneModerationGetRecord from './types/tools/ozone/moderation/getRecord.js'
 import * as ToolsOzoneModerationGetRecords from './types/tools/ozone/moderation/getRecords.js'
 import * as ToolsOzoneModerationGetRepo from './types/tools/ozone/moderation/getRepo.js'
+import * as ToolsOzoneModerationGetReporterStats from './types/tools/ozone/moderation/getReporterStats.js'
 import * as ToolsOzoneModerationGetRepos from './types/tools/ozone/moderation/getRepos.js'
 import * as ToolsOzoneModerationQueryEvents from './types/tools/ozone/moderation/queryEvents.js'
 import * as ToolsOzoneModerationQueryStatuses from './types/tools/ozone/moderation/queryStatuses.js'
@@ -437,6 +438,7 @@ export * as ToolsOzoneModerationGetEvent from './types/tools/ozone/moderation/ge
 export * as ToolsOzoneModerationGetRecord from './types/tools/ozone/moderation/getRecord.js'
 export * as ToolsOzoneModerationGetRecords from './types/tools/ozone/moderation/getRecords.js'
 export * as ToolsOzoneModerationGetRepo from './types/tools/ozone/moderation/getRepo.js'
+export * as ToolsOzoneModerationGetReporterStats from './types/tools/ozone/moderation/getReporterStats.js'
 export * as ToolsOzoneModerationGetRepos from './types/tools/ozone/moderation/getRepos.js'
 export * as ToolsOzoneModerationQueryEvents from './types/tools/ozone/moderation/queryEvents.js'
 export * as ToolsOzoneModerationQueryStatuses from './types/tools/ozone/moderation/queryStatuses.js'
@@ -3722,6 +3724,18 @@ export class ToolsOzoneModerationNS {
       })
   }
 
+  getReporterStats(
+    params?: ToolsOzoneModerationGetReporterStats.QueryParams,
+    opts?: ToolsOzoneModerationGetReporterStats.CallOptions,
+  ): Promise<ToolsOzoneModerationGetReporterStats.Response> {
+    return this._client.call(
+      'tools.ozone.moderation.getReporterStats',
+      params,
+      undefined,
+      opts,
+    )
+  }
+
   getRepos(
     params?: ToolsOzoneModerationGetRepos.QueryParams,
     opts?: ToolsOzoneModerationGetRepos.CallOptions,
diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
index c2bfa933c42..c02dac82cfd 100644
--- a/packages/api/src/client/lexicons.ts
+++ b/packages/api/src/client/lexicons.ts
@@ -12219,6 +12219,64 @@ export const schemaDict = {
           },
         },
       },
+      reporterStats: {
+        type: 'object',
+        required: [
+          'did',
+          'accountReportCount',
+          'recordReportCount',
+          'reportedAccountCount',
+          'reportedRecordCount',
+          'takendownAccountCount',
+          'takendownRecordCount',
+          'labeledAccountCount',
+          'labeledRecordCount',
+        ],
+        properties: {
+          did: {
+            type: 'string',
+            format: 'did',
+          },
+          accountReportCount: {
+            type: 'integer',
+            description:
+              'The total number of reports made by the user on accounts.',
+          },
+          recordReportCount: {
+            type: 'integer',
+            description:
+              'The total number of reports made by the user on records.',
+          },
+          reportedAccountCount: {
+            type: 'integer',
+            description: 'The total number of accounts reported by the user.',
+          },
+          reportedRecordCount: {
+            type: 'integer',
+            description: 'The total number of records reported by the user.',
+          },
+          takendownAccountCount: {
+            type: 'integer',
+            description:
+              "The total number of accounts taken down as a result of the user's reports.",
+          },
+          takendownRecordCount: {
+            type: 'integer',
+            description:
+              "The total number of records taken down as a result of the user's reports.",
+          },
+          labeledAccountCount: {
+            type: 'integer',
+            description:
+              "The total number of accounts labeled as a result of the user's reports.",
+          },
+          labeledRecordCount: {
+            type: 'integer',
+            description:
+              "The total number of records labeled as a result of the user's reports.",
+          },
+        },
+      },
     },
   },
   ToolsOzoneModerationEmitEvent: {
@@ -12430,6 +12488,46 @@ export const schemaDict = {
       },
     },
   },
+  ToolsOzoneModerationGetReporterStats: {
+    lexicon: 1,
+    id: 'tools.ozone.moderation.getReporterStats',
+    defs: {
+      main: {
+        type: 'query',
+        description: 'Get reporter stats for a list of users.',
+        parameters: {
+          type: 'params',
+          required: ['dids'],
+          properties: {
+            dids: {
+              type: 'array',
+              maxLength: 100,
+              items: {
+                type: 'string',
+                format: 'did',
+              },
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['stats'],
+            properties: {
+              stats: {
+                type: 'array',
+                items: {
+                  type: 'ref',
+                  ref: 'lex:tools.ozone.moderation.defs#reporterStats',
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  },
   ToolsOzoneModerationGetRepos: {
     lexicon: 1,
     id: 'tools.ozone.moderation.getRepos',
@@ -14133,6 +14231,8 @@ export const ids = {
   ToolsOzoneModerationGetRecord: 'tools.ozone.moderation.getRecord',
   ToolsOzoneModerationGetRecords: 'tools.ozone.moderation.getRecords',
   ToolsOzoneModerationGetRepo: 'tools.ozone.moderation.getRepo',
+  ToolsOzoneModerationGetReporterStats:
+    'tools.ozone.moderation.getReporterStats',
   ToolsOzoneModerationGetRepos: 'tools.ozone.moderation.getRepos',
   ToolsOzoneModerationQueryEvents: 'tools.ozone.moderation.queryEvents',
   ToolsOzoneModerationQueryStatuses: 'tools.ozone.moderation.queryStatuses',
diff --git a/packages/api/src/client/types/tools/ozone/moderation/defs.ts b/packages/api/src/client/types/tools/ozone/moderation/defs.ts
index 611010a42a4..b1803cada95 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/defs.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/defs.ts
@@ -836,3 +836,34 @@ export function isRecordHosting<V>(v: V) {
 export function validateRecordHosting<V>(v: V) {
   return validate<RecordHosting & V>(v, id, hashRecordHosting)
 }
+
+export interface ReporterStats {
+  $type?: 'tools.ozone.moderation.defs#reporterStats'
+  did: string
+  /** The total number of reports made by the user on accounts. */
+  accountReportCount: number
+  /** The total number of reports made by the user on records. */
+  recordReportCount: number
+  /** The total number of accounts reported by the user. */
+  reportedAccountCount: number
+  /** The total number of records reported by the user. */
+  reportedRecordCount: number
+  /** The total number of accounts taken down as a result of the user's reports. */
+  takendownAccountCount: number
+  /** The total number of records taken down as a result of the user's reports. */
+  takendownRecordCount: number
+  /** The total number of accounts labeled as a result of the user's reports. */
+  labeledAccountCount: number
+  /** The total number of records labeled as a result of the user's reports. */
+  labeledRecordCount: number
+}
+
+const hashReporterStats = 'reporterStats'
+
+export function isReporterStats<V>(v: V) {
+  return is$typed(v, id, hashReporterStats)
+}
+
+export function validateReporterStats<V>(v: V) {
+  return validate<ReporterStats & V>(v, id, hashReporterStats)
+}
diff --git a/packages/api/src/client/types/tools/ozone/moderation/getReporterStats.ts b/packages/api/src/client/types/tools/ozone/moderation/getReporterStats.ts
new file mode 100644
index 00000000000..7e6a37dfdfc
--- /dev/null
+++ b/packages/api/src/client/types/tools/ozone/moderation/getReporterStats.ts
@@ -0,0 +1,38 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { HeadersMap, XRPCError } from '@atproto/xrpc'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ToolsOzoneModerationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.getReporterStats'
+
+export interface QueryParams {
+  dids: string[]
+}
+
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  stats: ToolsOzoneModerationDefs.ReporterStats[]
+}
+
+export interface CallOptions {
+  signal?: AbortSignal
+  headers?: HeadersMap
+}
+
+export interface Response {
+  success: boolean
+  headers: HeadersMap
+  data: OutputSchema
+}
+
+export function toKnownErr(e: any) {
+  return e
+}
diff --git a/packages/dev-env/src/moderator-client.ts b/packages/dev-env/src/moderator-client.ts
index 603eef4fb3e..7767a4e6176 100644
--- a/packages/dev-env/src/moderator-client.ts
+++ b/packages/dev-env/src/moderator-client.ts
@@ -45,6 +45,19 @@ export class ModeratorClient {
     return result.data
   }
 
+  async getReporterStats(dids: string[]) {
+    const result = await this.agent.tools.ozone.moderation.getReporterStats(
+      { dids },
+      {
+        headers: await this.ozone.modHeaders(
+          'tools.ozone.moderation.getReporterStats',
+          'admin',
+        ),
+      },
+    )
+    return result.data
+  }
+
   async queryEvents(input: QueryEventsParams, role?: ModLevel) {
     const result = await this.agent.tools.ozone.moderation.queryEvents(input, {
       headers: await this.ozone.modHeaders(
diff --git a/packages/ozone/src/api/index.ts b/packages/ozone/src/api/index.ts
index 3ca6e6bf6ff..dc478ba9ad5 100644
--- a/packages/ozone/src/api/index.ts
+++ b/packages/ozone/src/api/index.ts
@@ -13,6 +13,7 @@ import getEvent from './moderation/getEvent'
 import adminGetRecord from './moderation/getRecord'
 import adminGetRecords from './moderation/getRecords'
 import getRepo from './moderation/getRepo'
+import getReporterStats from './moderation/getReporterStats'
 import getRepos from './moderation/getRepos'
 import queryEvents from './moderation/queryEvents'
 import queryStatuses from './moderation/queryStatuses'
@@ -72,5 +73,6 @@ export default function (server: Server, ctx: AppContext) {
   upsertOption(server, ctx)
   listOptions(server, ctx)
   removeOptions(server, ctx)
+  getReporterStats(server, ctx)
   return server
 }
diff --git a/packages/ozone/src/api/moderation/getReporterStats.ts b/packages/ozone/src/api/moderation/getReporterStats.ts
new file mode 100644
index 00000000000..ac07eaed60a
--- /dev/null
+++ b/packages/ozone/src/api/moderation/getReporterStats.ts
@@ -0,0 +1,18 @@
+import { AppContext } from '../../context'
+import { Server } from '../../lexicon'
+
+export default function (server: Server, ctx: AppContext) {
+  server.tools.ozone.moderation.getReporterStats({
+    auth: ctx.authVerifier.modOrAdminToken,
+    handler: async ({ params }) => {
+      const db = ctx.db
+
+      const stats = await ctx.modService(db).getReporterStats(params.dids)
+
+      return {
+        encoding: 'application/json',
+        body: { stats },
+      }
+    },
+  })
+}
diff --git a/packages/ozone/src/daemon/materialized-view-refresher.ts b/packages/ozone/src/daemon/materialized-view-refresher.ts
index a4ef689b98d..e7cd914392e 100644
--- a/packages/ozone/src/daemon/materialized-view-refresher.ts
+++ b/packages/ozone/src/daemon/materialized-view-refresher.ts
@@ -10,6 +10,7 @@ export class MaterializedViewRefresher extends PeriodicBackgroundTask {
         'record_events_stats',
         'account_record_events_stats',
         'account_record_status_stats',
+        'reporter_stats',
       ]) {
         if (signal.aborted) break
 
diff --git a/packages/ozone/src/db/migrations/20250211T003647759Z-add-reporter-stats-index.ts b/packages/ozone/src/db/migrations/20250211T003647759Z-add-reporter-stats-index.ts
new file mode 100644
index 00000000000..9b46adc457b
--- /dev/null
+++ b/packages/ozone/src/db/migrations/20250211T003647759Z-add-reporter-stats-index.ts
@@ -0,0 +1,38 @@
+import { Kysely, sql } from 'kysely'
+
+export async function up(db: Kysely<unknown>): Promise<void> {
+  await sql`
+    CREATE INDEX "moderation_event_account_reports_idx"
+    ON moderation_event("createdBy","subjectDid", "createdAt")
+    WHERE "subjectUri" IS NULL
+    AND "action" = 'tools.ozone.moderation.defs#modEventReport'
+  `.execute(db)
+
+  await sql`
+    CREATE INDEX "moderation_event_record_reports_idx"
+    ON moderation_event("createdBy","subjectDid","subjectUri", "createdAt")
+    WHERE "subjectUri" IS NOT NULL
+    AND "action" = 'tools.ozone.moderation.defs#modEventReport'
+  `.execute(db)
+
+  await sql`
+    CREATE INDEX "moderation_event_account_actions_ids"
+    ON moderation_event("subjectDid","action", "createdAt")
+    WHERE "subjectUri" IS NULL
+    AND "action" IN ( 'tools.ozone.moderation.defs#modEventTakedown', 'tools.ozone.moderation.defs#modEventLabel')
+  `.execute(db)
+
+  await sql`
+    CREATE INDEX "moderation_event_record_actions_ids"
+    ON moderation_event("subjectDid","subjectUri", "action", "createdAt")
+    WHERE "subjectUri" IS NOT NULL
+    AND "action" IN ( 'tools.ozone.moderation.defs#modEventTakedown', 'tools.ozone.moderation.defs#modEventLabel')
+  `.execute(db)
+}
+
+export async function down(db: Kysely<unknown>): Promise<void> {
+  await db.schema.dropIndex('moderation_event_account_reports_idx').execute()
+  await db.schema.dropIndex('moderation_event_record_reports_idx').execute()
+  await db.schema.dropIndex('moderation_event_account_actions_ids').execute()
+  await db.schema.dropIndex('moderation_event_record_actions_ids').execute()
+}
diff --git a/packages/ozone/src/db/migrations/index.ts b/packages/ozone/src/db/migrations/index.ts
index 82923722c54..2a9231e2e1a 100644
--- a/packages/ozone/src/db/migrations/index.ts
+++ b/packages/ozone/src/db/migrations/index.ts
@@ -19,4 +19,5 @@ export * as _20241018T205730722Z from './20241018T205730722Z-setting'
 export * as _20241026T205730722Z from './20241026T205730722Z-add-hosting-status-to-subject-status'
 export * as _20241220T144630860Z from './20241220T144630860Z-stats-materialized-views'
 export * as _20250204T003647759Z from './20250204T003647759Z-add-subject-priority-score'
+export * as _20250211T003647759Z from './20250211T003647759Z-add-reporter-stats-index'
 export * as _20250211T132135150Z from './20250211T132135150Z-moderation-event-message-partial-idx'
diff --git a/packages/ozone/src/lexicon/index.ts b/packages/ozone/src/lexicon/index.ts
index 972f1a14a3f..fc1e6956dc3 100644
--- a/packages/ozone/src/lexicon/index.ts
+++ b/packages/ozone/src/lexicon/index.ts
@@ -173,6 +173,7 @@ import * as ToolsOzoneModerationGetEvent from './types/tools/ozone/moderation/ge
 import * as ToolsOzoneModerationGetRecord from './types/tools/ozone/moderation/getRecord.js'
 import * as ToolsOzoneModerationGetRecords from './types/tools/ozone/moderation/getRecords.js'
 import * as ToolsOzoneModerationGetRepo from './types/tools/ozone/moderation/getRepo.js'
+import * as ToolsOzoneModerationGetReporterStats from './types/tools/ozone/moderation/getReporterStats.js'
 import * as ToolsOzoneModerationGetRepos from './types/tools/ozone/moderation/getRepos.js'
 import * as ToolsOzoneModerationQueryEvents from './types/tools/ozone/moderation/queryEvents.js'
 import * as ToolsOzoneModerationQueryStatuses from './types/tools/ozone/moderation/queryStatuses.js'
@@ -2376,6 +2377,17 @@ export class ToolsOzoneModerationNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
+  getReporterStats<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ToolsOzoneModerationGetReporterStats.Handler<ExtractAuth<AV>>,
+      ToolsOzoneModerationGetReporterStats.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'tools.ozone.moderation.getReporterStats' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   getRepos<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,
diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
index c2bfa933c42..c02dac82cfd 100644
--- a/packages/ozone/src/lexicon/lexicons.ts
+++ b/packages/ozone/src/lexicon/lexicons.ts
@@ -12219,6 +12219,64 @@ export const schemaDict = {
           },
         },
       },
+      reporterStats: {
+        type: 'object',
+        required: [
+          'did',
+          'accountReportCount',
+          'recordReportCount',
+          'reportedAccountCount',
+          'reportedRecordCount',
+          'takendownAccountCount',
+          'takendownRecordCount',
+          'labeledAccountCount',
+          'labeledRecordCount',
+        ],
+        properties: {
+          did: {
+            type: 'string',
+            format: 'did',
+          },
+          accountReportCount: {
+            type: 'integer',
+            description:
+              'The total number of reports made by the user on accounts.',
+          },
+          recordReportCount: {
+            type: 'integer',
+            description:
+              'The total number of reports made by the user on records.',
+          },
+          reportedAccountCount: {
+            type: 'integer',
+            description: 'The total number of accounts reported by the user.',
+          },
+          reportedRecordCount: {
+            type: 'integer',
+            description: 'The total number of records reported by the user.',
+          },
+          takendownAccountCount: {
+            type: 'integer',
+            description:
+              "The total number of accounts taken down as a result of the user's reports.",
+          },
+          takendownRecordCount: {
+            type: 'integer',
+            description:
+              "The total number of records taken down as a result of the user's reports.",
+          },
+          labeledAccountCount: {
+            type: 'integer',
+            description:
+              "The total number of accounts labeled as a result of the user's reports.",
+          },
+          labeledRecordCount: {
+            type: 'integer',
+            description:
+              "The total number of records labeled as a result of the user's reports.",
+          },
+        },
+      },
     },
   },
   ToolsOzoneModerationEmitEvent: {
@@ -12430,6 +12488,46 @@ export const schemaDict = {
       },
     },
   },
+  ToolsOzoneModerationGetReporterStats: {
+    lexicon: 1,
+    id: 'tools.ozone.moderation.getReporterStats',
+    defs: {
+      main: {
+        type: 'query',
+        description: 'Get reporter stats for a list of users.',
+        parameters: {
+          type: 'params',
+          required: ['dids'],
+          properties: {
+            dids: {
+              type: 'array',
+              maxLength: 100,
+              items: {
+                type: 'string',
+                format: 'did',
+              },
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['stats'],
+            properties: {
+              stats: {
+                type: 'array',
+                items: {
+                  type: 'ref',
+                  ref: 'lex:tools.ozone.moderation.defs#reporterStats',
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  },
   ToolsOzoneModerationGetRepos: {
     lexicon: 1,
     id: 'tools.ozone.moderation.getRepos',
@@ -14133,6 +14231,8 @@ export const ids = {
   ToolsOzoneModerationGetRecord: 'tools.ozone.moderation.getRecord',
   ToolsOzoneModerationGetRecords: 'tools.ozone.moderation.getRecords',
   ToolsOzoneModerationGetRepo: 'tools.ozone.moderation.getRepo',
+  ToolsOzoneModerationGetReporterStats:
+    'tools.ozone.moderation.getReporterStats',
   ToolsOzoneModerationGetRepos: 'tools.ozone.moderation.getRepos',
   ToolsOzoneModerationQueryEvents: 'tools.ozone.moderation.queryEvents',
   ToolsOzoneModerationQueryStatuses: 'tools.ozone.moderation.queryStatuses',
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts
index 611010a42a4..b1803cada95 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts
@@ -836,3 +836,34 @@ export function isRecordHosting<V>(v: V) {
 export function validateRecordHosting<V>(v: V) {
   return validate<RecordHosting & V>(v, id, hashRecordHosting)
 }
+
+export interface ReporterStats {
+  $type?: 'tools.ozone.moderation.defs#reporterStats'
+  did: string
+  /** The total number of reports made by the user on accounts. */
+  accountReportCount: number
+  /** The total number of reports made by the user on records. */
+  recordReportCount: number
+  /** The total number of accounts reported by the user. */
+  reportedAccountCount: number
+  /** The total number of records reported by the user. */
+  reportedRecordCount: number
+  /** The total number of accounts taken down as a result of the user's reports. */
+  takendownAccountCount: number
+  /** The total number of records taken down as a result of the user's reports. */
+  takendownRecordCount: number
+  /** The total number of accounts labeled as a result of the user's reports. */
+  labeledAccountCount: number
+  /** The total number of records labeled as a result of the user's reports. */
+  labeledRecordCount: number
+}
+
+const hashReporterStats = 'reporterStats'
+
+export function isReporterStats<V>(v: V) {
+  return is$typed(v, id, hashReporterStats)
+}
+
+export function validateReporterStats<V>(v: V) {
+  return validate<ReporterStats & V>(v, id, hashReporterStats)
+}
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getReporterStats.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getReporterStats.ts
new file mode 100644
index 00000000000..c4e86af9304
--- /dev/null
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getReporterStats.ts
@@ -0,0 +1,50 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+import type * as ToolsOzoneModerationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.getReporterStats'
+
+export interface QueryParams {
+  dids: string[]
+}
+
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  stats: ToolsOzoneModerationDefs.ReporterStats[]
+}
+
+export type HandlerInput = undefined
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+  resetRouteRateLimits: () => Promise<void>
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput
diff --git a/packages/ozone/src/mod-service/index.ts b/packages/ozone/src/mod-service/index.ts
index 03a43f0b9b6..4ad4ab973d3 100644
--- a/packages/ozone/src/mod-service/index.ts
+++ b/packages/ozone/src/mod-service/index.ts
@@ -58,6 +58,8 @@ import {
   ModerationEventRow,
   ModerationSubjectStatusRow,
   ModerationSubjectStatusRowWithHandle,
+  ReporterStats,
+  ReporterStatsResult,
   ReversibleModerationEvent,
 } from './types'
 import { formatLabel, formatLabelRow, signLabel } from './util'
@@ -1272,6 +1274,130 @@ export class ModerationService {
       throw new InvalidRequestError('Email was accepted but not sent')
     }
   }
+
+  buildModerationQuery(
+    subjectType: 'account' | 'record',
+    createdByDids: string[],
+    isActionQuery: boolean,
+  ): Promise<(Partial<ReporterStatsResult> & { did: string })[]> {
+    const isAccount = subjectType === 'account'
+    const actionTypes = [
+      'tools.ozone.moderation.defs#modEventTakedown',
+      'tools.ozone.moderation.defs#modEventLabel',
+    ] as const
+
+    const query = this.db.db
+      .selectFrom('moderation_event as reports')
+      .where(
+        'reports.action',
+        '=',
+        'tools.ozone.moderation.defs#modEventReport',
+      )
+      .where('reports.subjectUri', isAccount ? 'is' : 'is not', null)
+      .where('reports.createdBy', 'in', createdByDids)
+      .select(['reports.createdBy as did'])
+
+    if (isActionQuery) {
+      return query
+        .leftJoin('moderation_event as actions', (join) =>
+          join
+            .onRef('actions.subjectDid', '=', 'reports.subjectDid')
+            .on('actions.subjectUri', isAccount ? 'is' : 'is not', null)
+            .onRef('actions.createdAt', '>', 'reports.createdAt')
+            .on('actions.action', 'in', actionTypes),
+        )
+        .select([
+          () =>
+            sql<number>`COUNT(DISTINCT actions."subjectDid") FILTER (
+              WHERE actions."action" = 'tools.ozone.moderation.defs#modEventTakedown'
+            )`.as(`takendown${isAccount ? 'Account' : 'Record'}Count`),
+
+          () =>
+            sql<number>`COUNT(DISTINCT actions."subjectDid") FILTER (
+              WHERE actions."action" = 'tools.ozone.moderation.defs#modEventLabel'
+            )`.as(`labeled${isAccount ? 'Account' : 'Record'}Count`),
+        ])
+        .groupBy('reports.createdBy')
+        .execute()
+    }
+
+    return query
+      .select([
+        (eb) =>
+          eb.fn.count<number>('reports.id').as(`${subjectType}ReportCount`),
+        (eb) =>
+          eb.fn
+            .count<number>(
+              isAccount ? 'reports.subjectDid' : 'reports.subjectUri',
+            )
+            .distinct()
+            .as(`reported${isAccount ? 'Account' : 'Record'}Count`),
+      ])
+      .groupBy('reports.createdBy')
+      .execute()
+  }
+
+  async getReporterStats(dids: string[]) {
+    const [accountReports, recordReports, accountActions, recordActions] =
+      await Promise.all([
+        this.buildModerationQuery('account', dids, false),
+        this.buildModerationQuery('record', dids, false),
+        this.buildModerationQuery('account', dids, true),
+        this.buildModerationQuery('record', dids, true),
+      ])
+
+    // Create a map to hold the aggregated stats for each `did`
+    const statsMap = new Map<string, ReporterStats>()
+
+    // Helper function to ensure a `did` entry exists in the map
+    const ensureDidEntry = (did: string) => {
+      if (!statsMap.has(did)) {
+        statsMap.set(did, {
+          did,
+          accountReportCount: 0,
+          recordReportCount: 0,
+          reportedAccountCount: 0,
+          reportedRecordCount: 0,
+          takendownAccountCount: 0,
+          takendownRecordCount: 0,
+          labeledAccountCount: 0,
+          labeledRecordCount: 0,
+        })
+      }
+      return statsMap.get(did)!
+    }
+
+    // Merge accountReports
+    for (const report of accountReports) {
+      const entry = ensureDidEntry(report.did)
+      entry.accountReportCount = report.accountReportCount ?? 0
+      entry.reportedAccountCount = report.reportedAccountCount ?? 0
+    }
+
+    // Merge recordReports
+    for (const report of recordReports) {
+      const entry = ensureDidEntry(report.did)
+      entry.recordReportCount = report.recordReportCount ?? 0
+      entry.reportedRecordCount = report.reportedRecordCount ?? 0
+    }
+
+    // Merge accountActions
+    for (const action of accountActions) {
+      const entry = ensureDidEntry(action.did)
+      entry.takendownAccountCount = action.takendownAccountCount ?? 0
+      entry.labeledAccountCount = action.labeledAccountCount ?? 0
+    }
+
+    // Merge recordActions
+    for (const action of recordActions) {
+      const entry = ensureDidEntry(action.did)
+      entry.takendownRecordCount = action.takendownRecordCount ?? 0
+      entry.labeledRecordCount = action.labeledRecordCount ?? 0
+    }
+
+    // Convert map values to an array and return
+    return Array.from(statsMap.values())
+  }
 }
 
 const parseTags = (tags?: string[]) =>
diff --git a/packages/ozone/src/mod-service/types.ts b/packages/ozone/src/mod-service/types.ts
index 4941768c40f..32c68f45c0a 100644
--- a/packages/ozone/src/mod-service/types.ts
+++ b/packages/ozone/src/mod-service/types.ts
@@ -65,3 +65,26 @@ type RecordHostingView = {
 export type ModerationSubjectHostingView =
   | AccountHostingView
   | RecordHostingView
+
+export type ReporterStats = {
+  did: string
+  accountReportCount: number
+  recordReportCount: number
+  reportedAccountCount: number
+  reportedRecordCount: number
+  takendownAccountCount: number
+  takendownRecordCount: number
+  labeledAccountCount: number
+  labeledRecordCount: number
+}
+
+export type ReporterStatsResult = {
+  accountReportCount?: number
+  recordReportCount?: number
+  reportedAccountCount?: number
+  reportedRecordCount?: number
+  takendownAccountCount?: number
+  takendownRecordCount?: number
+  labeledAccountCount?: number
+  labeledRecordCount?: number
+}
diff --git a/packages/ozone/tests/get-reporter-stats.test.ts b/packages/ozone/tests/get-reporter-stats.test.ts
new file mode 100644
index 00000000000..be60654226f
--- /dev/null
+++ b/packages/ozone/tests/get-reporter-stats.test.ts
@@ -0,0 +1,117 @@
+import {
+  ComAtprotoModerationDefs,
+  ToolsOzoneModerationDefs,
+} from '@atproto/api'
+import {
+  ModeratorClient,
+  SeedClient,
+  TestNetwork,
+  basicSeed,
+} from '@atproto/dev-env'
+
+describe('reporter-stats', () => {
+  let network: TestNetwork
+  let sc: SeedClient
+  let modClient: ModeratorClient
+
+  beforeAll(async () => {
+    network = await TestNetwork.create({
+      dbPostgresSchema: 'ozone_reporter_stats',
+      ozone: {
+        dbMaterializedViewRefreshIntervalMs: 1000,
+      },
+    })
+    sc = network.getSeedClient()
+    modClient = network.ozone.getModClient()
+    await basicSeed(sc)
+    await network.processAll()
+  })
+
+  afterAll(async () => {
+    await network.close()
+  })
+
+  const getReporterStats = async (
+    did: string,
+  ): Promise<ToolsOzoneModerationDefs.ReporterStats | undefined> => {
+    const { stats } = await modClient.getReporterStats([did])
+    return stats[0]
+  }
+
+  it('updates reporter stats based on actions', async () => {
+    const bobsPostSubject = {
+      $type: 'com.atproto.repo.strongRef',
+      uri: sc.posts[sc.dids.bob][1].ref.uriStr,
+      cid: sc.posts[sc.dids.bob][1].ref.cidStr,
+    }
+    const carolsAccountSubject = {
+      $type: 'com.atproto.admin.defs#repoRef',
+      did: sc.dids.carol,
+    }
+
+    await Promise.all([
+      sc.createReport({
+        reportedBy: sc.dids.alice,
+        reasonType: ComAtprotoModerationDefs.REASONMISLEADING,
+        reason: 'misleading',
+        subject: bobsPostSubject,
+      }),
+      sc.createReport({
+        reportedBy: sc.dids.alice,
+        reasonType: ComAtprotoModerationDefs.REASONOTHER,
+        reason: 'test',
+        subject: bobsPostSubject,
+      }),
+      sc.createReport({
+        reportedBy: sc.dids.alice,
+        reasonType: ComAtprotoModerationDefs.REASONMISLEADING,
+        reason: 'misleading',
+        subject: carolsAccountSubject,
+      }),
+    ])
+
+    await network.processAll()
+    const statsAfterReport = await getReporterStats(sc.dids.alice)
+    expect(statsAfterReport).toMatchObject({
+      did: sc.dids.alice,
+      accountReportCount: 1,
+      recordReportCount: 2,
+      reportedAccountCount: 1,
+      reportedRecordCount: 1,
+      takendownAccountCount: 0,
+      takendownRecordCount: 0,
+      labeledAccountCount: 0,
+      labeledRecordCount: 0,
+    })
+
+    await Promise.all([
+      modClient.performTakedown({
+        subject: bobsPostSubject,
+        policies: ['trolling'],
+      }),
+      modClient.emitEvent({
+        subject: carolsAccountSubject,
+        event: {
+          $type: 'tools.ozone.moderation.defs#modEventLabel',
+          createLabelVals: ['spam'],
+          negateLabelVals: [],
+        },
+      }),
+    ])
+
+    await network.processAll()
+    await new Promise((resolve) => setTimeout(resolve, 1000))
+    const statsAfterAction = await getReporterStats(sc.dids.alice)
+    expect(statsAfterAction).toMatchObject({
+      did: sc.dids.alice,
+      accountReportCount: 1,
+      recordReportCount: 2,
+      reportedAccountCount: 1,
+      reportedRecordCount: 1,
+      takendownAccountCount: 0,
+      takendownRecordCount: 1,
+      labeledAccountCount: 1,
+      labeledRecordCount: 0,
+    })
+  })
+})
diff --git a/packages/pds/src/lexicon/index.ts b/packages/pds/src/lexicon/index.ts
index 972f1a14a3f..fc1e6956dc3 100644
--- a/packages/pds/src/lexicon/index.ts
+++ b/packages/pds/src/lexicon/index.ts
@@ -173,6 +173,7 @@ import * as ToolsOzoneModerationGetEvent from './types/tools/ozone/moderation/ge
 import * as ToolsOzoneModerationGetRecord from './types/tools/ozone/moderation/getRecord.js'
 import * as ToolsOzoneModerationGetRecords from './types/tools/ozone/moderation/getRecords.js'
 import * as ToolsOzoneModerationGetRepo from './types/tools/ozone/moderation/getRepo.js'
+import * as ToolsOzoneModerationGetReporterStats from './types/tools/ozone/moderation/getReporterStats.js'
 import * as ToolsOzoneModerationGetRepos from './types/tools/ozone/moderation/getRepos.js'
 import * as ToolsOzoneModerationQueryEvents from './types/tools/ozone/moderation/queryEvents.js'
 import * as ToolsOzoneModerationQueryStatuses from './types/tools/ozone/moderation/queryStatuses.js'
@@ -2376,6 +2377,17 @@ export class ToolsOzoneModerationNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
+  getReporterStats<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ToolsOzoneModerationGetReporterStats.Handler<ExtractAuth<AV>>,
+      ToolsOzoneModerationGetReporterStats.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'tools.ozone.moderation.getReporterStats' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   getRepos<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,
diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
index c2bfa933c42..c02dac82cfd 100644
--- a/packages/pds/src/lexicon/lexicons.ts
+++ b/packages/pds/src/lexicon/lexicons.ts
@@ -12219,6 +12219,64 @@ export const schemaDict = {
           },
         },
       },
+      reporterStats: {
+        type: 'object',
+        required: [
+          'did',
+          'accountReportCount',
+          'recordReportCount',
+          'reportedAccountCount',
+          'reportedRecordCount',
+          'takendownAccountCount',
+          'takendownRecordCount',
+          'labeledAccountCount',
+          'labeledRecordCount',
+        ],
+        properties: {
+          did: {
+            type: 'string',
+            format: 'did',
+          },
+          accountReportCount: {
+            type: 'integer',
+            description:
+              'The total number of reports made by the user on accounts.',
+          },
+          recordReportCount: {
+            type: 'integer',
+            description:
+              'The total number of reports made by the user on records.',
+          },
+          reportedAccountCount: {
+            type: 'integer',
+            description: 'The total number of accounts reported by the user.',
+          },
+          reportedRecordCount: {
+            type: 'integer',
+            description: 'The total number of records reported by the user.',
+          },
+          takendownAccountCount: {
+            type: 'integer',
+            description:
+              "The total number of accounts taken down as a result of the user's reports.",
+          },
+          takendownRecordCount: {
+            type: 'integer',
+            description:
+              "The total number of records taken down as a result of the user's reports.",
+          },
+          labeledAccountCount: {
+            type: 'integer',
+            description:
+              "The total number of accounts labeled as a result of the user's reports.",
+          },
+          labeledRecordCount: {
+            type: 'integer',
+            description:
+              "The total number of records labeled as a result of the user's reports.",
+          },
+        },
+      },
     },
   },
   ToolsOzoneModerationEmitEvent: {
@@ -12430,6 +12488,46 @@ export const schemaDict = {
       },
     },
   },
+  ToolsOzoneModerationGetReporterStats: {
+    lexicon: 1,
+    id: 'tools.ozone.moderation.getReporterStats',
+    defs: {
+      main: {
+        type: 'query',
+        description: 'Get reporter stats for a list of users.',
+        parameters: {
+          type: 'params',
+          required: ['dids'],
+          properties: {
+            dids: {
+              type: 'array',
+              maxLength: 100,
+              items: {
+                type: 'string',
+                format: 'did',
+              },
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['stats'],
+            properties: {
+              stats: {
+                type: 'array',
+                items: {
+                  type: 'ref',
+                  ref: 'lex:tools.ozone.moderation.defs#reporterStats',
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  },
   ToolsOzoneModerationGetRepos: {
     lexicon: 1,
     id: 'tools.ozone.moderation.getRepos',
@@ -14133,6 +14231,8 @@ export const ids = {
   ToolsOzoneModerationGetRecord: 'tools.ozone.moderation.getRecord',
   ToolsOzoneModerationGetRecords: 'tools.ozone.moderation.getRecords',
   ToolsOzoneModerationGetRepo: 'tools.ozone.moderation.getRepo',
+  ToolsOzoneModerationGetReporterStats:
+    'tools.ozone.moderation.getReporterStats',
   ToolsOzoneModerationGetRepos: 'tools.ozone.moderation.getRepos',
   ToolsOzoneModerationQueryEvents: 'tools.ozone.moderation.queryEvents',
   ToolsOzoneModerationQueryStatuses: 'tools.ozone.moderation.queryStatuses',
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts
index 611010a42a4..b1803cada95 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts
@@ -836,3 +836,34 @@ export function isRecordHosting<V>(v: V) {
 export function validateRecordHosting<V>(v: V) {
   return validate<RecordHosting & V>(v, id, hashRecordHosting)
 }
+
+export interface ReporterStats {
+  $type?: 'tools.ozone.moderation.defs#reporterStats'
+  did: string
+  /** The total number of reports made by the user on accounts. */
+  accountReportCount: number
+  /** The total number of reports made by the user on records. */
+  recordReportCount: number
+  /** The total number of accounts reported by the user. */
+  reportedAccountCount: number
+  /** The total number of records reported by the user. */
+  reportedRecordCount: number
+  /** The total number of accounts taken down as a result of the user's reports. */
+  takendownAccountCount: number
+  /** The total number of records taken down as a result of the user's reports. */
+  takendownRecordCount: number
+  /** The total number of accounts labeled as a result of the user's reports. */
+  labeledAccountCount: number
+  /** The total number of records labeled as a result of the user's reports. */
+  labeledRecordCount: number
+}
+
+const hashReporterStats = 'reporterStats'
+
+export function isReporterStats<V>(v: V) {
+  return is$typed(v, id, hashReporterStats)
+}
+
+export function validateReporterStats<V>(v: V) {
+  return validate<ReporterStats & V>(v, id, hashReporterStats)
+}
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/getReporterStats.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/getReporterStats.ts
new file mode 100644
index 00000000000..c4e86af9304
--- /dev/null
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/getReporterStats.ts
@@ -0,0 +1,50 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+import type * as ToolsOzoneModerationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.getReporterStats'
+
+export interface QueryParams {
+  dids: string[]
+}
+
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  stats: ToolsOzoneModerationDefs.ReporterStats[]
+}
+
+export type HandlerInput = undefined
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+  resetRouteRateLimits: () => Promise<void>
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput

From 010f10c6f212f699ad42c0349a58bbcf2172e3cc Mon Sep 17 00:00:00 2001
From: bnewbold <bnewbold@robocracy.org>
Date: Mon, 17 Feb 2025 21:15:35 -0500
Subject: [PATCH 070/101] com.atproto.sync.listReposByCollection Lexicon, for
 collections directory (#3524)

* com.atproto.sync.listReposByCollection, for collections directory

* bump listReposByCollection limit

* update max+default to align more with listRepos

* codegen

* changeset for listReposByCollection
---
 .changeset/slimy-trainers-tease.md            |  5 ++
 .../atproto/sync/listReposByCollection.json   | 46 +++++++++++++
 packages/api/src/client/index.ts              | 14 ++++
 packages/api/src/client/lexicons.ts           | 62 +++++++++++++++++
 .../com/atproto/sync/listReposByCollection.ts | 56 +++++++++++++++
 packages/bsky/src/lexicon/index.ts            | 12 ++++
 packages/bsky/src/lexicon/lexicons.ts         | 62 +++++++++++++++++
 .../com/atproto/sync/listReposByCollection.ts | 68 +++++++++++++++++++
 packages/ozone/src/lexicon/index.ts           | 12 ++++
 packages/ozone/src/lexicon/lexicons.ts        | 62 +++++++++++++++++
 .../com/atproto/sync/listReposByCollection.ts | 68 +++++++++++++++++++
 packages/pds/src/lexicon/index.ts             | 12 ++++
 packages/pds/src/lexicon/lexicons.ts          | 62 +++++++++++++++++
 .../com/atproto/sync/listReposByCollection.ts | 68 +++++++++++++++++++
 14 files changed, 609 insertions(+)
 create mode 100644 .changeset/slimy-trainers-tease.md
 create mode 100644 lexicons/com/atproto/sync/listReposByCollection.json
 create mode 100644 packages/api/src/client/types/com/atproto/sync/listReposByCollection.ts
 create mode 100644 packages/bsky/src/lexicon/types/com/atproto/sync/listReposByCollection.ts
 create mode 100644 packages/ozone/src/lexicon/types/com/atproto/sync/listReposByCollection.ts
 create mode 100644 packages/pds/src/lexicon/types/com/atproto/sync/listReposByCollection.ts

diff --git a/.changeset/slimy-trainers-tease.md b/.changeset/slimy-trainers-tease.md
new file mode 100644
index 00000000000..d203bfe7eb6
--- /dev/null
+++ b/.changeset/slimy-trainers-tease.md
@@ -0,0 +1,5 @@
+---
+"@atproto/api": patch
+---
+
+add com.atproto.sync.listReposByCollection Lexicon
diff --git a/lexicons/com/atproto/sync/listReposByCollection.json b/lexicons/com/atproto/sync/listReposByCollection.json
new file mode 100644
index 00000000000..04027723401
--- /dev/null
+++ b/lexicons/com/atproto/sync/listReposByCollection.json
@@ -0,0 +1,46 @@
+{
+  "lexicon": 1,
+  "id": "com.atproto.sync.listReposByCollection",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Enumerates all the DIDs which have records with the given collection NSID.",
+      "parameters": {
+        "type": "params",
+        "required": ["collection"],
+        "properties": {
+          "collection": { "type": "string", "format": "nsid" },
+          "limit": {
+            "type": "integer",
+            "description": "Maximum size of response set. Recommend setting a large maximum (1000+) when enumerating large DID lists.",
+            "minimum": 1,
+            "maximum": 2000,
+            "default": 500
+          },
+          "cursor": { "type": "string" }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["repos"],
+          "properties": {
+            "cursor": { "type": "string" },
+            "repos": {
+              "type": "array",
+              "items": { "type": "ref", "ref": "#repo" }
+            }
+          }
+        }
+      }
+    },
+    "repo": {
+      "type": "object",
+      "required": ["did"],
+      "properties": {
+        "did": { "type": "string", "format": "did" }
+      }
+    }
+  }
+}
diff --git a/packages/api/src/client/index.ts b/packages/api/src/client/index.ts
index 0f0c06dfbb1..f1f4af198e5 100644
--- a/packages/api/src/client/index.ts
+++ b/packages/api/src/client/index.ts
@@ -80,6 +80,7 @@ import * as ComAtprotoSyncGetRepo from './types/com/atproto/sync/getRepo.js'
 import * as ComAtprotoSyncGetRepoStatus from './types/com/atproto/sync/getRepoStatus.js'
 import * as ComAtprotoSyncListBlobs from './types/com/atproto/sync/listBlobs.js'
 import * as ComAtprotoSyncListRepos from './types/com/atproto/sync/listRepos.js'
+import * as ComAtprotoSyncListReposByCollection from './types/com/atproto/sync/listReposByCollection.js'
 import * as ComAtprotoSyncNotifyOfUpdate from './types/com/atproto/sync/notifyOfUpdate.js'
 import * as ComAtprotoSyncRequestCrawl from './types/com/atproto/sync/requestCrawl.js'
 import * as ComAtprotoSyncSubscribeRepos from './types/com/atproto/sync/subscribeRepos.js'
@@ -310,6 +311,7 @@ export * as ComAtprotoSyncGetRepo from './types/com/atproto/sync/getRepo.js'
 export * as ComAtprotoSyncGetRepoStatus from './types/com/atproto/sync/getRepoStatus.js'
 export * as ComAtprotoSyncListBlobs from './types/com/atproto/sync/listBlobs.js'
 export * as ComAtprotoSyncListRepos from './types/com/atproto/sync/listRepos.js'
+export * as ComAtprotoSyncListReposByCollection from './types/com/atproto/sync/listReposByCollection.js'
 export * as ComAtprotoSyncNotifyOfUpdate from './types/com/atproto/sync/notifyOfUpdate.js'
 export * as ComAtprotoSyncRequestCrawl from './types/com/atproto/sync/requestCrawl.js'
 export * as ComAtprotoSyncSubscribeRepos from './types/com/atproto/sync/subscribeRepos.js'
@@ -1473,6 +1475,18 @@ export class ComAtprotoSyncNS {
     )
   }
 
+  listReposByCollection(
+    params?: ComAtprotoSyncListReposByCollection.QueryParams,
+    opts?: ComAtprotoSyncListReposByCollection.CallOptions,
+  ): Promise<ComAtprotoSyncListReposByCollection.Response> {
+    return this._client.call(
+      'com.atproto.sync.listReposByCollection',
+      params,
+      undefined,
+      opts,
+    )
+  }
+
   notifyOfUpdate(
     data?: ComAtprotoSyncNotifyOfUpdate.InputSchema,
     opts?: ComAtprotoSyncNotifyOfUpdate.CallOptions,
diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
index c02dac82cfd..c3c55ebce4e 100644
--- a/packages/api/src/client/lexicons.ts
+++ b/packages/api/src/client/lexicons.ts
@@ -3661,6 +3661,67 @@ export const schemaDict = {
       },
     },
   },
+  ComAtprotoSyncListReposByCollection: {
+    lexicon: 1,
+    id: 'com.atproto.sync.listReposByCollection',
+    defs: {
+      main: {
+        type: 'query',
+        description:
+          'Enumerates all the DIDs which have records with the given collection NSID.',
+        parameters: {
+          type: 'params',
+          required: ['collection'],
+          properties: {
+            collection: {
+              type: 'string',
+              format: 'nsid',
+            },
+            limit: {
+              type: 'integer',
+              description:
+                'Maximum size of response set. Recommend setting a large maximum (1000+) when enumerating large DID lists.',
+              minimum: 1,
+              maximum: 2000,
+              default: 500,
+            },
+            cursor: {
+              type: 'string',
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['repos'],
+            properties: {
+              cursor: {
+                type: 'string',
+              },
+              repos: {
+                type: 'array',
+                items: {
+                  type: 'ref',
+                  ref: 'lex:com.atproto.sync.listReposByCollection#repo',
+                },
+              },
+            },
+          },
+        },
+      },
+      repo: {
+        type: 'object',
+        required: ['did'],
+        properties: {
+          did: {
+            type: 'string',
+            format: 'did',
+          },
+        },
+      },
+    },
+  },
   ComAtprotoSyncNotifyOfUpdate: {
     lexicon: 1,
     id: 'com.atproto.sync.notifyOfUpdate',
@@ -14091,6 +14152,7 @@ export const ids = {
   ComAtprotoSyncGetRepoStatus: 'com.atproto.sync.getRepoStatus',
   ComAtprotoSyncListBlobs: 'com.atproto.sync.listBlobs',
   ComAtprotoSyncListRepos: 'com.atproto.sync.listRepos',
+  ComAtprotoSyncListReposByCollection: 'com.atproto.sync.listReposByCollection',
   ComAtprotoSyncNotifyOfUpdate: 'com.atproto.sync.notifyOfUpdate',
   ComAtprotoSyncRequestCrawl: 'com.atproto.sync.requestCrawl',
   ComAtprotoSyncSubscribeRepos: 'com.atproto.sync.subscribeRepos',
diff --git a/packages/api/src/client/types/com/atproto/sync/listReposByCollection.ts b/packages/api/src/client/types/com/atproto/sync/listReposByCollection.ts
new file mode 100644
index 00000000000..4b26739f2f9
--- /dev/null
+++ b/packages/api/src/client/types/com/atproto/sync/listReposByCollection.ts
@@ -0,0 +1,56 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { HeadersMap, XRPCError } from '@atproto/xrpc'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.listReposByCollection'
+
+export interface QueryParams {
+  collection: string
+  /** Maximum size of response set. Recommend setting a large maximum (1000+) when enumerating large DID lists. */
+  limit?: number
+  cursor?: string
+}
+
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  cursor?: string
+  repos: Repo[]
+}
+
+export interface CallOptions {
+  signal?: AbortSignal
+  headers?: HeadersMap
+}
+
+export interface Response {
+  success: boolean
+  headers: HeadersMap
+  data: OutputSchema
+}
+
+export function toKnownErr(e: any) {
+  return e
+}
+
+export interface Repo {
+  $type?: 'com.atproto.sync.listReposByCollection#repo'
+  did: string
+}
+
+const hashRepo = 'repo'
+
+export function isRepo<V>(v: V) {
+  return is$typed(v, id, hashRepo)
+}
+
+export function validateRepo<V>(v: V) {
+  return validate<Repo & V>(v, id, hashRepo)
+}
diff --git a/packages/bsky/src/lexicon/index.ts b/packages/bsky/src/lexicon/index.ts
index 056cc278d9b..4cdbd7ecc02 100644
--- a/packages/bsky/src/lexicon/index.ts
+++ b/packages/bsky/src/lexicon/index.ts
@@ -77,6 +77,7 @@ import * as ComAtprotoSyncGetRepo from './types/com/atproto/sync/getRepo.js'
 import * as ComAtprotoSyncGetRepoStatus from './types/com/atproto/sync/getRepoStatus.js'
 import * as ComAtprotoSyncListBlobs from './types/com/atproto/sync/listBlobs.js'
 import * as ComAtprotoSyncListRepos from './types/com/atproto/sync/listRepos.js'
+import * as ComAtprotoSyncListReposByCollection from './types/com/atproto/sync/listReposByCollection.js'
 import * as ComAtprotoSyncNotifyOfUpdate from './types/com/atproto/sync/notifyOfUpdate.js'
 import * as ComAtprotoSyncRequestCrawl from './types/com/atproto/sync/requestCrawl.js'
 import * as ComAtprotoSyncSubscribeRepos from './types/com/atproto/sync/subscribeRepos.js'
@@ -1065,6 +1066,17 @@ export class ComAtprotoSyncNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
+  listReposByCollection<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ComAtprotoSyncListReposByCollection.Handler<ExtractAuth<AV>>,
+      ComAtprotoSyncListReposByCollection.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'com.atproto.sync.listReposByCollection' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   notifyOfUpdate<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,
diff --git a/packages/bsky/src/lexicon/lexicons.ts b/packages/bsky/src/lexicon/lexicons.ts
index bc01706426e..9d5be5240a4 100644
--- a/packages/bsky/src/lexicon/lexicons.ts
+++ b/packages/bsky/src/lexicon/lexicons.ts
@@ -3661,6 +3661,67 @@ export const schemaDict = {
       },
     },
   },
+  ComAtprotoSyncListReposByCollection: {
+    lexicon: 1,
+    id: 'com.atproto.sync.listReposByCollection',
+    defs: {
+      main: {
+        type: 'query',
+        description:
+          'Enumerates all the DIDs which have records with the given collection NSID.',
+        parameters: {
+          type: 'params',
+          required: ['collection'],
+          properties: {
+            collection: {
+              type: 'string',
+              format: 'nsid',
+            },
+            limit: {
+              type: 'integer',
+              description:
+                'Maximum size of response set. Recommend setting a large maximum (1000+) when enumerating large DID lists.',
+              minimum: 1,
+              maximum: 2000,
+              default: 500,
+            },
+            cursor: {
+              type: 'string',
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['repos'],
+            properties: {
+              cursor: {
+                type: 'string',
+              },
+              repos: {
+                type: 'array',
+                items: {
+                  type: 'ref',
+                  ref: 'lex:com.atproto.sync.listReposByCollection#repo',
+                },
+              },
+            },
+          },
+        },
+      },
+      repo: {
+        type: 'object',
+        required: ['did'],
+        properties: {
+          did: {
+            type: 'string',
+            format: 'did',
+          },
+        },
+      },
+    },
+  },
   ComAtprotoSyncNotifyOfUpdate: {
     lexicon: 1,
     id: 'com.atproto.sync.notifyOfUpdate',
@@ -11055,6 +11116,7 @@ export const ids = {
   ComAtprotoSyncGetRepoStatus: 'com.atproto.sync.getRepoStatus',
   ComAtprotoSyncListBlobs: 'com.atproto.sync.listBlobs',
   ComAtprotoSyncListRepos: 'com.atproto.sync.listRepos',
+  ComAtprotoSyncListReposByCollection: 'com.atproto.sync.listReposByCollection',
   ComAtprotoSyncNotifyOfUpdate: 'com.atproto.sync.notifyOfUpdate',
   ComAtprotoSyncRequestCrawl: 'com.atproto.sync.requestCrawl',
   ComAtprotoSyncSubscribeRepos: 'com.atproto.sync.subscribeRepos',
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/listReposByCollection.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/listReposByCollection.ts
new file mode 100644
index 00000000000..4dc747e23f0
--- /dev/null
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/listReposByCollection.ts
@@ -0,0 +1,68 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.listReposByCollection'
+
+export interface QueryParams {
+  collection: string
+  /** Maximum size of response set. Recommend setting a large maximum (1000+) when enumerating large DID lists. */
+  limit: number
+  cursor?: string
+}
+
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  cursor?: string
+  repos: Repo[]
+}
+
+export type HandlerInput = undefined
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+  resetRouteRateLimits: () => Promise<void>
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput
+
+export interface Repo {
+  $type?: 'com.atproto.sync.listReposByCollection#repo'
+  did: string
+}
+
+const hashRepo = 'repo'
+
+export function isRepo<V>(v: V) {
+  return is$typed(v, id, hashRepo)
+}
+
+export function validateRepo<V>(v: V) {
+  return validate<Repo & V>(v, id, hashRepo)
+}
diff --git a/packages/ozone/src/lexicon/index.ts b/packages/ozone/src/lexicon/index.ts
index fc1e6956dc3..f04f5b3450d 100644
--- a/packages/ozone/src/lexicon/index.ts
+++ b/packages/ozone/src/lexicon/index.ts
@@ -77,6 +77,7 @@ import * as ComAtprotoSyncGetRepo from './types/com/atproto/sync/getRepo.js'
 import * as ComAtprotoSyncGetRepoStatus from './types/com/atproto/sync/getRepoStatus.js'
 import * as ComAtprotoSyncListBlobs from './types/com/atproto/sync/listBlobs.js'
 import * as ComAtprotoSyncListRepos from './types/com/atproto/sync/listRepos.js'
+import * as ComAtprotoSyncListReposByCollection from './types/com/atproto/sync/listReposByCollection.js'
 import * as ComAtprotoSyncNotifyOfUpdate from './types/com/atproto/sync/notifyOfUpdate.js'
 import * as ComAtprotoSyncRequestCrawl from './types/com/atproto/sync/requestCrawl.js'
 import * as ComAtprotoSyncSubscribeRepos from './types/com/atproto/sync/subscribeRepos.js'
@@ -1109,6 +1110,17 @@ export class ComAtprotoSyncNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
+  listReposByCollection<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ComAtprotoSyncListReposByCollection.Handler<ExtractAuth<AV>>,
+      ComAtprotoSyncListReposByCollection.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'com.atproto.sync.listReposByCollection' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   notifyOfUpdate<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,
diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
index c02dac82cfd..c3c55ebce4e 100644
--- a/packages/ozone/src/lexicon/lexicons.ts
+++ b/packages/ozone/src/lexicon/lexicons.ts
@@ -3661,6 +3661,67 @@ export const schemaDict = {
       },
     },
   },
+  ComAtprotoSyncListReposByCollection: {
+    lexicon: 1,
+    id: 'com.atproto.sync.listReposByCollection',
+    defs: {
+      main: {
+        type: 'query',
+        description:
+          'Enumerates all the DIDs which have records with the given collection NSID.',
+        parameters: {
+          type: 'params',
+          required: ['collection'],
+          properties: {
+            collection: {
+              type: 'string',
+              format: 'nsid',
+            },
+            limit: {
+              type: 'integer',
+              description:
+                'Maximum size of response set. Recommend setting a large maximum (1000+) when enumerating large DID lists.',
+              minimum: 1,
+              maximum: 2000,
+              default: 500,
+            },
+            cursor: {
+              type: 'string',
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['repos'],
+            properties: {
+              cursor: {
+                type: 'string',
+              },
+              repos: {
+                type: 'array',
+                items: {
+                  type: 'ref',
+                  ref: 'lex:com.atproto.sync.listReposByCollection#repo',
+                },
+              },
+            },
+          },
+        },
+      },
+      repo: {
+        type: 'object',
+        required: ['did'],
+        properties: {
+          did: {
+            type: 'string',
+            format: 'did',
+          },
+        },
+      },
+    },
+  },
   ComAtprotoSyncNotifyOfUpdate: {
     lexicon: 1,
     id: 'com.atproto.sync.notifyOfUpdate',
@@ -14091,6 +14152,7 @@ export const ids = {
   ComAtprotoSyncGetRepoStatus: 'com.atproto.sync.getRepoStatus',
   ComAtprotoSyncListBlobs: 'com.atproto.sync.listBlobs',
   ComAtprotoSyncListRepos: 'com.atproto.sync.listRepos',
+  ComAtprotoSyncListReposByCollection: 'com.atproto.sync.listReposByCollection',
   ComAtprotoSyncNotifyOfUpdate: 'com.atproto.sync.notifyOfUpdate',
   ComAtprotoSyncRequestCrawl: 'com.atproto.sync.requestCrawl',
   ComAtprotoSyncSubscribeRepos: 'com.atproto.sync.subscribeRepos',
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/listReposByCollection.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/listReposByCollection.ts
new file mode 100644
index 00000000000..4dc747e23f0
--- /dev/null
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/listReposByCollection.ts
@@ -0,0 +1,68 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.listReposByCollection'
+
+export interface QueryParams {
+  collection: string
+  /** Maximum size of response set. Recommend setting a large maximum (1000+) when enumerating large DID lists. */
+  limit: number
+  cursor?: string
+}
+
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  cursor?: string
+  repos: Repo[]
+}
+
+export type HandlerInput = undefined
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+  resetRouteRateLimits: () => Promise<void>
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput
+
+export interface Repo {
+  $type?: 'com.atproto.sync.listReposByCollection#repo'
+  did: string
+}
+
+const hashRepo = 'repo'
+
+export function isRepo<V>(v: V) {
+  return is$typed(v, id, hashRepo)
+}
+
+export function validateRepo<V>(v: V) {
+  return validate<Repo & V>(v, id, hashRepo)
+}
diff --git a/packages/pds/src/lexicon/index.ts b/packages/pds/src/lexicon/index.ts
index fc1e6956dc3..f04f5b3450d 100644
--- a/packages/pds/src/lexicon/index.ts
+++ b/packages/pds/src/lexicon/index.ts
@@ -77,6 +77,7 @@ import * as ComAtprotoSyncGetRepo from './types/com/atproto/sync/getRepo.js'
 import * as ComAtprotoSyncGetRepoStatus from './types/com/atproto/sync/getRepoStatus.js'
 import * as ComAtprotoSyncListBlobs from './types/com/atproto/sync/listBlobs.js'
 import * as ComAtprotoSyncListRepos from './types/com/atproto/sync/listRepos.js'
+import * as ComAtprotoSyncListReposByCollection from './types/com/atproto/sync/listReposByCollection.js'
 import * as ComAtprotoSyncNotifyOfUpdate from './types/com/atproto/sync/notifyOfUpdate.js'
 import * as ComAtprotoSyncRequestCrawl from './types/com/atproto/sync/requestCrawl.js'
 import * as ComAtprotoSyncSubscribeRepos from './types/com/atproto/sync/subscribeRepos.js'
@@ -1109,6 +1110,17 @@ export class ComAtprotoSyncNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
+  listReposByCollection<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ComAtprotoSyncListReposByCollection.Handler<ExtractAuth<AV>>,
+      ComAtprotoSyncListReposByCollection.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'com.atproto.sync.listReposByCollection' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   notifyOfUpdate<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,
diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
index c02dac82cfd..c3c55ebce4e 100644
--- a/packages/pds/src/lexicon/lexicons.ts
+++ b/packages/pds/src/lexicon/lexicons.ts
@@ -3661,6 +3661,67 @@ export const schemaDict = {
       },
     },
   },
+  ComAtprotoSyncListReposByCollection: {
+    lexicon: 1,
+    id: 'com.atproto.sync.listReposByCollection',
+    defs: {
+      main: {
+        type: 'query',
+        description:
+          'Enumerates all the DIDs which have records with the given collection NSID.',
+        parameters: {
+          type: 'params',
+          required: ['collection'],
+          properties: {
+            collection: {
+              type: 'string',
+              format: 'nsid',
+            },
+            limit: {
+              type: 'integer',
+              description:
+                'Maximum size of response set. Recommend setting a large maximum (1000+) when enumerating large DID lists.',
+              minimum: 1,
+              maximum: 2000,
+              default: 500,
+            },
+            cursor: {
+              type: 'string',
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['repos'],
+            properties: {
+              cursor: {
+                type: 'string',
+              },
+              repos: {
+                type: 'array',
+                items: {
+                  type: 'ref',
+                  ref: 'lex:com.atproto.sync.listReposByCollection#repo',
+                },
+              },
+            },
+          },
+        },
+      },
+      repo: {
+        type: 'object',
+        required: ['did'],
+        properties: {
+          did: {
+            type: 'string',
+            format: 'did',
+          },
+        },
+      },
+    },
+  },
   ComAtprotoSyncNotifyOfUpdate: {
     lexicon: 1,
     id: 'com.atproto.sync.notifyOfUpdate',
@@ -14091,6 +14152,7 @@ export const ids = {
   ComAtprotoSyncGetRepoStatus: 'com.atproto.sync.getRepoStatus',
   ComAtprotoSyncListBlobs: 'com.atproto.sync.listBlobs',
   ComAtprotoSyncListRepos: 'com.atproto.sync.listRepos',
+  ComAtprotoSyncListReposByCollection: 'com.atproto.sync.listReposByCollection',
   ComAtprotoSyncNotifyOfUpdate: 'com.atproto.sync.notifyOfUpdate',
   ComAtprotoSyncRequestCrawl: 'com.atproto.sync.requestCrawl',
   ComAtprotoSyncSubscribeRepos: 'com.atproto.sync.subscribeRepos',
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/listReposByCollection.ts b/packages/pds/src/lexicon/types/com/atproto/sync/listReposByCollection.ts
new file mode 100644
index 00000000000..4dc747e23f0
--- /dev/null
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/listReposByCollection.ts
@@ -0,0 +1,68 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.listReposByCollection'
+
+export interface QueryParams {
+  collection: string
+  /** Maximum size of response set. Recommend setting a large maximum (1000+) when enumerating large DID lists. */
+  limit: number
+  cursor?: string
+}
+
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  cursor?: string
+  repos: Repo[]
+}
+
+export type HandlerInput = undefined
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+  resetRouteRateLimits: () => Promise<void>
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput
+
+export interface Repo {
+  $type?: 'com.atproto.sync.listReposByCollection#repo'
+  did: string
+}
+
+const hashRepo = 'repo'
+
+export function isRepo<V>(v: V) {
+  return is$typed(v, id, hashRepo)
+}
+
+export function validateRepo<V>(v: V) {
+  return validate<Repo & V>(v, id, hashRepo)
+}

From afb3e1cd6c13bf85d4eeace4d9e49814dab2ceb8 Mon Sep 17 00:00:00 2001
From: bnewbold <bnewbold@robocracy.org>
Date: Mon, 17 Feb 2025 21:28:00 -0500
Subject: [PATCH 071/101] update CONTRIBUTORS.md (#3549)

---
 CONTRIBUTORS.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 3f0464adf01..50e2075e10e 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -20,4 +20,6 @@ ATProto receives so many contributions that we could never list everyone who des
 
 #### [DavidBuchanan314](https://github.com/DavidBuchanan314), Security disclosure, November 2024
 
+#### [daniel](https://hackerone.com/daniel), Security disclosure, November 2024
+
 #### [imax](https://github.com/imax9000), Security disclosure, January 2025

From a9887f68778c49932d92cfea98aadcfa4d5b62e9 Mon Sep 17 00:00:00 2001
From: Foysal Ahamed <foysal@blueskyweb.xyz>
Date: Tue, 18 Feb 2025 15:23:02 +0000
Subject: [PATCH 072/101] :memo: Add changeset for ozone reporter stats feature
 (#3546)

---
 .changeset/smooth-beers-sit.md | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .changeset/smooth-beers-sit.md

diff --git a/.changeset/smooth-beers-sit.md b/.changeset/smooth-beers-sit.md
new file mode 100644
index 00000000000..06ee2eb5e8d
--- /dev/null
+++ b/.changeset/smooth-beers-sit.md
@@ -0,0 +1,7 @@
+---
+"@atproto/api": patch
+"@atproto/ozone": patch
+"@atproto/pds": patch
+---
+
+Add reporter stats endpoint on ozone service

From 7b93618353829571807320284896135288458ec8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 19 Feb 2025 09:44:01 +0100
Subject: [PATCH 073/101] Version packages (#3548)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/slimy-trainers-tease.md |  5 -----
 .changeset/smooth-beers-sit.md     |  7 -------
 packages/api/CHANGELOG.md          |  8 ++++++++
 packages/api/package.json          |  2 +-
 packages/bsky/CHANGELOG.md         |  7 +++++++
 packages/bsky/package.json         |  2 +-
 packages/dev-env/CHANGELOG.md      | 10 ++++++++++
 packages/dev-env/package.json      |  2 +-
 packages/ozone/CHANGELOG.md        |  9 +++++++++
 packages/ozone/package.json        |  2 +-
 packages/pds/CHANGELOG.md          |  9 +++++++++
 packages/pds/package.json          |  2 +-
 12 files changed, 48 insertions(+), 17 deletions(-)
 delete mode 100644 .changeset/slimy-trainers-tease.md
 delete mode 100644 .changeset/smooth-beers-sit.md

diff --git a/.changeset/slimy-trainers-tease.md b/.changeset/slimy-trainers-tease.md
deleted file mode 100644
index d203bfe7eb6..00000000000
--- a/.changeset/slimy-trainers-tease.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/api": patch
----
-
-add com.atproto.sync.listReposByCollection Lexicon
diff --git a/.changeset/smooth-beers-sit.md b/.changeset/smooth-beers-sit.md
deleted file mode 100644
index 06ee2eb5e8d..00000000000
--- a/.changeset/smooth-beers-sit.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-"@atproto/api": patch
-"@atproto/ozone": patch
-"@atproto/pds": patch
----
-
-Add reporter stats endpoint on ozone service
diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md
index d6218dc62e3..2d0ae9e7ecc 100644
--- a/packages/api/CHANGELOG.md
+++ b/packages/api/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @atproto/api
 
+## 0.14.2
+
+### Patch Changes
+
+- [#3524](https://github.com/bluesky-social/atproto/pull/3524) [`010f10c6f`](https://github.com/bluesky-social/atproto/commit/010f10c6f212f699ad42c0349a58bbcf2172e3cc) Thanks [@bnewbold](https://github.com/bnewbold)! - add com.atproto.sync.listReposByCollection Lexicon
+
+- [#3546](https://github.com/bluesky-social/atproto/pull/3546) [`a9887f687`](https://github.com/bluesky-social/atproto/commit/a9887f68778c49932d92cfea98aadcfa4d5b62e9) Thanks [@foysalit](https://github.com/foysalit)! - Add reporter stats endpoint on ozone service
+
 ## 0.14.1
 
 ### Patch Changes
diff --git a/packages/api/package.json b/packages/api/package.json
index 333abfd3627..87cb2cfec06 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/api",
-  "version": "0.14.1",
+  "version": "0.14.2",
   "license": "MIT",
   "description": "Client library for atproto and Bluesky",
   "keywords": [
diff --git a/packages/bsky/CHANGELOG.md b/packages/bsky/CHANGELOG.md
index 12d5e7cba81..18c4700bd08 100644
--- a/packages/bsky/CHANGELOG.md
+++ b/packages/bsky/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/bsky
 
+## 0.0.119
+
+### Patch Changes
+
+- Updated dependencies [[`010f10c6f`](https://github.com/bluesky-social/atproto/commit/010f10c6f212f699ad42c0349a58bbcf2172e3cc), [`a9887f687`](https://github.com/bluesky-social/atproto/commit/a9887f68778c49932d92cfea98aadcfa4d5b62e9)]:
+  - @atproto/api@0.14.2
+
 ## 0.0.118
 
 ### Patch Changes
diff --git a/packages/bsky/package.json b/packages/bsky/package.json
index 46fcae1b753..90101261037 100644
--- a/packages/bsky/package.json
+++ b/packages/bsky/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.118",
+  "version": "0.0.119",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
diff --git a/packages/dev-env/CHANGELOG.md b/packages/dev-env/CHANGELOG.md
index 121bcab6c1a..50dd5be3581 100644
--- a/packages/dev-env/CHANGELOG.md
+++ b/packages/dev-env/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @atproto/dev-env
 
+## 0.3.90
+
+### Patch Changes
+
+- Updated dependencies [[`010f10c6f`](https://github.com/bluesky-social/atproto/commit/010f10c6f212f699ad42c0349a58bbcf2172e3cc), [`a9887f687`](https://github.com/bluesky-social/atproto/commit/a9887f68778c49932d92cfea98aadcfa4d5b62e9)]:
+  - @atproto/api@0.14.2
+  - @atproto/ozone@0.1.80
+  - @atproto/pds@0.4.98
+  - @atproto/bsky@0.0.119
+
 ## 0.3.89
 
 ### Patch Changes
diff --git a/packages/dev-env/package.json b/packages/dev-env/package.json
index c929d6376e2..105b03699cd 100644
--- a/packages/dev-env/package.json
+++ b/packages/dev-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/dev-env",
-  "version": "0.3.89",
+  "version": "0.3.90",
   "license": "MIT",
   "description": "Local development environment helper for atproto development",
   "keywords": [
diff --git a/packages/ozone/CHANGELOG.md b/packages/ozone/CHANGELOG.md
index a21e9e1a199..0d6390ec61b 100644
--- a/packages/ozone/CHANGELOG.md
+++ b/packages/ozone/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @atproto/ozone
 
+## 0.1.80
+
+### Patch Changes
+
+- [#3546](https://github.com/bluesky-social/atproto/pull/3546) [`a9887f687`](https://github.com/bluesky-social/atproto/commit/a9887f68778c49932d92cfea98aadcfa4d5b62e9) Thanks [@foysalit](https://github.com/foysalit)! - Add reporter stats endpoint on ozone service
+
+- Updated dependencies [[`010f10c6f`](https://github.com/bluesky-social/atproto/commit/010f10c6f212f699ad42c0349a58bbcf2172e3cc), [`a9887f687`](https://github.com/bluesky-social/atproto/commit/a9887f68778c49932d92cfea98aadcfa4d5b62e9)]:
+  - @atproto/api@0.14.2
+
 ## 0.1.79
 
 ### Patch Changes
diff --git a/packages/ozone/package.json b/packages/ozone/package.json
index e9731faf910..e48bcb3f391 100644
--- a/packages/ozone/package.json
+++ b/packages/ozone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.1.79",
+  "version": "0.1.80",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
diff --git a/packages/pds/CHANGELOG.md b/packages/pds/CHANGELOG.md
index 51d2b9c97eb..613ac3fca5c 100644
--- a/packages/pds/CHANGELOG.md
+++ b/packages/pds/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @atproto/pds
 
+## 0.4.98
+
+### Patch Changes
+
+- [#3546](https://github.com/bluesky-social/atproto/pull/3546) [`a9887f687`](https://github.com/bluesky-social/atproto/commit/a9887f68778c49932d92cfea98aadcfa4d5b62e9) Thanks [@foysalit](https://github.com/foysalit)! - Add reporter stats endpoint on ozone service
+
+- Updated dependencies [[`010f10c6f`](https://github.com/bluesky-social/atproto/commit/010f10c6f212f699ad42c0349a58bbcf2172e3cc), [`a9887f687`](https://github.com/bluesky-social/atproto/commit/a9887f68778c49932d92cfea98aadcfa4d5b62e9)]:
+  - @atproto/api@0.14.2
+
 ## 0.4.97
 
 ### Patch Changes
diff --git a/packages/pds/package.json b/packages/pds/package.json
index f37d305f0a9..7f4056410b5 100644
--- a/packages/pds/package.json
+++ b/packages/pds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/pds",
-  "version": "0.4.97",
+  "version": "0.4.98",
   "license": "MIT",
   "description": "Reference implementation of atproto Personal Data Server (PDS)",
   "keywords": [

From 7449f8607c1be948a0b55611c21075757c3d7261 Mon Sep 17 00:00:00 2001
From: Foysal Ahamed <foysal@blueskyweb.xyz>
Date: Wed, 19 Feb 2025 09:15:58 +0000
Subject: [PATCH 074/101] :sparkles: Allow filtering ozone team list by role
 and status (#3554)

* :sparkles: Allow filtering ozone team list by role and status

* fix style

* changeset

---------

Co-authored-by: Matthieu Sieben <matthieu.sieben@gmail.com>
---
 .changeset/lucky-comics-talk.md               |   5 +
 lexicons/tools/ozone/team/listMembers.json    |  17 +-
 packages/api/src/client/lexicons.ts           |   9 +
 .../types/tools/ozone/team/listMembers.ts     |   2 +
 packages/ozone/src/lexicon/lexicons.ts        |   9 +
 .../types/tools/ozone/team/listMembers.ts     |   2 +
 packages/ozone/src/team/index.ts              |  20 ++
 .../tests/__snapshots__/team.test.ts.snap     | 338 ------------------
 packages/ozone/tests/team.test.ts             |  82 +++--
 packages/pds/src/lexicon/lexicons.ts          |   9 +
 .../types/tools/ozone/team/listMembers.ts     |   2 +
 11 files changed, 129 insertions(+), 366 deletions(-)
 create mode 100644 .changeset/lucky-comics-talk.md

diff --git a/.changeset/lucky-comics-talk.md b/.changeset/lucky-comics-talk.md
new file mode 100644
index 00000000000..213d8209787
--- /dev/null
+++ b/.changeset/lucky-comics-talk.md
@@ -0,0 +1,5 @@
+---
+"@atproto/ozone": patch
+---
+
+Allow filtering Ozone members based on role and status
diff --git a/lexicons/tools/ozone/team/listMembers.json b/lexicons/tools/ozone/team/listMembers.json
index 25b3f2a42dc..bb022afe497 100644
--- a/lexicons/tools/ozone/team/listMembers.json
+++ b/lexicons/tools/ozone/team/listMembers.json
@@ -8,13 +8,24 @@
       "parameters": {
         "type": "params",
         "properties": {
+          "disabled": {
+            "type": "boolean"
+          },
+          "roles": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
           "limit": {
             "type": "integer",
             "minimum": 1,
             "maximum": 100,
             "default": 50
           },
-          "cursor": { "type": "string" }
+          "cursor": {
+            "type": "string"
+          }
         }
       },
       "output": {
@@ -23,7 +34,9 @@
           "type": "object",
           "required": ["members"],
           "properties": {
-            "cursor": { "type": "string" },
+            "cursor": {
+              "type": "string"
+            },
             "members": {
               "type": "array",
               "items": {
diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
index c3c55ebce4e..6f9981c88b7 100644
--- a/packages/api/src/client/lexicons.ts
+++ b/packages/api/src/client/lexicons.ts
@@ -13953,6 +13953,15 @@ export const schemaDict = {
         parameters: {
           type: 'params',
           properties: {
+            disabled: {
+              type: 'boolean',
+            },
+            roles: {
+              type: 'array',
+              items: {
+                type: 'string',
+              },
+            },
             limit: {
               type: 'integer',
               minimum: 1,
diff --git a/packages/api/src/client/types/tools/ozone/team/listMembers.ts b/packages/api/src/client/types/tools/ozone/team/listMembers.ts
index 0bbdffcc38d..5a3c6862ce6 100644
--- a/packages/api/src/client/types/tools/ozone/team/listMembers.ts
+++ b/packages/api/src/client/types/tools/ozone/team/listMembers.ts
@@ -13,6 +13,8 @@ const is$typed = _is$typed,
 const id = 'tools.ozone.team.listMembers'
 
 export interface QueryParams {
+  disabled?: boolean
+  roles?: string[]
   limit?: number
   cursor?: string
 }
diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
index c3c55ebce4e..6f9981c88b7 100644
--- a/packages/ozone/src/lexicon/lexicons.ts
+++ b/packages/ozone/src/lexicon/lexicons.ts
@@ -13953,6 +13953,15 @@ export const schemaDict = {
         parameters: {
           type: 'params',
           properties: {
+            disabled: {
+              type: 'boolean',
+            },
+            roles: {
+              type: 'array',
+              items: {
+                type: 'string',
+              },
+            },
             limit: {
               type: 'integer',
               minimum: 1,
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/team/listMembers.ts b/packages/ozone/src/lexicon/types/tools/ozone/team/listMembers.ts
index 8488cb9b54c..9f1dfd273b9 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/team/listMembers.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/team/listMembers.ts
@@ -14,6 +14,8 @@ const is$typed = _is$typed,
 const id = 'tools.ozone.team.listMembers'
 
 export interface QueryParams {
+  disabled?: boolean
+  roles?: string[]
   limit: number
   cursor?: string
 }
diff --git a/packages/ozone/src/team/index.ts b/packages/ozone/src/team/index.ts
index 1a220b489b7..db2a8088288 100644
--- a/packages/ozone/src/team/index.ts
+++ b/packages/ozone/src/team/index.ts
@@ -21,14 +21,34 @@ export class TeamService {
   async list({
     cursor,
     limit = 25,
+    roles,
+    disabled,
   }: {
     cursor?: string
     limit?: number
+    disabled?: boolean
+    roles?: string[]
   }): Promise<{ members: Selectable<Member>[]; cursor?: string }> {
     let builder = this.db.db.selectFrom('member').selectAll()
     if (cursor) {
       builder = builder.where('createdAt', '>', new Date(cursor))
     }
+    if (roles !== undefined) {
+      const knownRoles = roles.filter(
+        (r) =>
+          r === 'tools.ozone.team.defs#roleAdmin' ||
+          r === 'tools.ozone.team.defs#roleModerator' ||
+          r === 'tools.ozone.team.defs#roleTriage',
+      )
+
+      // Optimization: no need to query to know that no values will be returned
+      if (!knownRoles.length) return { members: [] }
+
+      builder = builder.where('role', 'in', knownRoles)
+    }
+    if (disabled !== undefined) {
+      builder = builder.where('disabled', disabled ? 'is' : 'is not', true)
+    }
     const members = await builder
       .limit(limit)
       .orderBy('createdAt', 'asc')
diff --git a/packages/ozone/tests/__snapshots__/team.test.ts.snap b/packages/ozone/tests/__snapshots__/team.test.ts.snap
index baf26bc32dc..a44fd591dc5 100644
--- a/packages/ozone/tests/__snapshots__/team.test.ts.snap
+++ b/packages/ozone/tests/__snapshots__/team.test.ts.snap
@@ -348,341 +348,3 @@ Array [
   },
 ]
 `;
-
-exports[`team management listMembers allows all members to list all members 3`] = `
-Array [
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(0)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "role": "tools.ozone.team.defs#roleAdmin",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(2)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "role": "tools.ozone.team.defs#roleTriage",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(3)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "role": "tools.ozone.team.defs#roleModerator",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(4)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "role": "tools.ozone.team.defs#roleModerator",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(1)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "profile": Object {
-      "associated": Object {
-        "feedgens": 0,
-        "labeler": true,
-        "lists": 0,
-        "starterPacks": 0,
-      },
-      "description": "The pretend version of mod.bsky.app",
-      "did": "user(1)",
-      "displayName": "Dev-env Moderation",
-      "followersCount": 0,
-      "followsCount": 0,
-      "handle": "mod-authority.test",
-      "indexedAt": "1970-01-01T00:00:00.000Z",
-      "labels": Array [],
-      "postsCount": 0,
-      "viewer": Object {
-        "blockedBy": false,
-        "muted": false,
-      },
-    },
-    "role": "tools.ozone.team.defs#roleAdmin",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(5)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "profile": Object {
-      "associated": Object {
-        "feedgens": 0,
-        "labeler": false,
-        "lists": 0,
-        "starterPacks": 0,
-      },
-      "avatar": "https://bsky.public.url/img/avatar/plain/user(6)/cids(0)@jpeg",
-      "createdAt": "1970-01-01T00:00:00.000Z",
-      "description": "its me!",
-      "did": "user(5)",
-      "displayName": "ali",
-      "followersCount": 2,
-      "followsCount": 3,
-      "handle": "alice.test",
-      "indexedAt": "1970-01-01T00:00:00.000Z",
-      "labels": Array [
-        Object {
-          "cid": "cids(1)",
-          "cts": "1970-01-01T00:00:00.000Z",
-          "src": "user(5)",
-          "uri": "record(0)",
-          "val": "self-label-a",
-        },
-        Object {
-          "cid": "cids(1)",
-          "cts": "1970-01-01T00:00:00.000Z",
-          "src": "user(5)",
-          "uri": "record(0)",
-          "val": "self-label-b",
-        },
-      ],
-      "postsCount": 4,
-      "viewer": Object {
-        "blockedBy": false,
-        "muted": false,
-      },
-    },
-    "role": "tools.ozone.team.defs#roleAdmin",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(7)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "profile": Object {
-      "associated": Object {
-        "feedgens": 0,
-        "labeler": false,
-        "lists": 0,
-        "starterPacks": 0,
-      },
-      "avatar": "https://bsky.public.url/img/avatar/plain/user(8)/cids(0)@jpeg",
-      "createdAt": "1970-01-01T00:00:00.000Z",
-      "description": "hi im bob label_me",
-      "did": "user(7)",
-      "displayName": "bobby",
-      "followersCount": 2,
-      "followsCount": 2,
-      "handle": "bob.test",
-      "indexedAt": "1970-01-01T00:00:00.000Z",
-      "labels": Array [],
-      "postsCount": 3,
-      "viewer": Object {
-        "blockedBy": false,
-        "muted": false,
-      },
-    },
-    "role": "tools.ozone.team.defs#roleModerator",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(9)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "profile": Object {
-      "associated": Object {
-        "feedgens": 0,
-        "labeler": false,
-        "lists": 0,
-        "starterPacks": 0,
-      },
-      "did": "user(9)",
-      "followersCount": 2,
-      "followsCount": 1,
-      "handle": "carol.test",
-      "labels": Array [],
-      "postsCount": 2,
-      "viewer": Object {
-        "blockedBy": false,
-        "muted": false,
-      },
-    },
-    "role": "tools.ozone.team.defs#roleTriage",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-]
-`;
-
-exports[`team management listMembers allows all members to list all members 4`] = `
-Array [
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(0)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "role": "tools.ozone.team.defs#roleAdmin",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(2)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "role": "tools.ozone.team.defs#roleTriage",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(3)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "role": "tools.ozone.team.defs#roleModerator",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(4)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "role": "tools.ozone.team.defs#roleModerator",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(1)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "profile": Object {
-      "associated": Object {
-        "feedgens": 0,
-        "labeler": true,
-        "lists": 0,
-        "starterPacks": 0,
-      },
-      "description": "The pretend version of mod.bsky.app",
-      "did": "user(1)",
-      "displayName": "Dev-env Moderation",
-      "followersCount": 0,
-      "followsCount": 0,
-      "handle": "mod-authority.test",
-      "indexedAt": "1970-01-01T00:00:00.000Z",
-      "labels": Array [],
-      "postsCount": 0,
-      "viewer": Object {
-        "blockedBy": false,
-        "muted": false,
-      },
-    },
-    "role": "tools.ozone.team.defs#roleAdmin",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(5)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "profile": Object {
-      "associated": Object {
-        "feedgens": 0,
-        "labeler": false,
-        "lists": 0,
-        "starterPacks": 0,
-      },
-      "avatar": "https://bsky.public.url/img/avatar/plain/user(6)/cids(0)@jpeg",
-      "createdAt": "1970-01-01T00:00:00.000Z",
-      "description": "its me!",
-      "did": "user(5)",
-      "displayName": "ali",
-      "followersCount": 2,
-      "followsCount": 3,
-      "handle": "alice.test",
-      "indexedAt": "1970-01-01T00:00:00.000Z",
-      "labels": Array [
-        Object {
-          "cid": "cids(1)",
-          "cts": "1970-01-01T00:00:00.000Z",
-          "src": "user(5)",
-          "uri": "record(0)",
-          "val": "self-label-a",
-        },
-        Object {
-          "cid": "cids(1)",
-          "cts": "1970-01-01T00:00:00.000Z",
-          "src": "user(5)",
-          "uri": "record(0)",
-          "val": "self-label-b",
-        },
-      ],
-      "postsCount": 4,
-      "viewer": Object {
-        "blockedBy": false,
-        "muted": false,
-      },
-    },
-    "role": "tools.ozone.team.defs#roleAdmin",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(7)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "profile": Object {
-      "associated": Object {
-        "feedgens": 0,
-        "labeler": false,
-        "lists": 0,
-        "starterPacks": 0,
-      },
-      "avatar": "https://bsky.public.url/img/avatar/plain/user(8)/cids(0)@jpeg",
-      "createdAt": "1970-01-01T00:00:00.000Z",
-      "description": "hi im bob label_me",
-      "did": "user(7)",
-      "displayName": "bobby",
-      "followersCount": 2,
-      "followsCount": 2,
-      "handle": "bob.test",
-      "indexedAt": "1970-01-01T00:00:00.000Z",
-      "labels": Array [],
-      "postsCount": 3,
-      "viewer": Object {
-        "blockedBy": false,
-        "muted": false,
-      },
-    },
-    "role": "tools.ozone.team.defs#roleModerator",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-  Object {
-    "createdAt": "1970-01-01T00:00:00.000Z",
-    "did": "user(9)",
-    "disabled": false,
-    "lastUpdatedBy": "user(1)",
-    "profile": Object {
-      "associated": Object {
-        "feedgens": 0,
-        "labeler": false,
-        "lists": 0,
-        "starterPacks": 0,
-      },
-      "did": "user(9)",
-      "followersCount": 2,
-      "followsCount": 1,
-      "handle": "carol.test",
-      "labels": Array [],
-      "postsCount": 2,
-      "viewer": Object {
-        "blockedBy": false,
-        "muted": false,
-      },
-    },
-    "role": "tools.ozone.team.defs#roleTriage",
-    "updatedAt": "1970-01-01T00:00:00.000Z",
-  },
-]
-`;
diff --git a/packages/ozone/tests/team.test.ts b/packages/ozone/tests/team.test.ts
index d7532d6952a..2746a6a18d4 100644
--- a/packages/ozone/tests/team.test.ts
+++ b/packages/ozone/tests/team.test.ts
@@ -1,4 +1,4 @@
-import { AtpAgent } from '@atproto/api'
+import { AtpAgent, ToolsOzoneTeamDefs } from '@atproto/api'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { forSnapshot } from './_util'
 
@@ -38,8 +38,8 @@ describe('team management', () => {
   describe('listMembers', () => {
     it('allows all members to list all members', async () => {
       const [{ data: forAdmin }, { data: forTriage }] = await Promise.all([
-        adminAgent.api.tools.ozone.team.listMembers({}),
-        triageAgent.api.tools.ozone.team.listMembers({}),
+        adminAgent.tools.ozone.team.listMembers({}),
+        triageAgent.tools.ozone.team.listMembers({}),
       ])
       expect(forSnapshot(forAdmin.members)).toMatchSnapshot()
       expect(forSnapshot(forTriage.members)).toMatchSnapshot()
@@ -47,20 +47,50 @@ describe('team management', () => {
 
       expect(forAdmin.members.length).toEqual(forTriage.members.length)
     })
-  })
-  describe('listMembers', () => {
-    it('allows all members to list all members', async () => {
-      const [{ data: forAdmin }, { data: forTriage }] = await Promise.all([
-        adminAgent.api.tools.ozone.team.listMembers({}),
-        triageAgent.api.tools.ozone.team.listMembers({}),
+    it('allows filtering members by role', async () => {
+      const [{ data: onlyAdmins }, { data: onlyTriage }] = await Promise.all([
+        adminAgent.tools.ozone.team.listMembers({
+          roles: [ToolsOzoneTeamDefs.ROLEADMIN],
+        }),
+        adminAgent.tools.ozone.team.listMembers({
+          roles: [ToolsOzoneTeamDefs.ROLETRIAGE],
+        }),
       ])
-      expect(forSnapshot(forAdmin.members)).toMatchSnapshot()
-      expect(forSnapshot(forTriage.members)).toMatchSnapshot()
-      // Validate that the list looks the same to both admin and triage members
 
-      expect(forAdmin.members.length).toEqual(forTriage.members.length)
+      expect(
+        onlyAdmins.members.find(
+          ({ role }) => role !== ToolsOzoneTeamDefs.ROLEADMIN,
+        ),
+      ).toBeUndefined()
+
+      expect(
+        onlyTriage.members.find(
+          ({ role }) => role !== ToolsOzoneTeamDefs.ROLETRIAGE,
+        ),
+      ).toBeUndefined()
+    })
+    it('allows filtering members by disabled status', async () => {
+      const [{ data: onlyDisabled }, { data: onlyEnabled }] = await Promise.all(
+        [
+          adminAgent.tools.ozone.team.listMembers({
+            disabled: true,
+          }),
+          adminAgent.tools.ozone.team.listMembers({
+            disabled: false,
+          }),
+        ],
+      )
+
+      expect(
+        onlyDisabled.members.find(({ disabled }) => !disabled),
+      ).toBeUndefined()
+
+      expect(
+        onlyEnabled.members.find(({ disabled }) => disabled),
+      ).toBeUndefined()
     })
   })
+
   describe('addMember', () => {
     const newMemberData = {
       did: 'did:plc:newMember',
@@ -69,15 +99,15 @@ describe('team management', () => {
     }
     it('only allows admins to add member', async () => {
       await expect(
-        triageAgent.api.tools.ozone.team.addMember(newMemberData),
+        triageAgent.tools.ozone.team.addMember(newMemberData),
       ).rejects.toThrow('Must be an admin to add a member')
       const { data: newMember } =
-        await adminAgent.api.tools.ozone.team.addMember(newMemberData)
+        await adminAgent.tools.ozone.team.addMember(newMemberData)
       expect(forSnapshot(newMember)).toMatchSnapshot()
     })
     it('throws error when trying to add existing member', async () => {
       await expect(
-        adminAgent.api.tools.ozone.team.addMember(newMemberData),
+        adminAgent.tools.ozone.team.addMember(newMemberData),
       ).rejects.toThrow('member already exists')
     })
   })
@@ -85,19 +115,19 @@ describe('team management', () => {
     it('only allows admins to delete members', async () => {
       const {
         data: { members: initialMembers },
-      } = await adminAgent.api.tools.ozone.team.listMembers({})
+      } = await adminAgent.tools.ozone.team.listMembers({})
       await expect(
-        triageAgent.api.tools.ozone.team.deleteMember({
+        triageAgent.tools.ozone.team.deleteMember({
           did: sc.dids.bob,
         }),
       ).rejects.toThrow('Must be an admin to delete a member')
 
-      await adminAgent.api.tools.ozone.team.deleteMember({
+      await adminAgent.tools.ozone.team.deleteMember({
         did: sc.dids.bob,
       })
       const {
         data: { members: membersAfterDelete },
-      } = await adminAgent.api.tools.ozone.team.listMembers({})
+      } = await adminAgent.tools.ozone.team.listMembers({})
 
       expect(membersAfterDelete.length).toEqual(initialMembers.length - 1)
       expect(membersAfterDelete.map(({ did }) => did)).not.toContain(
@@ -107,7 +137,7 @@ describe('team management', () => {
 
     it('throws error when trying to remove non-existent member', async () => {
       await expect(
-        adminAgent.api.tools.ozone.team.deleteMember({
+        adminAgent.tools.ozone.team.deleteMember({
           did: 'did:plc:test',
         }),
       ).rejects.toThrow('member not found')
@@ -118,19 +148,19 @@ describe('team management', () => {
       const getCarol = async () => {
         const {
           data: { members },
-        } = await adminAgent.api.tools.ozone.team.listMembers({})
+        } = await adminAgent.tools.ozone.team.listMembers({})
 
         return members.find(({ did }) => did === sc.dids.carol)
       }
       await expect(
-        triageAgent.api.tools.ozone.team.updateMember({
+        triageAgent.tools.ozone.team.updateMember({
           disabled: false,
           did: sc.dids.carol,
           role: 'tools.ozone.team.defs#roleAdmin',
         }),
       ).rejects.toThrow('Must be an admin to update a member')
 
-      await adminAgent.api.tools.ozone.team.updateMember({
+      await adminAgent.tools.ozone.team.updateMember({
         did: sc.dids.carol,
         role: 'tools.ozone.team.defs#roleAdmin',
       })
@@ -141,7 +171,7 @@ describe('team management', () => {
       // Verify that params that we didn't send did not get updated
       expect(carolAfterRoleChange?.disabled).toEqual(false)
 
-      await adminAgent.api.tools.ozone.team.updateMember({
+      await adminAgent.tools.ozone.team.updateMember({
         did: sc.dids.carol,
         disabled: true,
       })
@@ -152,7 +182,7 @@ describe('team management', () => {
     })
     it('throws error when trying to update non-existent member', async () => {
       await expect(
-        adminAgent.api.tools.ozone.team.updateMember({
+        adminAgent.tools.ozone.team.updateMember({
           disabled: false,
           did: 'did:plc:test',
           role: 'tools.ozone.team.defs#roleAdmin',
diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
index c3c55ebce4e..6f9981c88b7 100644
--- a/packages/pds/src/lexicon/lexicons.ts
+++ b/packages/pds/src/lexicon/lexicons.ts
@@ -13953,6 +13953,15 @@ export const schemaDict = {
         parameters: {
           type: 'params',
           properties: {
+            disabled: {
+              type: 'boolean',
+            },
+            roles: {
+              type: 'array',
+              items: {
+                type: 'string',
+              },
+            },
             limit: {
               type: 'integer',
               minimum: 1,
diff --git a/packages/pds/src/lexicon/types/tools/ozone/team/listMembers.ts b/packages/pds/src/lexicon/types/tools/ozone/team/listMembers.ts
index 8488cb9b54c..9f1dfd273b9 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/team/listMembers.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/team/listMembers.ts
@@ -14,6 +14,8 @@ const is$typed = _is$typed,
 const id = 'tools.ozone.team.listMembers'
 
 export interface QueryParams {
+  disabled?: boolean
+  roles?: string[]
   limit: number
   cursor?: string
 }

From 6faf3eb25412067c1cd407c75efe45e51eda51f4 Mon Sep 17 00:00:00 2001
From: Matthieu Sieben <matthieusieben@users.noreply.github.com>
Date: Wed, 19 Feb 2025 10:16:21 +0100
Subject: [PATCH 075/101] Add vscode settings and recommended extensions
 (#3507)

---
 .vscode/extensions.json |  8 +++++++
 .vscode/settings.json   | 48 +++++++++++++++++++++++++++++++++++++++--
 2 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 .vscode/extensions.json

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 00000000000..a80cb87b47d
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,8 @@
+{
+  "recommendations": [
+    "dbaeumer.vscode-eslint",
+    "wengerk.highlight-bad-chars",
+    "esbenp.prettier-vscode",
+    "streetsidesoftware.code-spell-checker"
+  ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
index b5230afc1a4..4f8e93dede2 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,6 +1,50 @@
 {
-  "typescript.tsdk": "node_modules/typescript/lib",
+  "cSpell.language": "en,en-US",
+  "cSpell.userWords": [
+    "algs",
+    "appview",
+    "atproto",
+    "blockstore",
+    "bluesky",
+    "bsky",
+    "bsync",
+    "clsx",
+    "consolas",
+    "dpop",
+    "googleusercontent",
+    "hexeditor",
+    "ingester",
+    "insertable",
+    "jwks",
+    "keypair",
+    "kysely",
+    "merkle",
+    "msid",
+    "multibase",
+    "multiformats",
+    "nameserver",
+    "oidc",
+    "pkce",
+    "ponyfill",
+    "proxied",
+    "ssrf",
+    "undici",
+    "webcrypto",
+    "whatwg",
+    "xrpc"
+  ],
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": "explicit",
+    "source.sortImports": "never"
+  },
   "files.associations": {
     "**/tsconfig/*.json": "jsonc"
-  }
+  },
+  "files.defaultLanguage": "ts",
+  "files.insertFinalNewline": true,
+  "files.trimTrailingWhitespace": true,
+  "prettier.semi": false,
+  "prettier.singleQuote": true,
+  "prettier.trailingComma": "es5",
+  "typescript.tsdk": "node_modules/typescript/lib"
 }

From 88ce852a8d5a893ee1e6900cf23c5fc82d43a259 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 19 Feb 2025 10:20:10 +0100
Subject: [PATCH 076/101] Version packages (#3556)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/lucky-comics-talk.md | 5 -----
 packages/dev-env/CHANGELOG.md   | 7 +++++++
 packages/dev-env/package.json   | 2 +-
 packages/ozone/CHANGELOG.md     | 6 ++++++
 packages/ozone/package.json     | 2 +-
 5 files changed, 15 insertions(+), 7 deletions(-)
 delete mode 100644 .changeset/lucky-comics-talk.md

diff --git a/.changeset/lucky-comics-talk.md b/.changeset/lucky-comics-talk.md
deleted file mode 100644
index 213d8209787..00000000000
--- a/.changeset/lucky-comics-talk.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/ozone": patch
----
-
-Allow filtering Ozone members based on role and status
diff --git a/packages/dev-env/CHANGELOG.md b/packages/dev-env/CHANGELOG.md
index 50dd5be3581..fee59ac7f30 100644
--- a/packages/dev-env/CHANGELOG.md
+++ b/packages/dev-env/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/dev-env
 
+## 0.3.91
+
+### Patch Changes
+
+- Updated dependencies [[`7449f8607`](https://github.com/bluesky-social/atproto/commit/7449f8607c1be948a0b55611c21075757c3d7261)]:
+  - @atproto/ozone@0.1.81
+
 ## 0.3.90
 
 ### Patch Changes
diff --git a/packages/dev-env/package.json b/packages/dev-env/package.json
index 105b03699cd..1c8cc9494bd 100644
--- a/packages/dev-env/package.json
+++ b/packages/dev-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/dev-env",
-  "version": "0.3.90",
+  "version": "0.3.91",
   "license": "MIT",
   "description": "Local development environment helper for atproto development",
   "keywords": [
diff --git a/packages/ozone/CHANGELOG.md b/packages/ozone/CHANGELOG.md
index 0d6390ec61b..a6faf931bbb 100644
--- a/packages/ozone/CHANGELOG.md
+++ b/packages/ozone/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @atproto/ozone
 
+## 0.1.81
+
+### Patch Changes
+
+- [#3554](https://github.com/bluesky-social/atproto/pull/3554) [`7449f8607`](https://github.com/bluesky-social/atproto/commit/7449f8607c1be948a0b55611c21075757c3d7261) Thanks [@foysalit](https://github.com/foysalit)! - Allow filtering Ozone members based on role and status
+
 ## 0.1.80
 
 ### Patch Changes
diff --git a/packages/ozone/package.json b/packages/ozone/package.json
index e48bcb3f391..33b8ac42861 100644
--- a/packages/ozone/package.json
+++ b/packages/ozone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.1.80",
+  "version": "0.1.81",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [

From 8b2f0a62c6093692b4e1ed28c185dc4769904b2c Mon Sep 17 00:00:00 2001
From: bnewbold <bnewbold@robocracy.org>
Date: Wed, 19 Feb 2025 16:10:51 -0800
Subject: [PATCH 077/101] update year to 2025 (#3559)

---
 LICENSE.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index a96dd61e293..396d950eb60 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,6 @@
 Dual MIT/Apache-2.0 License
 
-Copyright (c) 2022-2024 Bluesky PBC, and Contributors
+Copyright (c) 2022-2025 Bluesky PBC, and Contributors
 
 Except as otherwise noted in individual files, this software is licensed under the MIT license (<http://opensource.org/licenses/MIT>), or the Apache License, Version 2.0 (<http://www.apache.org/licenses/LICENSE-2.0>).
 

From 2c0435f4ed76fd6cc7544d34ec27f8255a583eb6 Mon Sep 17 00:00:00 2001
From: Daniel Holmgren <dtholmgren@gmail.com>
Date: Thu, 20 Feb 2025 12:24:19 -0600
Subject: [PATCH 078/101] Emit `identity` event on `activateAccount` (#3560)

* push to run CI

* maybe fix

* attempted fix

* tidy
---
 packages/pds/src/api/com/atproto/server/activateAccount.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pds/src/api/com/atproto/server/activateAccount.ts b/packages/pds/src/api/com/atproto/server/activateAccount.ts
index cf5eba7b0b8..7d57b97d01d 100644
--- a/packages/pds/src/api/com/atproto/server/activateAccount.ts
+++ b/packages/pds/src/api/com/atproto/server/activateAccount.ts
@@ -49,7 +49,7 @@ export default function (server: Server, ctx: AppContext) {
       // @NOTE: we're over-emitting for now for backwards compatibility, can reduce this in the future
       const status = await ctx.accountManager.getAccountStatus(requester)
       await ctx.sequencer.sequenceAccountEvt(requester, status)
-      await ctx.sequencer.sequenceHandleUpdate(
+      await ctx.sequencer.sequenceIdentityEvt(
         requester,
         account.handle ?? INVALID_HANDLE,
       )

From 01874c4be73a41ffb8fe28378f674949aa2c938f Mon Sep 17 00:00:00 2001
From: bnewbold <bnewbold@robocracy.org>
Date: Thu, 20 Feb 2025 11:50:24 -0800
Subject: [PATCH 079/101] lexicons: use 'tid' and 'record-key' formats in
 sync+repo lexicons (#2378)

* lex: use 'tid' and 'record-key' formats in lexicons

* more TID formats; and remove redundant maxLength

* add maxLength back, with a comment/description

* revert accidential change to applyWrites

* codegen

* changeset

* update test for invalid record-key
---
 .changeset/perfect-jars-act.md                 |  5 +++++
 lexicons/com/atproto/repo/applyWrites.json     | 11 ++++++++---
 lexicons/com/atproto/repo/createRecord.json    |  1 +
 lexicons/com/atproto/repo/defs.json            |  2 +-
 lexicons/com/atproto/repo/deleteRecord.json    |  1 +
 lexicons/com/atproto/repo/getRecord.json       |  6 +++++-
 lexicons/com/atproto/repo/putRecord.json       |  1 +
 lexicons/com/atproto/sync/getLatestCommit.json |  2 +-
 lexicons/com/atproto/sync/getRecord.json       |  6 +++++-
 lexicons/com/atproto/sync/getRepo.json         |  1 +
 lexicons/com/atproto/sync/getRepoStatus.json   |  1 +
 lexicons/com/atproto/sync/listBlobs.json       |  1 +
 lexicons/com/atproto/sync/listRepos.json       |  2 +-
 lexicons/com/atproto/sync/subscribeRepos.json  |  2 ++
 packages/api/src/client/lexicons.ts            | 18 ++++++++++++++++++
 .../types/com/atproto/repo/applyWrites.ts      |  1 +
 packages/bsky/src/lexicon/lexicons.ts          | 18 ++++++++++++++++++
 .../types/com/atproto/repo/applyWrites.ts      |  1 +
 packages/ozone/src/lexicon/lexicons.ts         | 18 ++++++++++++++++++
 .../types/com/atproto/repo/applyWrites.ts      |  1 +
 packages/pds/src/lexicon/lexicons.ts           | 18 ++++++++++++++++++
 .../types/com/atproto/repo/applyWrites.ts      |  1 +
 packages/pds/tests/crud.test.ts                |  2 +-
 23 files changed, 111 insertions(+), 9 deletions(-)
 create mode 100644 .changeset/perfect-jars-act.md

diff --git a/.changeset/perfect-jars-act.md b/.changeset/perfect-jars-act.md
new file mode 100644
index 00000000000..82c3e916afe
--- /dev/null
+++ b/.changeset/perfect-jars-act.md
@@ -0,0 +1,5 @@
+---
+"@atproto/api": patch
+---
+
+set 'tid' and 'record-key' formats on com.atproto.sync and com.atproto.repo lexicons
diff --git a/lexicons/com/atproto/repo/applyWrites.json b/lexicons/com/atproto/repo/applyWrites.json
index 47511709ec6..11a1f1fd645 100644
--- a/lexicons/com/atproto/repo/applyWrites.json
+++ b/lexicons/com/atproto/repo/applyWrites.json
@@ -70,7 +70,12 @@
       "required": ["collection", "value"],
       "properties": {
         "collection": { "type": "string", "format": "nsid" },
-        "rkey": { "type": "string", "maxLength": 512 },
+        "rkey": {
+          "type": "string",
+          "maxLength": 512,
+          "format": "record-key",
+          "description": "NOTE: maxLength is redundant with record-key format. Keeping it temporarily to ensure backwards compatibility."
+        },
         "value": { "type": "unknown" }
       }
     },
@@ -80,7 +85,7 @@
       "required": ["collection", "rkey", "value"],
       "properties": {
         "collection": { "type": "string", "format": "nsid" },
-        "rkey": { "type": "string" },
+        "rkey": { "type": "string", "format": "record-key" },
         "value": { "type": "unknown" }
       }
     },
@@ -90,7 +95,7 @@
       "required": ["collection", "rkey"],
       "properties": {
         "collection": { "type": "string", "format": "nsid" },
-        "rkey": { "type": "string" }
+        "rkey": { "type": "string", "format": "record-key" }
       }
     },
     "createResult": {
diff --git a/lexicons/com/atproto/repo/createRecord.json b/lexicons/com/atproto/repo/createRecord.json
index 6a0d6adcad0..de5f4081ff3 100644
--- a/lexicons/com/atproto/repo/createRecord.json
+++ b/lexicons/com/atproto/repo/createRecord.json
@@ -23,6 +23,7 @@
             },
             "rkey": {
               "type": "string",
+              "format": "record-key",
               "description": "The Record Key.",
               "maxLength": 512
             },
diff --git a/lexicons/com/atproto/repo/defs.json b/lexicons/com/atproto/repo/defs.json
index 0f5128fb9e4..8752599f61c 100644
--- a/lexicons/com/atproto/repo/defs.json
+++ b/lexicons/com/atproto/repo/defs.json
@@ -7,7 +7,7 @@
       "required": ["cid", "rev"],
       "properties": {
         "cid": { "type": "string", "format": "cid" },
-        "rev": { "type": "string" }
+        "rev": { "type": "string", "format": "tid" }
       }
     }
   }
diff --git a/lexicons/com/atproto/repo/deleteRecord.json b/lexicons/com/atproto/repo/deleteRecord.json
index fb9b90b720d..9831da17ca6 100644
--- a/lexicons/com/atproto/repo/deleteRecord.json
+++ b/lexicons/com/atproto/repo/deleteRecord.json
@@ -23,6 +23,7 @@
             },
             "rkey": {
               "type": "string",
+              "format": "record-key",
               "description": "The Record Key."
             },
             "swapRecord": {
diff --git a/lexicons/com/atproto/repo/getRecord.json b/lexicons/com/atproto/repo/getRecord.json
index 261c1cdf7aa..388b9c5adb9 100644
--- a/lexicons/com/atproto/repo/getRecord.json
+++ b/lexicons/com/atproto/repo/getRecord.json
@@ -19,7 +19,11 @@
             "format": "nsid",
             "description": "The NSID of the record collection."
           },
-          "rkey": { "type": "string", "description": "The Record Key." },
+          "rkey": {
+            "type": "string",
+            "description": "The Record Key.",
+            "format": "record-key"
+          },
           "cid": {
             "type": "string",
             "format": "cid",
diff --git a/lexicons/com/atproto/repo/putRecord.json b/lexicons/com/atproto/repo/putRecord.json
index c39a9f2ab7c..830fade52be 100644
--- a/lexicons/com/atproto/repo/putRecord.json
+++ b/lexicons/com/atproto/repo/putRecord.json
@@ -24,6 +24,7 @@
             },
             "rkey": {
               "type": "string",
+              "format": "record-key",
               "description": "The Record Key.",
               "maxLength": 512
             },
diff --git a/lexicons/com/atproto/sync/getLatestCommit.json b/lexicons/com/atproto/sync/getLatestCommit.json
index 759e4ba37dc..b20e631ae66 100644
--- a/lexicons/com/atproto/sync/getLatestCommit.json
+++ b/lexicons/com/atproto/sync/getLatestCommit.json
@@ -23,7 +23,7 @@
           "required": ["cid", "rev"],
           "properties": {
             "cid": { "type": "string", "format": "cid" },
-            "rev": { "type": "string" }
+            "rev": { "type": "string", "format": "tid" }
           }
         }
       },
diff --git a/lexicons/com/atproto/sync/getRecord.json b/lexicons/com/atproto/sync/getRecord.json
index d8195ce137e..cd69e231954 100644
--- a/lexicons/com/atproto/sync/getRecord.json
+++ b/lexicons/com/atproto/sync/getRecord.json
@@ -15,7 +15,11 @@
             "description": "The DID of the repo."
           },
           "collection": { "type": "string", "format": "nsid" },
-          "rkey": { "type": "string", "description": "Record Key" },
+          "rkey": {
+            "type": "string",
+            "description": "Record Key",
+            "format": "record-key"
+          },
           "commit": {
             "type": "string",
             "format": "cid",
diff --git a/lexicons/com/atproto/sync/getRepo.json b/lexicons/com/atproto/sync/getRepo.json
index 321aec450e7..307202c27fc 100644
--- a/lexicons/com/atproto/sync/getRepo.json
+++ b/lexicons/com/atproto/sync/getRepo.json
@@ -16,6 +16,7 @@
           },
           "since": {
             "type": "string",
+            "format": "tid",
             "description": "The revision ('rev') of the repo to create a diff from."
           }
         }
diff --git a/lexicons/com/atproto/sync/getRepoStatus.json b/lexicons/com/atproto/sync/getRepoStatus.json
index 42ab307277a..51dfb825b6b 100644
--- a/lexicons/com/atproto/sync/getRepoStatus.json
+++ b/lexicons/com/atproto/sync/getRepoStatus.json
@@ -31,6 +31,7 @@
             },
             "rev": {
               "type": "string",
+              "format": "tid",
               "description": "Optional field, the current rev of the repo, if active=true"
             }
           }
diff --git a/lexicons/com/atproto/sync/listBlobs.json b/lexicons/com/atproto/sync/listBlobs.json
index 23d81689f0c..45a048d1b89 100644
--- a/lexicons/com/atproto/sync/listBlobs.json
+++ b/lexicons/com/atproto/sync/listBlobs.json
@@ -16,6 +16,7 @@
           },
           "since": {
             "type": "string",
+            "format": "tid",
             "description": "Optional revision of the repo to list blobs since."
           },
           "limit": {
diff --git a/lexicons/com/atproto/sync/listRepos.json b/lexicons/com/atproto/sync/listRepos.json
index af77169ecb4..ce240876d7c 100644
--- a/lexicons/com/atproto/sync/listRepos.json
+++ b/lexicons/com/atproto/sync/listRepos.json
@@ -42,7 +42,7 @@
           "format": "cid",
           "description": "Current repo commit CID"
         },
-        "rev": { "type": "string" },
+        "rev": { "type": "string", "format": "tid" },
         "active": { "type": "boolean" },
         "status": {
           "type": "string",
diff --git a/lexicons/com/atproto/sync/subscribeRepos.json b/lexicons/com/atproto/sync/subscribeRepos.json
index 8132c22a448..07640f9599f 100644
--- a/lexicons/com/atproto/sync/subscribeRepos.json
+++ b/lexicons/com/atproto/sync/subscribeRepos.json
@@ -78,10 +78,12 @@
         },
         "rev": {
           "type": "string",
+          "format": "tid",
           "description": "The rev of the emitted commit. Note that this information is also in the commit object included in blocks, unless this is a tooBig event."
         },
         "since": {
           "type": "string",
+          "format": "tid",
           "description": "The rev of the last emitted commit from this repo (if any)."
         },
         "blocks": {
diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
index 6f9981c88b7..ef764694411 100644
--- a/packages/api/src/client/lexicons.ts
+++ b/packages/api/src/client/lexicons.ts
@@ -1371,6 +1371,9 @@ export const schemaDict = {
           rkey: {
             type: 'string',
             maxLength: 512,
+            format: 'record-key',
+            description:
+              'NOTE: maxLength is redundant with record-key format. Keeping it temporarily to ensure backwards compatibility.',
           },
           value: {
             type: 'unknown',
@@ -1388,6 +1391,7 @@ export const schemaDict = {
           },
           rkey: {
             type: 'string',
+            format: 'record-key',
           },
           value: {
             type: 'unknown',
@@ -1405,6 +1409,7 @@ export const schemaDict = {
           },
           rkey: {
             type: 'string',
+            format: 'record-key',
           },
         },
       },
@@ -1478,6 +1483,7 @@ export const schemaDict = {
               },
               rkey: {
                 type: 'string',
+                format: 'record-key',
                 description: 'The Record Key.',
                 maxLength: 512,
               },
@@ -1548,6 +1554,7 @@ export const schemaDict = {
           },
           rev: {
             type: 'string',
+            format: 'tid',
           },
         },
       },
@@ -1580,6 +1587,7 @@ export const schemaDict = {
               },
               rkey: {
                 type: 'string',
+                format: 'record-key',
                 description: 'The Record Key.',
               },
               swapRecord: {
@@ -1705,6 +1713,7 @@ export const schemaDict = {
             rkey: {
               type: 'string',
               description: 'The Record Key.',
+              format: 'record-key',
             },
             cid: {
               type: 'string',
@@ -1929,6 +1938,7 @@ export const schemaDict = {
               },
               rkey: {
                 type: 'string',
+                format: 'record-key',
                 description: 'The Record Key.',
                 maxLength: 512,
               },
@@ -3347,6 +3357,7 @@ export const schemaDict = {
               },
               rev: {
                 type: 'string',
+                format: 'tid',
               },
             },
           },
@@ -3392,6 +3403,7 @@ export const schemaDict = {
             rkey: {
               type: 'string',
               description: 'Record Key',
+              format: 'record-key',
             },
             commit: {
               type: 'string',
@@ -3443,6 +3455,7 @@ export const schemaDict = {
             },
             since: {
               type: 'string',
+              format: 'tid',
               description:
                 "The revision ('rev') of the repo to create a diff from.",
             },
@@ -3508,6 +3521,7 @@ export const schemaDict = {
               },
               rev: {
                 type: 'string',
+                format: 'tid',
                 description:
                   'Optional field, the current rev of the repo, if active=true',
               },
@@ -3541,6 +3555,7 @@ export const schemaDict = {
             },
             since: {
               type: 'string',
+              format: 'tid',
               description: 'Optional revision of the repo to list blobs since.',
             },
             limit: {
@@ -3647,6 +3662,7 @@ export const schemaDict = {
           },
           rev: {
             type: 'string',
+            format: 'tid',
           },
           active: {
             type: 'boolean',
@@ -3862,11 +3878,13 @@ export const schemaDict = {
           },
           rev: {
             type: 'string',
+            format: 'tid',
             description:
               'The rev of the emitted commit. Note that this information is also in the commit object included in blocks, unless this is a tooBig event.',
           },
           since: {
             type: 'string',
+            format: 'tid',
             description:
               'The rev of the last emitted commit from this repo (if any).',
           },
diff --git a/packages/api/src/client/types/com/atproto/repo/applyWrites.ts b/packages/api/src/client/types/com/atproto/repo/applyWrites.ts
index 2592fc9218a..25cd7b71b6d 100644
--- a/packages/api/src/client/types/com/atproto/repo/applyWrites.ts
+++ b/packages/api/src/client/types/com/atproto/repo/applyWrites.ts
@@ -64,6 +64,7 @@ export function toKnownErr(e: any) {
 export interface Create {
   $type?: 'com.atproto.repo.applyWrites#create'
   collection: string
+  /** NOTE: maxLength is redundant with record-key format. Keeping it temporarily to ensure backwards compatibility. */
   rkey?: string
   value: { [_ in string]: unknown }
 }
diff --git a/packages/bsky/src/lexicon/lexicons.ts b/packages/bsky/src/lexicon/lexicons.ts
index 9d5be5240a4..3e758776f71 100644
--- a/packages/bsky/src/lexicon/lexicons.ts
+++ b/packages/bsky/src/lexicon/lexicons.ts
@@ -1371,6 +1371,9 @@ export const schemaDict = {
           rkey: {
             type: 'string',
             maxLength: 512,
+            format: 'record-key',
+            description:
+              'NOTE: maxLength is redundant with record-key format. Keeping it temporarily to ensure backwards compatibility.',
           },
           value: {
             type: 'unknown',
@@ -1388,6 +1391,7 @@ export const schemaDict = {
           },
           rkey: {
             type: 'string',
+            format: 'record-key',
           },
           value: {
             type: 'unknown',
@@ -1405,6 +1409,7 @@ export const schemaDict = {
           },
           rkey: {
             type: 'string',
+            format: 'record-key',
           },
         },
       },
@@ -1478,6 +1483,7 @@ export const schemaDict = {
               },
               rkey: {
                 type: 'string',
+                format: 'record-key',
                 description: 'The Record Key.',
                 maxLength: 512,
               },
@@ -1548,6 +1554,7 @@ export const schemaDict = {
           },
           rev: {
             type: 'string',
+            format: 'tid',
           },
         },
       },
@@ -1580,6 +1587,7 @@ export const schemaDict = {
               },
               rkey: {
                 type: 'string',
+                format: 'record-key',
                 description: 'The Record Key.',
               },
               swapRecord: {
@@ -1705,6 +1713,7 @@ export const schemaDict = {
             rkey: {
               type: 'string',
               description: 'The Record Key.',
+              format: 'record-key',
             },
             cid: {
               type: 'string',
@@ -1929,6 +1938,7 @@ export const schemaDict = {
               },
               rkey: {
                 type: 'string',
+                format: 'record-key',
                 description: 'The Record Key.',
                 maxLength: 512,
               },
@@ -3347,6 +3357,7 @@ export const schemaDict = {
               },
               rev: {
                 type: 'string',
+                format: 'tid',
               },
             },
           },
@@ -3392,6 +3403,7 @@ export const schemaDict = {
             rkey: {
               type: 'string',
               description: 'Record Key',
+              format: 'record-key',
             },
             commit: {
               type: 'string',
@@ -3443,6 +3455,7 @@ export const schemaDict = {
             },
             since: {
               type: 'string',
+              format: 'tid',
               description:
                 "The revision ('rev') of the repo to create a diff from.",
             },
@@ -3508,6 +3521,7 @@ export const schemaDict = {
               },
               rev: {
                 type: 'string',
+                format: 'tid',
                 description:
                   'Optional field, the current rev of the repo, if active=true',
               },
@@ -3541,6 +3555,7 @@ export const schemaDict = {
             },
             since: {
               type: 'string',
+              format: 'tid',
               description: 'Optional revision of the repo to list blobs since.',
             },
             limit: {
@@ -3647,6 +3662,7 @@ export const schemaDict = {
           },
           rev: {
             type: 'string',
+            format: 'tid',
           },
           active: {
             type: 'boolean',
@@ -3862,11 +3878,13 @@ export const schemaDict = {
           },
           rev: {
             type: 'string',
+            format: 'tid',
             description:
               'The rev of the emitted commit. Note that this information is also in the commit object included in blocks, unless this is a tooBig event.',
           },
           since: {
             type: 'string',
+            format: 'tid',
             description:
               'The rev of the last emitted commit from this repo (if any).',
           },
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/applyWrites.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/applyWrites.ts
index c6e07aff94e..490797edaa3 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/applyWrites.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/applyWrites.ts
@@ -68,6 +68,7 @@ export type Handler<HA extends HandlerAuth = never> = (
 export interface Create {
   $type?: 'com.atproto.repo.applyWrites#create'
   collection: string
+  /** NOTE: maxLength is redundant with record-key format. Keeping it temporarily to ensure backwards compatibility. */
   rkey?: string
   value: { [_ in string]: unknown }
 }
diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
index 6f9981c88b7..ef764694411 100644
--- a/packages/ozone/src/lexicon/lexicons.ts
+++ b/packages/ozone/src/lexicon/lexicons.ts
@@ -1371,6 +1371,9 @@ export const schemaDict = {
           rkey: {
             type: 'string',
             maxLength: 512,
+            format: 'record-key',
+            description:
+              'NOTE: maxLength is redundant with record-key format. Keeping it temporarily to ensure backwards compatibility.',
           },
           value: {
             type: 'unknown',
@@ -1388,6 +1391,7 @@ export const schemaDict = {
           },
           rkey: {
             type: 'string',
+            format: 'record-key',
           },
           value: {
             type: 'unknown',
@@ -1405,6 +1409,7 @@ export const schemaDict = {
           },
           rkey: {
             type: 'string',
+            format: 'record-key',
           },
         },
       },
@@ -1478,6 +1483,7 @@ export const schemaDict = {
               },
               rkey: {
                 type: 'string',
+                format: 'record-key',
                 description: 'The Record Key.',
                 maxLength: 512,
               },
@@ -1548,6 +1554,7 @@ export const schemaDict = {
           },
           rev: {
             type: 'string',
+            format: 'tid',
           },
         },
       },
@@ -1580,6 +1587,7 @@ export const schemaDict = {
               },
               rkey: {
                 type: 'string',
+                format: 'record-key',
                 description: 'The Record Key.',
               },
               swapRecord: {
@@ -1705,6 +1713,7 @@ export const schemaDict = {
             rkey: {
               type: 'string',
               description: 'The Record Key.',
+              format: 'record-key',
             },
             cid: {
               type: 'string',
@@ -1929,6 +1938,7 @@ export const schemaDict = {
               },
               rkey: {
                 type: 'string',
+                format: 'record-key',
                 description: 'The Record Key.',
                 maxLength: 512,
               },
@@ -3347,6 +3357,7 @@ export const schemaDict = {
               },
               rev: {
                 type: 'string',
+                format: 'tid',
               },
             },
           },
@@ -3392,6 +3403,7 @@ export const schemaDict = {
             rkey: {
               type: 'string',
               description: 'Record Key',
+              format: 'record-key',
             },
             commit: {
               type: 'string',
@@ -3443,6 +3455,7 @@ export const schemaDict = {
             },
             since: {
               type: 'string',
+              format: 'tid',
               description:
                 "The revision ('rev') of the repo to create a diff from.",
             },
@@ -3508,6 +3521,7 @@ export const schemaDict = {
               },
               rev: {
                 type: 'string',
+                format: 'tid',
                 description:
                   'Optional field, the current rev of the repo, if active=true',
               },
@@ -3541,6 +3555,7 @@ export const schemaDict = {
             },
             since: {
               type: 'string',
+              format: 'tid',
               description: 'Optional revision of the repo to list blobs since.',
             },
             limit: {
@@ -3647,6 +3662,7 @@ export const schemaDict = {
           },
           rev: {
             type: 'string',
+            format: 'tid',
           },
           active: {
             type: 'boolean',
@@ -3862,11 +3878,13 @@ export const schemaDict = {
           },
           rev: {
             type: 'string',
+            format: 'tid',
             description:
               'The rev of the emitted commit. Note that this information is also in the commit object included in blocks, unless this is a tooBig event.',
           },
           since: {
             type: 'string',
+            format: 'tid',
             description:
               'The rev of the last emitted commit from this repo (if any).',
           },
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/applyWrites.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/applyWrites.ts
index c6e07aff94e..490797edaa3 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/applyWrites.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/applyWrites.ts
@@ -68,6 +68,7 @@ export type Handler<HA extends HandlerAuth = never> = (
 export interface Create {
   $type?: 'com.atproto.repo.applyWrites#create'
   collection: string
+  /** NOTE: maxLength is redundant with record-key format. Keeping it temporarily to ensure backwards compatibility. */
   rkey?: string
   value: { [_ in string]: unknown }
 }
diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
index 6f9981c88b7..ef764694411 100644
--- a/packages/pds/src/lexicon/lexicons.ts
+++ b/packages/pds/src/lexicon/lexicons.ts
@@ -1371,6 +1371,9 @@ export const schemaDict = {
           rkey: {
             type: 'string',
             maxLength: 512,
+            format: 'record-key',
+            description:
+              'NOTE: maxLength is redundant with record-key format. Keeping it temporarily to ensure backwards compatibility.',
           },
           value: {
             type: 'unknown',
@@ -1388,6 +1391,7 @@ export const schemaDict = {
           },
           rkey: {
             type: 'string',
+            format: 'record-key',
           },
           value: {
             type: 'unknown',
@@ -1405,6 +1409,7 @@ export const schemaDict = {
           },
           rkey: {
             type: 'string',
+            format: 'record-key',
           },
         },
       },
@@ -1478,6 +1483,7 @@ export const schemaDict = {
               },
               rkey: {
                 type: 'string',
+                format: 'record-key',
                 description: 'The Record Key.',
                 maxLength: 512,
               },
@@ -1548,6 +1554,7 @@ export const schemaDict = {
           },
           rev: {
             type: 'string',
+            format: 'tid',
           },
         },
       },
@@ -1580,6 +1587,7 @@ export const schemaDict = {
               },
               rkey: {
                 type: 'string',
+                format: 'record-key',
                 description: 'The Record Key.',
               },
               swapRecord: {
@@ -1705,6 +1713,7 @@ export const schemaDict = {
             rkey: {
               type: 'string',
               description: 'The Record Key.',
+              format: 'record-key',
             },
             cid: {
               type: 'string',
@@ -1929,6 +1938,7 @@ export const schemaDict = {
               },
               rkey: {
                 type: 'string',
+                format: 'record-key',
                 description: 'The Record Key.',
                 maxLength: 512,
               },
@@ -3347,6 +3357,7 @@ export const schemaDict = {
               },
               rev: {
                 type: 'string',
+                format: 'tid',
               },
             },
           },
@@ -3392,6 +3403,7 @@ export const schemaDict = {
             rkey: {
               type: 'string',
               description: 'Record Key',
+              format: 'record-key',
             },
             commit: {
               type: 'string',
@@ -3443,6 +3455,7 @@ export const schemaDict = {
             },
             since: {
               type: 'string',
+              format: 'tid',
               description:
                 "The revision ('rev') of the repo to create a diff from.",
             },
@@ -3508,6 +3521,7 @@ export const schemaDict = {
               },
               rev: {
                 type: 'string',
+                format: 'tid',
                 description:
                   'Optional field, the current rev of the repo, if active=true',
               },
@@ -3541,6 +3555,7 @@ export const schemaDict = {
             },
             since: {
               type: 'string',
+              format: 'tid',
               description: 'Optional revision of the repo to list blobs since.',
             },
             limit: {
@@ -3647,6 +3662,7 @@ export const schemaDict = {
           },
           rev: {
             type: 'string',
+            format: 'tid',
           },
           active: {
             type: 'boolean',
@@ -3862,11 +3878,13 @@ export const schemaDict = {
           },
           rev: {
             type: 'string',
+            format: 'tid',
             description:
               'The rev of the emitted commit. Note that this information is also in the commit object included in blocks, unless this is a tooBig event.',
           },
           since: {
             type: 'string',
+            format: 'tid',
             description:
               'The rev of the last emitted commit from this repo (if any).',
           },
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/applyWrites.ts b/packages/pds/src/lexicon/types/com/atproto/repo/applyWrites.ts
index c6e07aff94e..490797edaa3 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/applyWrites.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/applyWrites.ts
@@ -68,6 +68,7 @@ export type Handler<HA extends HandlerAuth = never> = (
 export interface Create {
   $type?: 'com.atproto.repo.applyWrites#create'
   collection: string
+  /** NOTE: maxLength is redundant with record-key format. Keeping it temporarily to ensure backwards compatibility. */
   rkey?: string
   value: { [_ in string]: unknown }
 }
diff --git a/packages/pds/tests/crud.test.ts b/packages/pds/tests/crud.test.ts
index 4a898c244db..b4b22fb71a7 100644
--- a/packages/pds/tests/crud.test.ts
+++ b/packages/pds/tests/crud.test.ts
@@ -611,7 +611,7 @@ describe('crud operations', () => {
         },
         rkey: '..',
       }),
-    ).rejects.toThrow('record key can not be "." or ".."')
+    ).rejects.toThrow('Input/rkey must be a valid Record Key')
   })
 
   it('validates the record on write', async () => {

From 22af31a898476c5e317aea263af366bddda120d6 Mon Sep 17 00:00:00 2001
From: rafael <rafael@blueskyweb.xyz>
Date: Fri, 21 Feb 2025 05:01:37 -0800
Subject: [PATCH 080/101] Update chat lexicons (#3564)

* new chat lex

* changeset
---
 .changeset/neat-colts-build.md                |   5 +
 lexicons/chat/bsky/convo/acceptConvo.json     |  31 ++++
 lexicons/chat/bsky/convo/defs.json            |  41 ++++-
 .../chat/bsky/convo/getConvoAvailability.json |  41 +++++
 lexicons/chat/bsky/convo/getLog.json          |   1 +
 lexicons/chat/bsky/convo/listConvos.json      |  10 +-
 packages/api/src/client/index.ts              |  28 ++++
 packages/api/src/client/lexicons.ts           | 147 +++++++++++++++++-
 .../types/chat/bsky/convo/acceptConvo.ts      |  40 +++++
 .../src/client/types/chat/bsky/convo/defs.ts  |  67 +++++++-
 .../chat/bsky/convo/getConvoAvailability.ts   |  39 +++++
 .../client/types/chat/bsky/convo/getLog.ts    |   1 +
 .../types/chat/bsky/convo/listConvos.ts       |   2 +
 packages/bsky/src/lexicon/index.ts            |  24 +++
 packages/bsky/src/lexicon/lexicons.ts         | 147 +++++++++++++++++-
 .../types/chat/bsky/convo/acceptConvo.ts      |  53 +++++++
 .../src/lexicon/types/chat/bsky/convo/defs.ts |  67 +++++++-
 .../chat/bsky/convo/getConvoAvailability.ts   |  51 ++++++
 .../lexicon/types/chat/bsky/convo/getLog.ts   |   1 +
 .../types/chat/bsky/convo/listConvos.ts       |   2 +
 packages/ozone/src/lexicon/index.ts           |  24 +++
 packages/ozone/src/lexicon/lexicons.ts        | 147 +++++++++++++++++-
 .../types/chat/bsky/convo/acceptConvo.ts      |  53 +++++++
 .../src/lexicon/types/chat/bsky/convo/defs.ts |  67 +++++++-
 .../chat/bsky/convo/getConvoAvailability.ts   |  51 ++++++
 .../lexicon/types/chat/bsky/convo/getLog.ts   |   1 +
 .../types/chat/bsky/convo/listConvos.ts       |   2 +
 packages/pds/src/lexicon/index.ts             |  24 +++
 packages/pds/src/lexicon/lexicons.ts          | 147 +++++++++++++++++-
 .../types/chat/bsky/convo/acceptConvo.ts      |  53 +++++++
 .../src/lexicon/types/chat/bsky/convo/defs.ts |  67 +++++++-
 .../chat/bsky/convo/getConvoAvailability.ts   |  51 ++++++
 .../lexicon/types/chat/bsky/convo/getLog.ts   |   1 +
 .../types/chat/bsky/convo/listConvos.ts       |   2 +
 34 files changed, 1474 insertions(+), 14 deletions(-)
 create mode 100644 .changeset/neat-colts-build.md
 create mode 100644 lexicons/chat/bsky/convo/acceptConvo.json
 create mode 100644 lexicons/chat/bsky/convo/getConvoAvailability.json
 create mode 100644 packages/api/src/client/types/chat/bsky/convo/acceptConvo.ts
 create mode 100644 packages/api/src/client/types/chat/bsky/convo/getConvoAvailability.ts
 create mode 100644 packages/bsky/src/lexicon/types/chat/bsky/convo/acceptConvo.ts
 create mode 100644 packages/bsky/src/lexicon/types/chat/bsky/convo/getConvoAvailability.ts
 create mode 100644 packages/ozone/src/lexicon/types/chat/bsky/convo/acceptConvo.ts
 create mode 100644 packages/ozone/src/lexicon/types/chat/bsky/convo/getConvoAvailability.ts
 create mode 100644 packages/pds/src/lexicon/types/chat/bsky/convo/acceptConvo.ts
 create mode 100644 packages/pds/src/lexicon/types/chat/bsky/convo/getConvoAvailability.ts

diff --git a/.changeset/neat-colts-build.md b/.changeset/neat-colts-build.md
new file mode 100644
index 00000000000..014b09f2134
--- /dev/null
+++ b/.changeset/neat-colts-build.md
@@ -0,0 +1,5 @@
+---
+"@atproto/api": patch
+---
+
+Update chat lexicons
diff --git a/lexicons/chat/bsky/convo/acceptConvo.json b/lexicons/chat/bsky/convo/acceptConvo.json
new file mode 100644
index 00000000000..a5edbabab67
--- /dev/null
+++ b/lexicons/chat/bsky/convo/acceptConvo.json
@@ -0,0 +1,31 @@
+{
+  "lexicon": 1,
+  "id": "chat.bsky.convo.acceptConvo",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["convoId"],
+          "properties": {
+            "convoId": { "type": "string" }
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "properties": {
+            "rev": {
+              "description": "Rev when the convo was accepted. If not present, the convo was already accepted.",
+              "type": "string"
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/chat/bsky/convo/defs.json b/lexicons/chat/bsky/convo/defs.json
index e4a25f63ef4..d68d38c21bd 100644
--- a/lexicons/chat/bsky/convo/defs.json
+++ b/lexicons/chat/bsky/convo/defs.json
@@ -90,7 +90,10 @@
           "refs": ["#messageView", "#deletedMessageView"]
         },
         "muted": { "type": "boolean" },
-        "opened": { "type": "boolean" },
+        "status": {
+          "type": "string",
+          "knownValues": ["request", "accepted"]
+        },
         "unreadCount": { "type": "integer" }
       }
     },
@@ -102,6 +105,14 @@
         "convoId": { "type": "string" }
       }
     },
+    "logAcceptConvo": {
+      "type": "object",
+      "required": ["rev", "convoId"],
+      "properties": {
+        "rev": { "type": "string" },
+        "convoId": { "type": "string" }
+      }
+    },
     "logLeaveConvo": {
       "type": "object",
       "required": ["rev", "convoId"],
@@ -110,6 +121,22 @@
         "convoId": { "type": "string" }
       }
     },
+    "logMuteConvo": {
+      "type": "object",
+      "required": ["rev", "convoId"],
+      "properties": {
+        "rev": { "type": "string" },
+        "convoId": { "type": "string" }
+      }
+    },
+    "logUnmuteConvo": {
+      "type": "object",
+      "required": ["rev", "convoId"],
+      "properties": {
+        "rev": { "type": "string" },
+        "convoId": { "type": "string" }
+      }
+    },
     "logCreateMessage": {
       "type": "object",
       "required": ["rev", "convoId", "message"],
@@ -133,6 +160,18 @@
           "refs": ["#messageView", "#deletedMessageView"]
         }
       }
+    },
+    "logReadMessage": {
+      "type": "object",
+      "required": ["rev", "convoId", "message"],
+      "properties": {
+        "rev": { "type": "string" },
+        "convoId": { "type": "string" },
+        "message": {
+          "type": "union",
+          "refs": ["#messageView", "#deletedMessageView"]
+        }
+      }
     }
   }
 }
diff --git a/lexicons/chat/bsky/convo/getConvoAvailability.json b/lexicons/chat/bsky/convo/getConvoAvailability.json
new file mode 100644
index 00000000000..b7084f25f7e
--- /dev/null
+++ b/lexicons/chat/bsky/convo/getConvoAvailability.json
@@ -0,0 +1,41 @@
+{
+  "lexicon": 1,
+  "id": "chat.bsky.convo.getConvoAvailability",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Get whether the requester and the other members can chat. If an existing convo is found for these members, it is returned.",
+      "parameters": {
+        "type": "params",
+        "required": ["members"],
+        "properties": {
+          "members": {
+            "type": "array",
+            "minLength": 1,
+            "maxLength": 10,
+            "items": {
+              "type": "string",
+              "format": "did"
+            }
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["canChat"],
+          "properties": {
+            "canChat": {
+              "type": "boolean"
+            },
+            "convo": {
+              "type": "ref",
+              "ref": "chat.bsky.convo.defs#convoView"
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/chat/bsky/convo/getLog.json b/lexicons/chat/bsky/convo/getLog.json
index ada18c09592..d7f49f0ecd7 100644
--- a/lexicons/chat/bsky/convo/getLog.json
+++ b/lexicons/chat/bsky/convo/getLog.json
@@ -24,6 +24,7 @@
                 "type": "union",
                 "refs": [
                   "chat.bsky.convo.defs#logBeginConvo",
+                  "chat.bsky.convo.defs#logAcceptConvo",
                   "chat.bsky.convo.defs#logLeaveConvo",
                   "chat.bsky.convo.defs#logCreateMessage",
                   "chat.bsky.convo.defs#logDeleteMessage"
diff --git a/lexicons/chat/bsky/convo/listConvos.json b/lexicons/chat/bsky/convo/listConvos.json
index 76e15f55cae..27834ac7be5 100644
--- a/lexicons/chat/bsky/convo/listConvos.json
+++ b/lexicons/chat/bsky/convo/listConvos.json
@@ -13,7 +13,15 @@
             "maximum": 100,
             "default": 50
           },
-          "cursor": { "type": "string" }
+          "cursor": { "type": "string" },
+          "readState": {
+            "type": "string",
+            "knownValues": ["unread"]
+          },
+          "status": {
+            "type": "string",
+            "knownValues": ["request", "accepted"]
+          }
         }
       },
       "output": {
diff --git a/packages/api/src/client/index.ts b/packages/api/src/client/index.ts
index f1f4af198e5..b8e88e4aef6 100644
--- a/packages/api/src/client/index.ts
+++ b/packages/api/src/client/index.ts
@@ -182,9 +182,11 @@ import * as ChatBskyActorDeclaration from './types/chat/bsky/actor/declaration.j
 import * as ChatBskyActorDefs from './types/chat/bsky/actor/defs.js'
 import * as ChatBskyActorDeleteAccount from './types/chat/bsky/actor/deleteAccount.js'
 import * as ChatBskyActorExportAccountData from './types/chat/bsky/actor/exportAccountData.js'
+import * as ChatBskyConvoAcceptConvo from './types/chat/bsky/convo/acceptConvo.js'
 import * as ChatBskyConvoDefs from './types/chat/bsky/convo/defs.js'
 import * as ChatBskyConvoDeleteMessageForSelf from './types/chat/bsky/convo/deleteMessageForSelf.js'
 import * as ChatBskyConvoGetConvo from './types/chat/bsky/convo/getConvo.js'
+import * as ChatBskyConvoGetConvoAvailability from './types/chat/bsky/convo/getConvoAvailability.js'
 import * as ChatBskyConvoGetConvoForMembers from './types/chat/bsky/convo/getConvoForMembers.js'
 import * as ChatBskyConvoGetLog from './types/chat/bsky/convo/getLog.js'
 import * as ChatBskyConvoGetMessages from './types/chat/bsky/convo/getMessages.js'
@@ -413,9 +415,11 @@ export * as ChatBskyActorDeclaration from './types/chat/bsky/actor/declaration.j
 export * as ChatBskyActorDefs from './types/chat/bsky/actor/defs.js'
 export * as ChatBskyActorDeleteAccount from './types/chat/bsky/actor/deleteAccount.js'
 export * as ChatBskyActorExportAccountData from './types/chat/bsky/actor/exportAccountData.js'
+export * as ChatBskyConvoAcceptConvo from './types/chat/bsky/convo/acceptConvo.js'
 export * as ChatBskyConvoDefs from './types/chat/bsky/convo/defs.js'
 export * as ChatBskyConvoDeleteMessageForSelf from './types/chat/bsky/convo/deleteMessageForSelf.js'
 export * as ChatBskyConvoGetConvo from './types/chat/bsky/convo/getConvo.js'
+export * as ChatBskyConvoGetConvoAvailability from './types/chat/bsky/convo/getConvoAvailability.js'
 export * as ChatBskyConvoGetConvoForMembers from './types/chat/bsky/convo/getConvoForMembers.js'
 export * as ChatBskyConvoGetLog from './types/chat/bsky/convo/getLog.js'
 export * as ChatBskyConvoGetMessages from './types/chat/bsky/convo/getMessages.js'
@@ -3419,6 +3423,18 @@ export class ChatBskyConvoNS {
     this._client = client
   }
 
+  acceptConvo(
+    data?: ChatBskyConvoAcceptConvo.InputSchema,
+    opts?: ChatBskyConvoAcceptConvo.CallOptions,
+  ): Promise<ChatBskyConvoAcceptConvo.Response> {
+    return this._client.call(
+      'chat.bsky.convo.acceptConvo',
+      opts?.qp,
+      data,
+      opts,
+    )
+  }
+
   deleteMessageForSelf(
     data?: ChatBskyConvoDeleteMessageForSelf.InputSchema,
     opts?: ChatBskyConvoDeleteMessageForSelf.CallOptions,
@@ -3443,6 +3459,18 @@ export class ChatBskyConvoNS {
     )
   }
 
+  getConvoAvailability(
+    params?: ChatBskyConvoGetConvoAvailability.QueryParams,
+    opts?: ChatBskyConvoGetConvoAvailability.CallOptions,
+  ): Promise<ChatBskyConvoGetConvoAvailability.Response> {
+    return this._client.call(
+      'chat.bsky.convo.getConvoAvailability',
+      params,
+      undefined,
+      opts,
+    )
+  }
+
   getConvoForMembers(
     params?: ChatBskyConvoGetConvoForMembers.QueryParams,
     opts?: ChatBskyConvoGetConvoForMembers.CallOptions,
diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
index ef764694411..219e4daefea 100644
--- a/packages/api/src/client/lexicons.ts
+++ b/packages/api/src/client/lexicons.ts
@@ -10206,6 +10206,40 @@ export const schemaDict = {
       },
     },
   },
+  ChatBskyConvoAcceptConvo: {
+    lexicon: 1,
+    id: 'chat.bsky.convo.acceptConvo',
+    defs: {
+      main: {
+        type: 'procedure',
+        input: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['convoId'],
+            properties: {
+              convoId: {
+                type: 'string',
+              },
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            properties: {
+              rev: {
+                description:
+                  'Rev when the convo was accepted. If not present, the convo was already accepted.',
+                type: 'string',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
   ChatBskyConvoDefs: {
     lexicon: 1,
     id: 'chat.bsky.convo.defs',
@@ -10343,8 +10377,9 @@ export const schemaDict = {
           muted: {
             type: 'boolean',
           },
-          opened: {
-            type: 'boolean',
+          status: {
+            type: 'string',
+            knownValues: ['request', 'accepted'],
           },
           unreadCount: {
             type: 'integer',
@@ -10363,6 +10398,18 @@ export const schemaDict = {
           },
         },
       },
+      logAcceptConvo: {
+        type: 'object',
+        required: ['rev', 'convoId'],
+        properties: {
+          rev: {
+            type: 'string',
+          },
+          convoId: {
+            type: 'string',
+          },
+        },
+      },
       logLeaveConvo: {
         type: 'object',
         required: ['rev', 'convoId'],
@@ -10375,6 +10422,30 @@ export const schemaDict = {
           },
         },
       },
+      logMuteConvo: {
+        type: 'object',
+        required: ['rev', 'convoId'],
+        properties: {
+          rev: {
+            type: 'string',
+          },
+          convoId: {
+            type: 'string',
+          },
+        },
+      },
+      logUnmuteConvo: {
+        type: 'object',
+        required: ['rev', 'convoId'],
+        properties: {
+          rev: {
+            type: 'string',
+          },
+          convoId: {
+            type: 'string',
+          },
+        },
+      },
       logCreateMessage: {
         type: 'object',
         required: ['rev', 'convoId', 'message'],
@@ -10413,6 +10484,25 @@ export const schemaDict = {
           },
         },
       },
+      logReadMessage: {
+        type: 'object',
+        required: ['rev', 'convoId', 'message'],
+        properties: {
+          rev: {
+            type: 'string',
+          },
+          convoId: {
+            type: 'string',
+          },
+          message: {
+            type: 'union',
+            refs: [
+              'lex:chat.bsky.convo.defs#messageView',
+              'lex:chat.bsky.convo.defs#deletedMessageView',
+            ],
+          },
+        },
+      },
     },
   },
   ChatBskyConvoDeleteMessageForSelf: {
@@ -10477,6 +10567,48 @@ export const schemaDict = {
       },
     },
   },
+  ChatBskyConvoGetConvoAvailability: {
+    lexicon: 1,
+    id: 'chat.bsky.convo.getConvoAvailability',
+    defs: {
+      main: {
+        type: 'query',
+        description:
+          'Get whether the requester and the other members can chat. If an existing convo is found for these members, it is returned.',
+        parameters: {
+          type: 'params',
+          required: ['members'],
+          properties: {
+            members: {
+              type: 'array',
+              minLength: 1,
+              maxLength: 10,
+              items: {
+                type: 'string',
+                format: 'did',
+              },
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['canChat'],
+            properties: {
+              canChat: {
+                type: 'boolean',
+              },
+              convo: {
+                type: 'ref',
+                ref: 'lex:chat.bsky.convo.defs#convoView',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
   ChatBskyConvoGetConvoForMembers: {
     lexicon: 1,
     id: 'chat.bsky.convo.getConvoForMembers',
@@ -10544,6 +10676,7 @@ export const schemaDict = {
                   type: 'union',
                   refs: [
                     'lex:chat.bsky.convo.defs#logBeginConvo',
+                    'lex:chat.bsky.convo.defs#logAcceptConvo',
                     'lex:chat.bsky.convo.defs#logLeaveConvo',
                     'lex:chat.bsky.convo.defs#logCreateMessage',
                     'lex:chat.bsky.convo.defs#logDeleteMessage',
@@ -10659,6 +10792,14 @@ export const schemaDict = {
             cursor: {
               type: 'string',
             },
+            readState: {
+              type: 'string',
+              knownValues: ['unread'],
+            },
+            status: {
+              type: 'string',
+              knownValues: ['request', 'accepted'],
+            },
           },
         },
         output: {
@@ -14289,9 +14430,11 @@ export const ids = {
   ChatBskyActorDefs: 'chat.bsky.actor.defs',
   ChatBskyActorDeleteAccount: 'chat.bsky.actor.deleteAccount',
   ChatBskyActorExportAccountData: 'chat.bsky.actor.exportAccountData',
+  ChatBskyConvoAcceptConvo: 'chat.bsky.convo.acceptConvo',
   ChatBskyConvoDefs: 'chat.bsky.convo.defs',
   ChatBskyConvoDeleteMessageForSelf: 'chat.bsky.convo.deleteMessageForSelf',
   ChatBskyConvoGetConvo: 'chat.bsky.convo.getConvo',
+  ChatBskyConvoGetConvoAvailability: 'chat.bsky.convo.getConvoAvailability',
   ChatBskyConvoGetConvoForMembers: 'chat.bsky.convo.getConvoForMembers',
   ChatBskyConvoGetLog: 'chat.bsky.convo.getLog',
   ChatBskyConvoGetMessages: 'chat.bsky.convo.getMessages',
diff --git a/packages/api/src/client/types/chat/bsky/convo/acceptConvo.ts b/packages/api/src/client/types/chat/bsky/convo/acceptConvo.ts
new file mode 100644
index 00000000000..264bd42eb71
--- /dev/null
+++ b/packages/api/src/client/types/chat/bsky/convo/acceptConvo.ts
@@ -0,0 +1,40 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { HeadersMap, XRPCError } from '@atproto/xrpc'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.acceptConvo'
+
+export interface QueryParams {}
+
+export interface InputSchema {
+  convoId: string
+}
+
+export interface OutputSchema {
+  /** Rev when the convo was accepted. If not present, the convo was already accepted. */
+  rev?: string
+}
+
+export interface CallOptions {
+  signal?: AbortSignal
+  headers?: HeadersMap
+  qp?: QueryParams
+  encoding?: 'application/json'
+}
+
+export interface Response {
+  success: boolean
+  headers: HeadersMap
+  data: OutputSchema
+}
+
+export function toKnownErr(e: any) {
+  return e
+}
diff --git a/packages/api/src/client/types/chat/bsky/convo/defs.ts b/packages/api/src/client/types/chat/bsky/convo/defs.ts
index 4d458fb798e..55faea002e2 100644
--- a/packages/api/src/client/types/chat/bsky/convo/defs.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/defs.ts
@@ -113,7 +113,7 @@ export interface ConvoView {
     | $Typed<DeletedMessageView>
     | { $type: string }
   muted: boolean
-  opened?: boolean
+  status?: 'request' | 'accepted' | (string & {})
   unreadCount: number
 }
 
@@ -143,6 +143,22 @@ export function validateLogBeginConvo<V>(v: V) {
   return validate<LogBeginConvo & V>(v, id, hashLogBeginConvo)
 }
 
+export interface LogAcceptConvo {
+  $type?: 'chat.bsky.convo.defs#logAcceptConvo'
+  rev: string
+  convoId: string
+}
+
+const hashLogAcceptConvo = 'logAcceptConvo'
+
+export function isLogAcceptConvo<V>(v: V) {
+  return is$typed(v, id, hashLogAcceptConvo)
+}
+
+export function validateLogAcceptConvo<V>(v: V) {
+  return validate<LogAcceptConvo & V>(v, id, hashLogAcceptConvo)
+}
+
 export interface LogLeaveConvo {
   $type?: 'chat.bsky.convo.defs#logLeaveConvo'
   rev: string
@@ -159,6 +175,38 @@ export function validateLogLeaveConvo<V>(v: V) {
   return validate<LogLeaveConvo & V>(v, id, hashLogLeaveConvo)
 }
 
+export interface LogMuteConvo {
+  $type?: 'chat.bsky.convo.defs#logMuteConvo'
+  rev: string
+  convoId: string
+}
+
+const hashLogMuteConvo = 'logMuteConvo'
+
+export function isLogMuteConvo<V>(v: V) {
+  return is$typed(v, id, hashLogMuteConvo)
+}
+
+export function validateLogMuteConvo<V>(v: V) {
+  return validate<LogMuteConvo & V>(v, id, hashLogMuteConvo)
+}
+
+export interface LogUnmuteConvo {
+  $type?: 'chat.bsky.convo.defs#logUnmuteConvo'
+  rev: string
+  convoId: string
+}
+
+const hashLogUnmuteConvo = 'logUnmuteConvo'
+
+export function isLogUnmuteConvo<V>(v: V) {
+  return is$typed(v, id, hashLogUnmuteConvo)
+}
+
+export function validateLogUnmuteConvo<V>(v: V) {
+  return validate<LogUnmuteConvo & V>(v, id, hashLogUnmuteConvo)
+}
+
 export interface LogCreateMessage {
   $type?: 'chat.bsky.convo.defs#logCreateMessage'
   rev: string
@@ -192,3 +240,20 @@ export function isLogDeleteMessage<V>(v: V) {
 export function validateLogDeleteMessage<V>(v: V) {
   return validate<LogDeleteMessage & V>(v, id, hashLogDeleteMessage)
 }
+
+export interface LogReadMessage {
+  $type?: 'chat.bsky.convo.defs#logReadMessage'
+  rev: string
+  convoId: string
+  message: $Typed<MessageView> | $Typed<DeletedMessageView> | { $type: string }
+}
+
+const hashLogReadMessage = 'logReadMessage'
+
+export function isLogReadMessage<V>(v: V) {
+  return is$typed(v, id, hashLogReadMessage)
+}
+
+export function validateLogReadMessage<V>(v: V) {
+  return validate<LogReadMessage & V>(v, id, hashLogReadMessage)
+}
diff --git a/packages/api/src/client/types/chat/bsky/convo/getConvoAvailability.ts b/packages/api/src/client/types/chat/bsky/convo/getConvoAvailability.ts
new file mode 100644
index 00000000000..bd819e4f05a
--- /dev/null
+++ b/packages/api/src/client/types/chat/bsky/convo/getConvoAvailability.ts
@@ -0,0 +1,39 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { HeadersMap, XRPCError } from '@atproto/xrpc'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.getConvoAvailability'
+
+export interface QueryParams {
+  members: string[]
+}
+
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  canChat: boolean
+  convo?: ChatBskyConvoDefs.ConvoView
+}
+
+export interface CallOptions {
+  signal?: AbortSignal
+  headers?: HeadersMap
+}
+
+export interface Response {
+  success: boolean
+  headers: HeadersMap
+  data: OutputSchema
+}
+
+export function toKnownErr(e: any) {
+  return e
+}
diff --git a/packages/api/src/client/types/chat/bsky/convo/getLog.ts b/packages/api/src/client/types/chat/bsky/convo/getLog.ts
index 27ad0960d93..d6f7db26d93 100644
--- a/packages/api/src/client/types/chat/bsky/convo/getLog.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/getLog.ts
@@ -22,6 +22,7 @@ export interface OutputSchema {
   cursor?: string
   logs: (
     | $Typed<ChatBskyConvoDefs.LogBeginConvo>
+    | $Typed<ChatBskyConvoDefs.LogAcceptConvo>
     | $Typed<ChatBskyConvoDefs.LogLeaveConvo>
     | $Typed<ChatBskyConvoDefs.LogCreateMessage>
     | $Typed<ChatBskyConvoDefs.LogDeleteMessage>
diff --git a/packages/api/src/client/types/chat/bsky/convo/listConvos.ts b/packages/api/src/client/types/chat/bsky/convo/listConvos.ts
index ae6a16f8661..9c070f0d01d 100644
--- a/packages/api/src/client/types/chat/bsky/convo/listConvos.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/listConvos.ts
@@ -15,6 +15,8 @@ const id = 'chat.bsky.convo.listConvos'
 export interface QueryParams {
   limit?: number
   cursor?: string
+  readState?: 'unread' | (string & {})
+  status?: 'request' | 'accepted' | (string & {})
 }
 
 export type InputSchema = undefined
diff --git a/packages/bsky/src/lexicon/index.ts b/packages/bsky/src/lexicon/index.ts
index 4cdbd7ecc02..6e93f0dd4bd 100644
--- a/packages/bsky/src/lexicon/index.ts
+++ b/packages/bsky/src/lexicon/index.ts
@@ -150,8 +150,10 @@ import * as AppBskyVideoGetUploadLimits from './types/app/bsky/video/getUploadLi
 import * as AppBskyVideoUploadVideo from './types/app/bsky/video/uploadVideo.js'
 import * as ChatBskyActorDeleteAccount from './types/chat/bsky/actor/deleteAccount.js'
 import * as ChatBskyActorExportAccountData from './types/chat/bsky/actor/exportAccountData.js'
+import * as ChatBskyConvoAcceptConvo from './types/chat/bsky/convo/acceptConvo.js'
 import * as ChatBskyConvoDeleteMessageForSelf from './types/chat/bsky/convo/deleteMessageForSelf.js'
 import * as ChatBskyConvoGetConvo from './types/chat/bsky/convo/getConvo.js'
+import * as ChatBskyConvoGetConvoAvailability from './types/chat/bsky/convo/getConvoAvailability.js'
 import * as ChatBskyConvoGetConvoForMembers from './types/chat/bsky/convo/getConvoForMembers.js'
 import * as ChatBskyConvoGetLog from './types/chat/bsky/convo/getLog.js'
 import * as ChatBskyConvoGetMessages from './types/chat/bsky/convo/getMessages.js'
@@ -2025,6 +2027,17 @@ export class ChatBskyConvoNS {
     this._server = server
   }
 
+  acceptConvo<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ChatBskyConvoAcceptConvo.Handler<ExtractAuth<AV>>,
+      ChatBskyConvoAcceptConvo.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'chat.bsky.convo.acceptConvo' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   deleteMessageForSelf<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,
@@ -2047,6 +2060,17 @@ export class ChatBskyConvoNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
+  getConvoAvailability<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ChatBskyConvoGetConvoAvailability.Handler<ExtractAuth<AV>>,
+      ChatBskyConvoGetConvoAvailability.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'chat.bsky.convo.getConvoAvailability' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   getConvoForMembers<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,
diff --git a/packages/bsky/src/lexicon/lexicons.ts b/packages/bsky/src/lexicon/lexicons.ts
index 3e758776f71..760662248b4 100644
--- a/packages/bsky/src/lexicon/lexicons.ts
+++ b/packages/bsky/src/lexicon/lexicons.ts
@@ -10206,6 +10206,40 @@ export const schemaDict = {
       },
     },
   },
+  ChatBskyConvoAcceptConvo: {
+    lexicon: 1,
+    id: 'chat.bsky.convo.acceptConvo',
+    defs: {
+      main: {
+        type: 'procedure',
+        input: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['convoId'],
+            properties: {
+              convoId: {
+                type: 'string',
+              },
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            properties: {
+              rev: {
+                description:
+                  'Rev when the convo was accepted. If not present, the convo was already accepted.',
+                type: 'string',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
   ChatBskyConvoDefs: {
     lexicon: 1,
     id: 'chat.bsky.convo.defs',
@@ -10343,8 +10377,9 @@ export const schemaDict = {
           muted: {
             type: 'boolean',
           },
-          opened: {
-            type: 'boolean',
+          status: {
+            type: 'string',
+            knownValues: ['request', 'accepted'],
           },
           unreadCount: {
             type: 'integer',
@@ -10363,6 +10398,18 @@ export const schemaDict = {
           },
         },
       },
+      logAcceptConvo: {
+        type: 'object',
+        required: ['rev', 'convoId'],
+        properties: {
+          rev: {
+            type: 'string',
+          },
+          convoId: {
+            type: 'string',
+          },
+        },
+      },
       logLeaveConvo: {
         type: 'object',
         required: ['rev', 'convoId'],
@@ -10375,6 +10422,30 @@ export const schemaDict = {
           },
         },
       },
+      logMuteConvo: {
+        type: 'object',
+        required: ['rev', 'convoId'],
+        properties: {
+          rev: {
+            type: 'string',
+          },
+          convoId: {
+            type: 'string',
+          },
+        },
+      },
+      logUnmuteConvo: {
+        type: 'object',
+        required: ['rev', 'convoId'],
+        properties: {
+          rev: {
+            type: 'string',
+          },
+          convoId: {
+            type: 'string',
+          },
+        },
+      },
       logCreateMessage: {
         type: 'object',
         required: ['rev', 'convoId', 'message'],
@@ -10413,6 +10484,25 @@ export const schemaDict = {
           },
         },
       },
+      logReadMessage: {
+        type: 'object',
+        required: ['rev', 'convoId', 'message'],
+        properties: {
+          rev: {
+            type: 'string',
+          },
+          convoId: {
+            type: 'string',
+          },
+          message: {
+            type: 'union',
+            refs: [
+              'lex:chat.bsky.convo.defs#messageView',
+              'lex:chat.bsky.convo.defs#deletedMessageView',
+            ],
+          },
+        },
+      },
     },
   },
   ChatBskyConvoDeleteMessageForSelf: {
@@ -10477,6 +10567,48 @@ export const schemaDict = {
       },
     },
   },
+  ChatBskyConvoGetConvoAvailability: {
+    lexicon: 1,
+    id: 'chat.bsky.convo.getConvoAvailability',
+    defs: {
+      main: {
+        type: 'query',
+        description:
+          'Get whether the requester and the other members can chat. If an existing convo is found for these members, it is returned.',
+        parameters: {
+          type: 'params',
+          required: ['members'],
+          properties: {
+            members: {
+              type: 'array',
+              minLength: 1,
+              maxLength: 10,
+              items: {
+                type: 'string',
+                format: 'did',
+              },
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['canChat'],
+            properties: {
+              canChat: {
+                type: 'boolean',
+              },
+              convo: {
+                type: 'ref',
+                ref: 'lex:chat.bsky.convo.defs#convoView',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
   ChatBskyConvoGetConvoForMembers: {
     lexicon: 1,
     id: 'chat.bsky.convo.getConvoForMembers',
@@ -10544,6 +10676,7 @@ export const schemaDict = {
                   type: 'union',
                   refs: [
                     'lex:chat.bsky.convo.defs#logBeginConvo',
+                    'lex:chat.bsky.convo.defs#logAcceptConvo',
                     'lex:chat.bsky.convo.defs#logLeaveConvo',
                     'lex:chat.bsky.convo.defs#logCreateMessage',
                     'lex:chat.bsky.convo.defs#logDeleteMessage',
@@ -10659,6 +10792,14 @@ export const schemaDict = {
             cursor: {
               type: 'string',
             },
+            readState: {
+              type: 'string',
+              knownValues: ['unread'],
+            },
+            status: {
+              type: 'string',
+              knownValues: ['request', 'accepted'],
+            },
           },
         },
         output: {
@@ -11244,9 +11385,11 @@ export const ids = {
   ChatBskyActorDefs: 'chat.bsky.actor.defs',
   ChatBskyActorDeleteAccount: 'chat.bsky.actor.deleteAccount',
   ChatBskyActorExportAccountData: 'chat.bsky.actor.exportAccountData',
+  ChatBskyConvoAcceptConvo: 'chat.bsky.convo.acceptConvo',
   ChatBskyConvoDefs: 'chat.bsky.convo.defs',
   ChatBskyConvoDeleteMessageForSelf: 'chat.bsky.convo.deleteMessageForSelf',
   ChatBskyConvoGetConvo: 'chat.bsky.convo.getConvo',
+  ChatBskyConvoGetConvoAvailability: 'chat.bsky.convo.getConvoAvailability',
   ChatBskyConvoGetConvoForMembers: 'chat.bsky.convo.getConvoForMembers',
   ChatBskyConvoGetLog: 'chat.bsky.convo.getLog',
   ChatBskyConvoGetMessages: 'chat.bsky.convo.getMessages',
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/acceptConvo.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/acceptConvo.ts
new file mode 100644
index 00000000000..a3561b9f60a
--- /dev/null
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/acceptConvo.ts
@@ -0,0 +1,53 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.acceptConvo'
+
+export interface QueryParams {}
+
+export interface InputSchema {
+  convoId: string
+}
+
+export interface OutputSchema {
+  /** Rev when the convo was accepted. If not present, the convo was already accepted. */
+  rev?: string
+}
+
+export interface HandlerInput {
+  encoding: 'application/json'
+  body: InputSchema
+}
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+  resetRouteRateLimits: () => Promise<void>
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/defs.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/defs.ts
index 4d458fb798e..55faea002e2 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/defs.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/defs.ts
@@ -113,7 +113,7 @@ export interface ConvoView {
     | $Typed<DeletedMessageView>
     | { $type: string }
   muted: boolean
-  opened?: boolean
+  status?: 'request' | 'accepted' | (string & {})
   unreadCount: number
 }
 
@@ -143,6 +143,22 @@ export function validateLogBeginConvo<V>(v: V) {
   return validate<LogBeginConvo & V>(v, id, hashLogBeginConvo)
 }
 
+export interface LogAcceptConvo {
+  $type?: 'chat.bsky.convo.defs#logAcceptConvo'
+  rev: string
+  convoId: string
+}
+
+const hashLogAcceptConvo = 'logAcceptConvo'
+
+export function isLogAcceptConvo<V>(v: V) {
+  return is$typed(v, id, hashLogAcceptConvo)
+}
+
+export function validateLogAcceptConvo<V>(v: V) {
+  return validate<LogAcceptConvo & V>(v, id, hashLogAcceptConvo)
+}
+
 export interface LogLeaveConvo {
   $type?: 'chat.bsky.convo.defs#logLeaveConvo'
   rev: string
@@ -159,6 +175,38 @@ export function validateLogLeaveConvo<V>(v: V) {
   return validate<LogLeaveConvo & V>(v, id, hashLogLeaveConvo)
 }
 
+export interface LogMuteConvo {
+  $type?: 'chat.bsky.convo.defs#logMuteConvo'
+  rev: string
+  convoId: string
+}
+
+const hashLogMuteConvo = 'logMuteConvo'
+
+export function isLogMuteConvo<V>(v: V) {
+  return is$typed(v, id, hashLogMuteConvo)
+}
+
+export function validateLogMuteConvo<V>(v: V) {
+  return validate<LogMuteConvo & V>(v, id, hashLogMuteConvo)
+}
+
+export interface LogUnmuteConvo {
+  $type?: 'chat.bsky.convo.defs#logUnmuteConvo'
+  rev: string
+  convoId: string
+}
+
+const hashLogUnmuteConvo = 'logUnmuteConvo'
+
+export function isLogUnmuteConvo<V>(v: V) {
+  return is$typed(v, id, hashLogUnmuteConvo)
+}
+
+export function validateLogUnmuteConvo<V>(v: V) {
+  return validate<LogUnmuteConvo & V>(v, id, hashLogUnmuteConvo)
+}
+
 export interface LogCreateMessage {
   $type?: 'chat.bsky.convo.defs#logCreateMessage'
   rev: string
@@ -192,3 +240,20 @@ export function isLogDeleteMessage<V>(v: V) {
 export function validateLogDeleteMessage<V>(v: V) {
   return validate<LogDeleteMessage & V>(v, id, hashLogDeleteMessage)
 }
+
+export interface LogReadMessage {
+  $type?: 'chat.bsky.convo.defs#logReadMessage'
+  rev: string
+  convoId: string
+  message: $Typed<MessageView> | $Typed<DeletedMessageView> | { $type: string }
+}
+
+const hashLogReadMessage = 'logReadMessage'
+
+export function isLogReadMessage<V>(v: V) {
+  return is$typed(v, id, hashLogReadMessage)
+}
+
+export function validateLogReadMessage<V>(v: V) {
+  return validate<LogReadMessage & V>(v, id, hashLogReadMessage)
+}
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvoAvailability.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvoAvailability.ts
new file mode 100644
index 00000000000..03286f0f8ea
--- /dev/null
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvoAvailability.ts
@@ -0,0 +1,51 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.getConvoAvailability'
+
+export interface QueryParams {
+  members: string[]
+}
+
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  canChat: boolean
+  convo?: ChatBskyConvoDefs.ConvoView
+}
+
+export type HandlerInput = undefined
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+  resetRouteRateLimits: () => Promise<void>
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/getLog.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/getLog.ts
index d439c2eabfb..06c3c0d2fc7 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/getLog.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/getLog.ts
@@ -23,6 +23,7 @@ export interface OutputSchema {
   cursor?: string
   logs: (
     | $Typed<ChatBskyConvoDefs.LogBeginConvo>
+    | $Typed<ChatBskyConvoDefs.LogAcceptConvo>
     | $Typed<ChatBskyConvoDefs.LogLeaveConvo>
     | $Typed<ChatBskyConvoDefs.LogCreateMessage>
     | $Typed<ChatBskyConvoDefs.LogDeleteMessage>
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/listConvos.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/listConvos.ts
index 2db1d29308f..1b701f84f44 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/listConvos.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/listConvos.ts
@@ -16,6 +16,8 @@ const id = 'chat.bsky.convo.listConvos'
 export interface QueryParams {
   limit: number
   cursor?: string
+  readState?: 'unread' | (string & {})
+  status?: 'request' | 'accepted' | (string & {})
 }
 
 export type InputSchema = undefined
diff --git a/packages/ozone/src/lexicon/index.ts b/packages/ozone/src/lexicon/index.ts
index f04f5b3450d..436002a62ea 100644
--- a/packages/ozone/src/lexicon/index.ts
+++ b/packages/ozone/src/lexicon/index.ts
@@ -150,8 +150,10 @@ import * as AppBskyVideoGetUploadLimits from './types/app/bsky/video/getUploadLi
 import * as AppBskyVideoUploadVideo from './types/app/bsky/video/uploadVideo.js'
 import * as ChatBskyActorDeleteAccount from './types/chat/bsky/actor/deleteAccount.js'
 import * as ChatBskyActorExportAccountData from './types/chat/bsky/actor/exportAccountData.js'
+import * as ChatBskyConvoAcceptConvo from './types/chat/bsky/convo/acceptConvo.js'
 import * as ChatBskyConvoDeleteMessageForSelf from './types/chat/bsky/convo/deleteMessageForSelf.js'
 import * as ChatBskyConvoGetConvo from './types/chat/bsky/convo/getConvo.js'
+import * as ChatBskyConvoGetConvoAvailability from './types/chat/bsky/convo/getConvoAvailability.js'
 import * as ChatBskyConvoGetConvoForMembers from './types/chat/bsky/convo/getConvoForMembers.js'
 import * as ChatBskyConvoGetLog from './types/chat/bsky/convo/getLog.js'
 import * as ChatBskyConvoGetMessages from './types/chat/bsky/convo/getMessages.js'
@@ -2069,6 +2071,17 @@ export class ChatBskyConvoNS {
     this._server = server
   }
 
+  acceptConvo<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ChatBskyConvoAcceptConvo.Handler<ExtractAuth<AV>>,
+      ChatBskyConvoAcceptConvo.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'chat.bsky.convo.acceptConvo' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   deleteMessageForSelf<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,
@@ -2091,6 +2104,17 @@ export class ChatBskyConvoNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
+  getConvoAvailability<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ChatBskyConvoGetConvoAvailability.Handler<ExtractAuth<AV>>,
+      ChatBskyConvoGetConvoAvailability.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'chat.bsky.convo.getConvoAvailability' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   getConvoForMembers<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,
diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
index ef764694411..219e4daefea 100644
--- a/packages/ozone/src/lexicon/lexicons.ts
+++ b/packages/ozone/src/lexicon/lexicons.ts
@@ -10206,6 +10206,40 @@ export const schemaDict = {
       },
     },
   },
+  ChatBskyConvoAcceptConvo: {
+    lexicon: 1,
+    id: 'chat.bsky.convo.acceptConvo',
+    defs: {
+      main: {
+        type: 'procedure',
+        input: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['convoId'],
+            properties: {
+              convoId: {
+                type: 'string',
+              },
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            properties: {
+              rev: {
+                description:
+                  'Rev when the convo was accepted. If not present, the convo was already accepted.',
+                type: 'string',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
   ChatBskyConvoDefs: {
     lexicon: 1,
     id: 'chat.bsky.convo.defs',
@@ -10343,8 +10377,9 @@ export const schemaDict = {
           muted: {
             type: 'boolean',
           },
-          opened: {
-            type: 'boolean',
+          status: {
+            type: 'string',
+            knownValues: ['request', 'accepted'],
           },
           unreadCount: {
             type: 'integer',
@@ -10363,6 +10398,18 @@ export const schemaDict = {
           },
         },
       },
+      logAcceptConvo: {
+        type: 'object',
+        required: ['rev', 'convoId'],
+        properties: {
+          rev: {
+            type: 'string',
+          },
+          convoId: {
+            type: 'string',
+          },
+        },
+      },
       logLeaveConvo: {
         type: 'object',
         required: ['rev', 'convoId'],
@@ -10375,6 +10422,30 @@ export const schemaDict = {
           },
         },
       },
+      logMuteConvo: {
+        type: 'object',
+        required: ['rev', 'convoId'],
+        properties: {
+          rev: {
+            type: 'string',
+          },
+          convoId: {
+            type: 'string',
+          },
+        },
+      },
+      logUnmuteConvo: {
+        type: 'object',
+        required: ['rev', 'convoId'],
+        properties: {
+          rev: {
+            type: 'string',
+          },
+          convoId: {
+            type: 'string',
+          },
+        },
+      },
       logCreateMessage: {
         type: 'object',
         required: ['rev', 'convoId', 'message'],
@@ -10413,6 +10484,25 @@ export const schemaDict = {
           },
         },
       },
+      logReadMessage: {
+        type: 'object',
+        required: ['rev', 'convoId', 'message'],
+        properties: {
+          rev: {
+            type: 'string',
+          },
+          convoId: {
+            type: 'string',
+          },
+          message: {
+            type: 'union',
+            refs: [
+              'lex:chat.bsky.convo.defs#messageView',
+              'lex:chat.bsky.convo.defs#deletedMessageView',
+            ],
+          },
+        },
+      },
     },
   },
   ChatBskyConvoDeleteMessageForSelf: {
@@ -10477,6 +10567,48 @@ export const schemaDict = {
       },
     },
   },
+  ChatBskyConvoGetConvoAvailability: {
+    lexicon: 1,
+    id: 'chat.bsky.convo.getConvoAvailability',
+    defs: {
+      main: {
+        type: 'query',
+        description:
+          'Get whether the requester and the other members can chat. If an existing convo is found for these members, it is returned.',
+        parameters: {
+          type: 'params',
+          required: ['members'],
+          properties: {
+            members: {
+              type: 'array',
+              minLength: 1,
+              maxLength: 10,
+              items: {
+                type: 'string',
+                format: 'did',
+              },
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['canChat'],
+            properties: {
+              canChat: {
+                type: 'boolean',
+              },
+              convo: {
+                type: 'ref',
+                ref: 'lex:chat.bsky.convo.defs#convoView',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
   ChatBskyConvoGetConvoForMembers: {
     lexicon: 1,
     id: 'chat.bsky.convo.getConvoForMembers',
@@ -10544,6 +10676,7 @@ export const schemaDict = {
                   type: 'union',
                   refs: [
                     'lex:chat.bsky.convo.defs#logBeginConvo',
+                    'lex:chat.bsky.convo.defs#logAcceptConvo',
                     'lex:chat.bsky.convo.defs#logLeaveConvo',
                     'lex:chat.bsky.convo.defs#logCreateMessage',
                     'lex:chat.bsky.convo.defs#logDeleteMessage',
@@ -10659,6 +10792,14 @@ export const schemaDict = {
             cursor: {
               type: 'string',
             },
+            readState: {
+              type: 'string',
+              knownValues: ['unread'],
+            },
+            status: {
+              type: 'string',
+              knownValues: ['request', 'accepted'],
+            },
           },
         },
         output: {
@@ -14289,9 +14430,11 @@ export const ids = {
   ChatBskyActorDefs: 'chat.bsky.actor.defs',
   ChatBskyActorDeleteAccount: 'chat.bsky.actor.deleteAccount',
   ChatBskyActorExportAccountData: 'chat.bsky.actor.exportAccountData',
+  ChatBskyConvoAcceptConvo: 'chat.bsky.convo.acceptConvo',
   ChatBskyConvoDefs: 'chat.bsky.convo.defs',
   ChatBskyConvoDeleteMessageForSelf: 'chat.bsky.convo.deleteMessageForSelf',
   ChatBskyConvoGetConvo: 'chat.bsky.convo.getConvo',
+  ChatBskyConvoGetConvoAvailability: 'chat.bsky.convo.getConvoAvailability',
   ChatBskyConvoGetConvoForMembers: 'chat.bsky.convo.getConvoForMembers',
   ChatBskyConvoGetLog: 'chat.bsky.convo.getLog',
   ChatBskyConvoGetMessages: 'chat.bsky.convo.getMessages',
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/acceptConvo.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/acceptConvo.ts
new file mode 100644
index 00000000000..a3561b9f60a
--- /dev/null
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/acceptConvo.ts
@@ -0,0 +1,53 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.acceptConvo'
+
+export interface QueryParams {}
+
+export interface InputSchema {
+  convoId: string
+}
+
+export interface OutputSchema {
+  /** Rev when the convo was accepted. If not present, the convo was already accepted. */
+  rev?: string
+}
+
+export interface HandlerInput {
+  encoding: 'application/json'
+  body: InputSchema
+}
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+  resetRouteRateLimits: () => Promise<void>
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/defs.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/defs.ts
index 4d458fb798e..55faea002e2 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/defs.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/defs.ts
@@ -113,7 +113,7 @@ export interface ConvoView {
     | $Typed<DeletedMessageView>
     | { $type: string }
   muted: boolean
-  opened?: boolean
+  status?: 'request' | 'accepted' | (string & {})
   unreadCount: number
 }
 
@@ -143,6 +143,22 @@ export function validateLogBeginConvo<V>(v: V) {
   return validate<LogBeginConvo & V>(v, id, hashLogBeginConvo)
 }
 
+export interface LogAcceptConvo {
+  $type?: 'chat.bsky.convo.defs#logAcceptConvo'
+  rev: string
+  convoId: string
+}
+
+const hashLogAcceptConvo = 'logAcceptConvo'
+
+export function isLogAcceptConvo<V>(v: V) {
+  return is$typed(v, id, hashLogAcceptConvo)
+}
+
+export function validateLogAcceptConvo<V>(v: V) {
+  return validate<LogAcceptConvo & V>(v, id, hashLogAcceptConvo)
+}
+
 export interface LogLeaveConvo {
   $type?: 'chat.bsky.convo.defs#logLeaveConvo'
   rev: string
@@ -159,6 +175,38 @@ export function validateLogLeaveConvo<V>(v: V) {
   return validate<LogLeaveConvo & V>(v, id, hashLogLeaveConvo)
 }
 
+export interface LogMuteConvo {
+  $type?: 'chat.bsky.convo.defs#logMuteConvo'
+  rev: string
+  convoId: string
+}
+
+const hashLogMuteConvo = 'logMuteConvo'
+
+export function isLogMuteConvo<V>(v: V) {
+  return is$typed(v, id, hashLogMuteConvo)
+}
+
+export function validateLogMuteConvo<V>(v: V) {
+  return validate<LogMuteConvo & V>(v, id, hashLogMuteConvo)
+}
+
+export interface LogUnmuteConvo {
+  $type?: 'chat.bsky.convo.defs#logUnmuteConvo'
+  rev: string
+  convoId: string
+}
+
+const hashLogUnmuteConvo = 'logUnmuteConvo'
+
+export function isLogUnmuteConvo<V>(v: V) {
+  return is$typed(v, id, hashLogUnmuteConvo)
+}
+
+export function validateLogUnmuteConvo<V>(v: V) {
+  return validate<LogUnmuteConvo & V>(v, id, hashLogUnmuteConvo)
+}
+
 export interface LogCreateMessage {
   $type?: 'chat.bsky.convo.defs#logCreateMessage'
   rev: string
@@ -192,3 +240,20 @@ export function isLogDeleteMessage<V>(v: V) {
 export function validateLogDeleteMessage<V>(v: V) {
   return validate<LogDeleteMessage & V>(v, id, hashLogDeleteMessage)
 }
+
+export interface LogReadMessage {
+  $type?: 'chat.bsky.convo.defs#logReadMessage'
+  rev: string
+  convoId: string
+  message: $Typed<MessageView> | $Typed<DeletedMessageView> | { $type: string }
+}
+
+const hashLogReadMessage = 'logReadMessage'
+
+export function isLogReadMessage<V>(v: V) {
+  return is$typed(v, id, hashLogReadMessage)
+}
+
+export function validateLogReadMessage<V>(v: V) {
+  return validate<LogReadMessage & V>(v, id, hashLogReadMessage)
+}
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvoAvailability.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvoAvailability.ts
new file mode 100644
index 00000000000..03286f0f8ea
--- /dev/null
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvoAvailability.ts
@@ -0,0 +1,51 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.getConvoAvailability'
+
+export interface QueryParams {
+  members: string[]
+}
+
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  canChat: boolean
+  convo?: ChatBskyConvoDefs.ConvoView
+}
+
+export type HandlerInput = undefined
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+  resetRouteRateLimits: () => Promise<void>
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/getLog.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/getLog.ts
index d439c2eabfb..06c3c0d2fc7 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/getLog.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/getLog.ts
@@ -23,6 +23,7 @@ export interface OutputSchema {
   cursor?: string
   logs: (
     | $Typed<ChatBskyConvoDefs.LogBeginConvo>
+    | $Typed<ChatBskyConvoDefs.LogAcceptConvo>
     | $Typed<ChatBskyConvoDefs.LogLeaveConvo>
     | $Typed<ChatBskyConvoDefs.LogCreateMessage>
     | $Typed<ChatBskyConvoDefs.LogDeleteMessage>
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/listConvos.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/listConvos.ts
index 2db1d29308f..1b701f84f44 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/listConvos.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/listConvos.ts
@@ -16,6 +16,8 @@ const id = 'chat.bsky.convo.listConvos'
 export interface QueryParams {
   limit: number
   cursor?: string
+  readState?: 'unread' | (string & {})
+  status?: 'request' | 'accepted' | (string & {})
 }
 
 export type InputSchema = undefined
diff --git a/packages/pds/src/lexicon/index.ts b/packages/pds/src/lexicon/index.ts
index f04f5b3450d..436002a62ea 100644
--- a/packages/pds/src/lexicon/index.ts
+++ b/packages/pds/src/lexicon/index.ts
@@ -150,8 +150,10 @@ import * as AppBskyVideoGetUploadLimits from './types/app/bsky/video/getUploadLi
 import * as AppBskyVideoUploadVideo from './types/app/bsky/video/uploadVideo.js'
 import * as ChatBskyActorDeleteAccount from './types/chat/bsky/actor/deleteAccount.js'
 import * as ChatBskyActorExportAccountData from './types/chat/bsky/actor/exportAccountData.js'
+import * as ChatBskyConvoAcceptConvo from './types/chat/bsky/convo/acceptConvo.js'
 import * as ChatBskyConvoDeleteMessageForSelf from './types/chat/bsky/convo/deleteMessageForSelf.js'
 import * as ChatBskyConvoGetConvo from './types/chat/bsky/convo/getConvo.js'
+import * as ChatBskyConvoGetConvoAvailability from './types/chat/bsky/convo/getConvoAvailability.js'
 import * as ChatBskyConvoGetConvoForMembers from './types/chat/bsky/convo/getConvoForMembers.js'
 import * as ChatBskyConvoGetLog from './types/chat/bsky/convo/getLog.js'
 import * as ChatBskyConvoGetMessages from './types/chat/bsky/convo/getMessages.js'
@@ -2069,6 +2071,17 @@ export class ChatBskyConvoNS {
     this._server = server
   }
 
+  acceptConvo<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ChatBskyConvoAcceptConvo.Handler<ExtractAuth<AV>>,
+      ChatBskyConvoAcceptConvo.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'chat.bsky.convo.acceptConvo' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   deleteMessageForSelf<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,
@@ -2091,6 +2104,17 @@ export class ChatBskyConvoNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
+  getConvoAvailability<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ChatBskyConvoGetConvoAvailability.Handler<ExtractAuth<AV>>,
+      ChatBskyConvoGetConvoAvailability.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'chat.bsky.convo.getConvoAvailability' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   getConvoForMembers<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,
diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
index ef764694411..219e4daefea 100644
--- a/packages/pds/src/lexicon/lexicons.ts
+++ b/packages/pds/src/lexicon/lexicons.ts
@@ -10206,6 +10206,40 @@ export const schemaDict = {
       },
     },
   },
+  ChatBskyConvoAcceptConvo: {
+    lexicon: 1,
+    id: 'chat.bsky.convo.acceptConvo',
+    defs: {
+      main: {
+        type: 'procedure',
+        input: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['convoId'],
+            properties: {
+              convoId: {
+                type: 'string',
+              },
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            properties: {
+              rev: {
+                description:
+                  'Rev when the convo was accepted. If not present, the convo was already accepted.',
+                type: 'string',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
   ChatBskyConvoDefs: {
     lexicon: 1,
     id: 'chat.bsky.convo.defs',
@@ -10343,8 +10377,9 @@ export const schemaDict = {
           muted: {
             type: 'boolean',
           },
-          opened: {
-            type: 'boolean',
+          status: {
+            type: 'string',
+            knownValues: ['request', 'accepted'],
           },
           unreadCount: {
             type: 'integer',
@@ -10363,6 +10398,18 @@ export const schemaDict = {
           },
         },
       },
+      logAcceptConvo: {
+        type: 'object',
+        required: ['rev', 'convoId'],
+        properties: {
+          rev: {
+            type: 'string',
+          },
+          convoId: {
+            type: 'string',
+          },
+        },
+      },
       logLeaveConvo: {
         type: 'object',
         required: ['rev', 'convoId'],
@@ -10375,6 +10422,30 @@ export const schemaDict = {
           },
         },
       },
+      logMuteConvo: {
+        type: 'object',
+        required: ['rev', 'convoId'],
+        properties: {
+          rev: {
+            type: 'string',
+          },
+          convoId: {
+            type: 'string',
+          },
+        },
+      },
+      logUnmuteConvo: {
+        type: 'object',
+        required: ['rev', 'convoId'],
+        properties: {
+          rev: {
+            type: 'string',
+          },
+          convoId: {
+            type: 'string',
+          },
+        },
+      },
       logCreateMessage: {
         type: 'object',
         required: ['rev', 'convoId', 'message'],
@@ -10413,6 +10484,25 @@ export const schemaDict = {
           },
         },
       },
+      logReadMessage: {
+        type: 'object',
+        required: ['rev', 'convoId', 'message'],
+        properties: {
+          rev: {
+            type: 'string',
+          },
+          convoId: {
+            type: 'string',
+          },
+          message: {
+            type: 'union',
+            refs: [
+              'lex:chat.bsky.convo.defs#messageView',
+              'lex:chat.bsky.convo.defs#deletedMessageView',
+            ],
+          },
+        },
+      },
     },
   },
   ChatBskyConvoDeleteMessageForSelf: {
@@ -10477,6 +10567,48 @@ export const schemaDict = {
       },
     },
   },
+  ChatBskyConvoGetConvoAvailability: {
+    lexicon: 1,
+    id: 'chat.bsky.convo.getConvoAvailability',
+    defs: {
+      main: {
+        type: 'query',
+        description:
+          'Get whether the requester and the other members can chat. If an existing convo is found for these members, it is returned.',
+        parameters: {
+          type: 'params',
+          required: ['members'],
+          properties: {
+            members: {
+              type: 'array',
+              minLength: 1,
+              maxLength: 10,
+              items: {
+                type: 'string',
+                format: 'did',
+              },
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['canChat'],
+            properties: {
+              canChat: {
+                type: 'boolean',
+              },
+              convo: {
+                type: 'ref',
+                ref: 'lex:chat.bsky.convo.defs#convoView',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
   ChatBskyConvoGetConvoForMembers: {
     lexicon: 1,
     id: 'chat.bsky.convo.getConvoForMembers',
@@ -10544,6 +10676,7 @@ export const schemaDict = {
                   type: 'union',
                   refs: [
                     'lex:chat.bsky.convo.defs#logBeginConvo',
+                    'lex:chat.bsky.convo.defs#logAcceptConvo',
                     'lex:chat.bsky.convo.defs#logLeaveConvo',
                     'lex:chat.bsky.convo.defs#logCreateMessage',
                     'lex:chat.bsky.convo.defs#logDeleteMessage',
@@ -10659,6 +10792,14 @@ export const schemaDict = {
             cursor: {
               type: 'string',
             },
+            readState: {
+              type: 'string',
+              knownValues: ['unread'],
+            },
+            status: {
+              type: 'string',
+              knownValues: ['request', 'accepted'],
+            },
           },
         },
         output: {
@@ -14289,9 +14430,11 @@ export const ids = {
   ChatBskyActorDefs: 'chat.bsky.actor.defs',
   ChatBskyActorDeleteAccount: 'chat.bsky.actor.deleteAccount',
   ChatBskyActorExportAccountData: 'chat.bsky.actor.exportAccountData',
+  ChatBskyConvoAcceptConvo: 'chat.bsky.convo.acceptConvo',
   ChatBskyConvoDefs: 'chat.bsky.convo.defs',
   ChatBskyConvoDeleteMessageForSelf: 'chat.bsky.convo.deleteMessageForSelf',
   ChatBskyConvoGetConvo: 'chat.bsky.convo.getConvo',
+  ChatBskyConvoGetConvoAvailability: 'chat.bsky.convo.getConvoAvailability',
   ChatBskyConvoGetConvoForMembers: 'chat.bsky.convo.getConvoForMembers',
   ChatBskyConvoGetLog: 'chat.bsky.convo.getLog',
   ChatBskyConvoGetMessages: 'chat.bsky.convo.getMessages',
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/acceptConvo.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/acceptConvo.ts
new file mode 100644
index 00000000000..a3561b9f60a
--- /dev/null
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/acceptConvo.ts
@@ -0,0 +1,53 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.acceptConvo'
+
+export interface QueryParams {}
+
+export interface InputSchema {
+  convoId: string
+}
+
+export interface OutputSchema {
+  /** Rev when the convo was accepted. If not present, the convo was already accepted. */
+  rev?: string
+}
+
+export interface HandlerInput {
+  encoding: 'application/json'
+  body: InputSchema
+}
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+  resetRouteRateLimits: () => Promise<void>
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/defs.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/defs.ts
index 4d458fb798e..55faea002e2 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/defs.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/defs.ts
@@ -113,7 +113,7 @@ export interface ConvoView {
     | $Typed<DeletedMessageView>
     | { $type: string }
   muted: boolean
-  opened?: boolean
+  status?: 'request' | 'accepted' | (string & {})
   unreadCount: number
 }
 
@@ -143,6 +143,22 @@ export function validateLogBeginConvo<V>(v: V) {
   return validate<LogBeginConvo & V>(v, id, hashLogBeginConvo)
 }
 
+export interface LogAcceptConvo {
+  $type?: 'chat.bsky.convo.defs#logAcceptConvo'
+  rev: string
+  convoId: string
+}
+
+const hashLogAcceptConvo = 'logAcceptConvo'
+
+export function isLogAcceptConvo<V>(v: V) {
+  return is$typed(v, id, hashLogAcceptConvo)
+}
+
+export function validateLogAcceptConvo<V>(v: V) {
+  return validate<LogAcceptConvo & V>(v, id, hashLogAcceptConvo)
+}
+
 export interface LogLeaveConvo {
   $type?: 'chat.bsky.convo.defs#logLeaveConvo'
   rev: string
@@ -159,6 +175,38 @@ export function validateLogLeaveConvo<V>(v: V) {
   return validate<LogLeaveConvo & V>(v, id, hashLogLeaveConvo)
 }
 
+export interface LogMuteConvo {
+  $type?: 'chat.bsky.convo.defs#logMuteConvo'
+  rev: string
+  convoId: string
+}
+
+const hashLogMuteConvo = 'logMuteConvo'
+
+export function isLogMuteConvo<V>(v: V) {
+  return is$typed(v, id, hashLogMuteConvo)
+}
+
+export function validateLogMuteConvo<V>(v: V) {
+  return validate<LogMuteConvo & V>(v, id, hashLogMuteConvo)
+}
+
+export interface LogUnmuteConvo {
+  $type?: 'chat.bsky.convo.defs#logUnmuteConvo'
+  rev: string
+  convoId: string
+}
+
+const hashLogUnmuteConvo = 'logUnmuteConvo'
+
+export function isLogUnmuteConvo<V>(v: V) {
+  return is$typed(v, id, hashLogUnmuteConvo)
+}
+
+export function validateLogUnmuteConvo<V>(v: V) {
+  return validate<LogUnmuteConvo & V>(v, id, hashLogUnmuteConvo)
+}
+
 export interface LogCreateMessage {
   $type?: 'chat.bsky.convo.defs#logCreateMessage'
   rev: string
@@ -192,3 +240,20 @@ export function isLogDeleteMessage<V>(v: V) {
 export function validateLogDeleteMessage<V>(v: V) {
   return validate<LogDeleteMessage & V>(v, id, hashLogDeleteMessage)
 }
+
+export interface LogReadMessage {
+  $type?: 'chat.bsky.convo.defs#logReadMessage'
+  rev: string
+  convoId: string
+  message: $Typed<MessageView> | $Typed<DeletedMessageView> | { $type: string }
+}
+
+const hashLogReadMessage = 'logReadMessage'
+
+export function isLogReadMessage<V>(v: V) {
+  return is$typed(v, id, hashLogReadMessage)
+}
+
+export function validateLogReadMessage<V>(v: V) {
+  return validate<LogReadMessage & V>(v, id, hashLogReadMessage)
+}
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/getConvoAvailability.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/getConvoAvailability.ts
new file mode 100644
index 00000000000..03286f0f8ea
--- /dev/null
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/getConvoAvailability.ts
@@ -0,0 +1,51 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+import type * as ChatBskyConvoDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.getConvoAvailability'
+
+export interface QueryParams {
+  members: string[]
+}
+
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  canChat: boolean
+  convo?: ChatBskyConvoDefs.ConvoView
+}
+
+export type HandlerInput = undefined
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+  resetRouteRateLimits: () => Promise<void>
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/getLog.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/getLog.ts
index d439c2eabfb..06c3c0d2fc7 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/getLog.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/getLog.ts
@@ -23,6 +23,7 @@ export interface OutputSchema {
   cursor?: string
   logs: (
     | $Typed<ChatBskyConvoDefs.LogBeginConvo>
+    | $Typed<ChatBskyConvoDefs.LogAcceptConvo>
     | $Typed<ChatBskyConvoDefs.LogLeaveConvo>
     | $Typed<ChatBskyConvoDefs.LogCreateMessage>
     | $Typed<ChatBskyConvoDefs.LogDeleteMessage>
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/listConvos.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/listConvos.ts
index 2db1d29308f..1b701f84f44 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/listConvos.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/listConvos.ts
@@ -16,6 +16,8 @@ const id = 'chat.bsky.convo.listConvos'
 export interface QueryParams {
   limit: number
   cursor?: string
+  readState?: 'unread' | (string & {})
+  status?: 'request' | 'accepted' | (string & {})
 }
 
 export type InputSchema = undefined

From 36ad5b1e82dcfa2e45b51d2964acd4d193657e4d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 21 Feb 2025 11:22:50 -0300
Subject: [PATCH 081/101] Version packages (#3563)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/neat-colts-build.md |  5 -----
 .changeset/perfect-jars-act.md |  5 -----
 packages/api/CHANGELOG.md      |  8 ++++++++
 packages/api/package.json      |  2 +-
 packages/bsky/CHANGELOG.md     |  7 +++++++
 packages/bsky/package.json     |  2 +-
 packages/dev-env/CHANGELOG.md  | 10 ++++++++++
 packages/dev-env/package.json  |  2 +-
 packages/ozone/CHANGELOG.md    |  7 +++++++
 packages/ozone/package.json    |  2 +-
 packages/pds/CHANGELOG.md      |  7 +++++++
 packages/pds/package.json      |  2 +-
 12 files changed, 44 insertions(+), 15 deletions(-)
 delete mode 100644 .changeset/neat-colts-build.md
 delete mode 100644 .changeset/perfect-jars-act.md

diff --git a/.changeset/neat-colts-build.md b/.changeset/neat-colts-build.md
deleted file mode 100644
index 014b09f2134..00000000000
--- a/.changeset/neat-colts-build.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/api": patch
----
-
-Update chat lexicons
diff --git a/.changeset/perfect-jars-act.md b/.changeset/perfect-jars-act.md
deleted file mode 100644
index 82c3e916afe..00000000000
--- a/.changeset/perfect-jars-act.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/api": patch
----
-
-set 'tid' and 'record-key' formats on com.atproto.sync and com.atproto.repo lexicons
diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md
index 2d0ae9e7ecc..33ae8975725 100644
--- a/packages/api/CHANGELOG.md
+++ b/packages/api/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @atproto/api
 
+## 0.14.3
+
+### Patch Changes
+
+- [#3564](https://github.com/bluesky-social/atproto/pull/3564) [`22af31a89`](https://github.com/bluesky-social/atproto/commit/22af31a898476c5e317aea263af366bddda120d6) Thanks [@rafaelbsky](https://github.com/rafaelbsky)! - Update chat lexicons
+
+- [#2378](https://github.com/bluesky-social/atproto/pull/2378) [`01874c4be`](https://github.com/bluesky-social/atproto/commit/01874c4be73a41ffb8fe28378f674949aa2c938f) Thanks [@bnewbold](https://github.com/bnewbold)! - set 'tid' and 'record-key' formats on com.atproto.sync and com.atproto.repo lexicons
+
 ## 0.14.2
 
 ### Patch Changes
diff --git a/packages/api/package.json b/packages/api/package.json
index 87cb2cfec06..f28d7c8b4df 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/api",
-  "version": "0.14.2",
+  "version": "0.14.3",
   "license": "MIT",
   "description": "Client library for atproto and Bluesky",
   "keywords": [
diff --git a/packages/bsky/CHANGELOG.md b/packages/bsky/CHANGELOG.md
index 18c4700bd08..25409654d28 100644
--- a/packages/bsky/CHANGELOG.md
+++ b/packages/bsky/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/bsky
 
+## 0.0.120
+
+### Patch Changes
+
+- Updated dependencies [[`22af31a89`](https://github.com/bluesky-social/atproto/commit/22af31a898476c5e317aea263af366bddda120d6), [`01874c4be`](https://github.com/bluesky-social/atproto/commit/01874c4be73a41ffb8fe28378f674949aa2c938f)]:
+  - @atproto/api@0.14.3
+
 ## 0.0.119
 
 ### Patch Changes
diff --git a/packages/bsky/package.json b/packages/bsky/package.json
index 90101261037..6d7d86b8a66 100644
--- a/packages/bsky/package.json
+++ b/packages/bsky/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.119",
+  "version": "0.0.120",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
diff --git a/packages/dev-env/CHANGELOG.md b/packages/dev-env/CHANGELOG.md
index fee59ac7f30..e3be39d9265 100644
--- a/packages/dev-env/CHANGELOG.md
+++ b/packages/dev-env/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @atproto/dev-env
 
+## 0.3.92
+
+### Patch Changes
+
+- Updated dependencies [[`22af31a89`](https://github.com/bluesky-social/atproto/commit/22af31a898476c5e317aea263af366bddda120d6), [`01874c4be`](https://github.com/bluesky-social/atproto/commit/01874c4be73a41ffb8fe28378f674949aa2c938f)]:
+  - @atproto/api@0.14.3
+  - @atproto/bsky@0.0.120
+  - @atproto/ozone@0.1.82
+  - @atproto/pds@0.4.99
+
 ## 0.3.91
 
 ### Patch Changes
diff --git a/packages/dev-env/package.json b/packages/dev-env/package.json
index 1c8cc9494bd..d84580ded14 100644
--- a/packages/dev-env/package.json
+++ b/packages/dev-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/dev-env",
-  "version": "0.3.91",
+  "version": "0.3.92",
   "license": "MIT",
   "description": "Local development environment helper for atproto development",
   "keywords": [
diff --git a/packages/ozone/CHANGELOG.md b/packages/ozone/CHANGELOG.md
index a6faf931bbb..1b4883a274f 100644
--- a/packages/ozone/CHANGELOG.md
+++ b/packages/ozone/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/ozone
 
+## 0.1.82
+
+### Patch Changes
+
+- Updated dependencies [[`22af31a89`](https://github.com/bluesky-social/atproto/commit/22af31a898476c5e317aea263af366bddda120d6), [`01874c4be`](https://github.com/bluesky-social/atproto/commit/01874c4be73a41ffb8fe28378f674949aa2c938f)]:
+  - @atproto/api@0.14.3
+
 ## 0.1.81
 
 ### Patch Changes
diff --git a/packages/ozone/package.json b/packages/ozone/package.json
index 33b8ac42861..2c04712d122 100644
--- a/packages/ozone/package.json
+++ b/packages/ozone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.1.81",
+  "version": "0.1.82",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
diff --git a/packages/pds/CHANGELOG.md b/packages/pds/CHANGELOG.md
index 613ac3fca5c..ad873ba1be9 100644
--- a/packages/pds/CHANGELOG.md
+++ b/packages/pds/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/pds
 
+## 0.4.99
+
+### Patch Changes
+
+- Updated dependencies [[`22af31a89`](https://github.com/bluesky-social/atproto/commit/22af31a898476c5e317aea263af366bddda120d6), [`01874c4be`](https://github.com/bluesky-social/atproto/commit/01874c4be73a41ffb8fe28378f674949aa2c938f)]:
+  - @atproto/api@0.14.3
+
 ## 0.4.98
 
 ### Patch Changes
diff --git a/packages/pds/package.json b/packages/pds/package.json
index 7f4056410b5..b595b4c1a38 100644
--- a/packages/pds/package.json
+++ b/packages/pds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/pds",
-  "version": "0.4.98",
+  "version": "0.4.99",
   "license": "MIT",
   "description": "Reference implementation of atproto Personal Data Server (PDS)",
   "keywords": [

From b9cb049d940cc706681142ef498238f74e2f539c Mon Sep 17 00:00:00 2001
From: Foysal Ahamed <foysal@blueskyweb.xyz>
Date: Fri, 21 Feb 2025 16:11:17 +0000
Subject: [PATCH 082/101] :bug: Add missing divert event to list of events on
 emitEvent (#3561)

* :bug: Add missing divert event to list of events on emitEvent

* :recycle: Clean up

* :memo: Add changeset
---
 .changeset/odd-goats-kick.md                           |  7 +++++++
 lexicons/tools/ozone/moderation/emitEvent.json         |  1 +
 packages/api/src/client/lexicons.ts                    |  1 +
 .../client/types/tools/ozone/moderation/emitEvent.ts   |  1 +
 packages/ozone/src/api/moderation/emitEvent.ts         | 10 ++++------
 packages/ozone/src/lexicon/lexicons.ts                 |  1 +
 .../lexicon/types/tools/ozone/moderation/emitEvent.ts  |  1 +
 packages/pds/src/lexicon/lexicons.ts                   |  1 +
 .../lexicon/types/tools/ozone/moderation/emitEvent.ts  |  1 +
 9 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 .changeset/odd-goats-kick.md

diff --git a/.changeset/odd-goats-kick.md b/.changeset/odd-goats-kick.md
new file mode 100644
index 00000000000..bf461d19249
--- /dev/null
+++ b/.changeset/odd-goats-kick.md
@@ -0,0 +1,7 @@
+---
+"@atproto/ozone": patch
+"@atproto/api": patch
+"@atproto/pds": patch
+---
+
+Add Divert event to the list of allowed ozone events
diff --git a/lexicons/tools/ozone/moderation/emitEvent.json b/lexicons/tools/ozone/moderation/emitEvent.json
index 63335d06cd9..02c781b63fa 100644
--- a/lexicons/tools/ozone/moderation/emitEvent.json
+++ b/lexicons/tools/ozone/moderation/emitEvent.json
@@ -27,6 +27,7 @@
                 "tools.ozone.moderation.defs#modEventReverseTakedown",
                 "tools.ozone.moderation.defs#modEventResolveAppeal",
                 "tools.ozone.moderation.defs#modEventEmail",
+                "tools.ozone.moderation.defs#modEventDivert",
                 "tools.ozone.moderation.defs#modEventTag",
                 "tools.ozone.moderation.defs#accountEvent",
                 "tools.ozone.moderation.defs#identityEvent",
diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
index 219e4daefea..f69259304a7 100644
--- a/packages/api/src/client/lexicons.ts
+++ b/packages/api/src/client/lexicons.ts
@@ -12528,6 +12528,7 @@ export const schemaDict = {
                   'lex:tools.ozone.moderation.defs#modEventReverseTakedown',
                   'lex:tools.ozone.moderation.defs#modEventResolveAppeal',
                   'lex:tools.ozone.moderation.defs#modEventEmail',
+                  'lex:tools.ozone.moderation.defs#modEventDivert',
                   'lex:tools.ozone.moderation.defs#modEventTag',
                   'lex:tools.ozone.moderation.defs#accountEvent',
                   'lex:tools.ozone.moderation.defs#identityEvent',
diff --git a/packages/api/src/client/types/tools/ozone/moderation/emitEvent.ts b/packages/api/src/client/types/tools/ozone/moderation/emitEvent.ts
index e503cab4773..1a2e4626c2c 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/emitEvent.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/emitEvent.ts
@@ -31,6 +31,7 @@ export interface InputSchema {
     | $Typed<ToolsOzoneModerationDefs.ModEventReverseTakedown>
     | $Typed<ToolsOzoneModerationDefs.ModEventResolveAppeal>
     | $Typed<ToolsOzoneModerationDefs.ModEventEmail>
+    | $Typed<ToolsOzoneModerationDefs.ModEventDivert>
     | $Typed<ToolsOzoneModerationDefs.ModEventTag>
     | $Typed<ToolsOzoneModerationDefs.AccountEvent>
     | $Typed<ToolsOzoneModerationDefs.IdentityEvent>
diff --git a/packages/ozone/src/api/moderation/emitEvent.ts b/packages/ozone/src/api/moderation/emitEvent.ts
index d978cde3ac1..7a2f1ae421e 100644
--- a/packages/ozone/src/api/moderation/emitEvent.ts
+++ b/packages/ozone/src/api/moderation/emitEvent.ts
@@ -1,3 +1,4 @@
+import { isModEventDivert } from '@atproto/api/dist/client/types/tools/ozone/moderation/defs'
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
 import { AdminTokenOutput, ModeratorOutput } from '../../auth-verifier'
 import { AppContext } from '../../context'
@@ -13,10 +14,8 @@ import {
   isModEventTag,
   isModEventTakedown,
   isModEventUnmuteReporter,
-  validateModEventDivert,
 } from '../../lexicon/types/tools/ozone/moderation/defs'
 import { HandlerInput } from '../../lexicon/types/tools/ozone/moderation/emitEvent'
-import { asPredicate } from '../../lexicon/util'
 import { subjectFromInput } from '../../mod-service/subject'
 import { ProtectedTagSettingKey } from '../../setting/constants'
 import { SettingService } from '../../setting/service'
@@ -25,8 +24,6 @@ import { TagService } from '../../tag-service'
 import { getTagForReport } from '../../tag-service/util'
 import { retryHttp } from '../../util'
 
-const isValidModEventDivert = asPredicate(validateModEventDivert)
-
 const handleModerationEvent = async ({
   ctx,
   input,
@@ -130,7 +127,7 @@ const handleModerationEvent = async ({
     )
   }
 
-  if (isValidModEventDivert(event) && subject.isRecord()) {
+  if (isModEventDivert(event) && subject.isRecord()) {
     if (!ctx.blobDiverter) {
       throw new InvalidRequestError(
         'BlobDiverter not configured for this service',
@@ -165,6 +162,7 @@ const handleModerationEvent = async ({
       ctx.cfg.service.did,
       moderationTxn,
     )
+
     const initialTags = isModEventReport(event)
       ? [getTagForReport(event.reportType)]
       : undefined
@@ -231,7 +229,7 @@ export default function (server: Server, ctx: AppContext) {
       })
 
       // On divert events, we need to automatically take down the blobs
-      if (isValidModEventDivert(input.body.event)) {
+      if (isModEventDivert(input.body.event)) {
         await handleModerationEvent({
           auth,
           ctx,
diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
index 219e4daefea..f69259304a7 100644
--- a/packages/ozone/src/lexicon/lexicons.ts
+++ b/packages/ozone/src/lexicon/lexicons.ts
@@ -12528,6 +12528,7 @@ export const schemaDict = {
                   'lex:tools.ozone.moderation.defs#modEventReverseTakedown',
                   'lex:tools.ozone.moderation.defs#modEventResolveAppeal',
                   'lex:tools.ozone.moderation.defs#modEventEmail',
+                  'lex:tools.ozone.moderation.defs#modEventDivert',
                   'lex:tools.ozone.moderation.defs#modEventTag',
                   'lex:tools.ozone.moderation.defs#accountEvent',
                   'lex:tools.ozone.moderation.defs#identityEvent',
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/emitEvent.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
index 1fa8d586491..7400b974c0a 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
@@ -32,6 +32,7 @@ export interface InputSchema {
     | $Typed<ToolsOzoneModerationDefs.ModEventReverseTakedown>
     | $Typed<ToolsOzoneModerationDefs.ModEventResolveAppeal>
     | $Typed<ToolsOzoneModerationDefs.ModEventEmail>
+    | $Typed<ToolsOzoneModerationDefs.ModEventDivert>
     | $Typed<ToolsOzoneModerationDefs.ModEventTag>
     | $Typed<ToolsOzoneModerationDefs.AccountEvent>
     | $Typed<ToolsOzoneModerationDefs.IdentityEvent>
diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
index 219e4daefea..f69259304a7 100644
--- a/packages/pds/src/lexicon/lexicons.ts
+++ b/packages/pds/src/lexicon/lexicons.ts
@@ -12528,6 +12528,7 @@ export const schemaDict = {
                   'lex:tools.ozone.moderation.defs#modEventReverseTakedown',
                   'lex:tools.ozone.moderation.defs#modEventResolveAppeal',
                   'lex:tools.ozone.moderation.defs#modEventEmail',
+                  'lex:tools.ozone.moderation.defs#modEventDivert',
                   'lex:tools.ozone.moderation.defs#modEventTag',
                   'lex:tools.ozone.moderation.defs#accountEvent',
                   'lex:tools.ozone.moderation.defs#identityEvent',
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/emitEvent.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
index 1fa8d586491..7400b974c0a 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
@@ -32,6 +32,7 @@ export interface InputSchema {
     | $Typed<ToolsOzoneModerationDefs.ModEventReverseTakedown>
     | $Typed<ToolsOzoneModerationDefs.ModEventResolveAppeal>
     | $Typed<ToolsOzoneModerationDefs.ModEventEmail>
+    | $Typed<ToolsOzoneModerationDefs.ModEventDivert>
     | $Typed<ToolsOzoneModerationDefs.ModEventTag>
     | $Typed<ToolsOzoneModerationDefs.AccountEvent>
     | $Typed<ToolsOzoneModerationDefs.IdentityEvent>

From 27bff80a98f1358719341fff71979f64569c5004 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 21 Feb 2025 16:42:38 +0000
Subject: [PATCH 083/101] Version packages (#3565)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/odd-goats-kick.md  |  7 -------
 packages/api/CHANGELOG.md     |  6 ++++++
 packages/api/package.json     |  2 +-
 packages/bsky/CHANGELOG.md    |  7 +++++++
 packages/bsky/package.json    |  2 +-
 packages/dev-env/CHANGELOG.md | 10 ++++++++++
 packages/dev-env/package.json |  2 +-
 packages/ozone/CHANGELOG.md   |  9 +++++++++
 packages/ozone/package.json   |  2 +-
 packages/pds/CHANGELOG.md     |  9 +++++++++
 packages/pds/package.json     |  2 +-
 11 files changed, 46 insertions(+), 12 deletions(-)
 delete mode 100644 .changeset/odd-goats-kick.md

diff --git a/.changeset/odd-goats-kick.md b/.changeset/odd-goats-kick.md
deleted file mode 100644
index bf461d19249..00000000000
--- a/.changeset/odd-goats-kick.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-"@atproto/ozone": patch
-"@atproto/api": patch
-"@atproto/pds": patch
----
-
-Add Divert event to the list of allowed ozone events
diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md
index 33ae8975725..85f9d71f572 100644
--- a/packages/api/CHANGELOG.md
+++ b/packages/api/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @atproto/api
 
+## 0.14.4
+
+### Patch Changes
+
+- [#3561](https://github.com/bluesky-social/atproto/pull/3561) [`b9cb049d9`](https://github.com/bluesky-social/atproto/commit/b9cb049d940cc706681142ef498238f74e2f539c) Thanks [@foysalit](https://github.com/foysalit)! - Add Divert event to the list of allowed ozone events
+
 ## 0.14.3
 
 ### Patch Changes
diff --git a/packages/api/package.json b/packages/api/package.json
index f28d7c8b4df..dc18b632d3f 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/api",
-  "version": "0.14.3",
+  "version": "0.14.4",
   "license": "MIT",
   "description": "Client library for atproto and Bluesky",
   "keywords": [
diff --git a/packages/bsky/CHANGELOG.md b/packages/bsky/CHANGELOG.md
index 25409654d28..5500cf967ea 100644
--- a/packages/bsky/CHANGELOG.md
+++ b/packages/bsky/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/bsky
 
+## 0.0.121
+
+### Patch Changes
+
+- Updated dependencies [[`b9cb049d9`](https://github.com/bluesky-social/atproto/commit/b9cb049d940cc706681142ef498238f74e2f539c)]:
+  - @atproto/api@0.14.4
+
 ## 0.0.120
 
 ### Patch Changes
diff --git a/packages/bsky/package.json b/packages/bsky/package.json
index 6d7d86b8a66..11388cea87b 100644
--- a/packages/bsky/package.json
+++ b/packages/bsky/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.120",
+  "version": "0.0.121",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
diff --git a/packages/dev-env/CHANGELOG.md b/packages/dev-env/CHANGELOG.md
index e3be39d9265..f4b5f2ceb71 100644
--- a/packages/dev-env/CHANGELOG.md
+++ b/packages/dev-env/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @atproto/dev-env
 
+## 0.3.93
+
+### Patch Changes
+
+- Updated dependencies [[`b9cb049d9`](https://github.com/bluesky-social/atproto/commit/b9cb049d940cc706681142ef498238f74e2f539c)]:
+  - @atproto/ozone@0.1.83
+  - @atproto/api@0.14.4
+  - @atproto/pds@0.4.100
+  - @atproto/bsky@0.0.121
+
 ## 0.3.92
 
 ### Patch Changes
diff --git a/packages/dev-env/package.json b/packages/dev-env/package.json
index d84580ded14..38e507d04a7 100644
--- a/packages/dev-env/package.json
+++ b/packages/dev-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/dev-env",
-  "version": "0.3.92",
+  "version": "0.3.93",
   "license": "MIT",
   "description": "Local development environment helper for atproto development",
   "keywords": [
diff --git a/packages/ozone/CHANGELOG.md b/packages/ozone/CHANGELOG.md
index 1b4883a274f..6a327f67c54 100644
--- a/packages/ozone/CHANGELOG.md
+++ b/packages/ozone/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @atproto/ozone
 
+## 0.1.83
+
+### Patch Changes
+
+- [#3561](https://github.com/bluesky-social/atproto/pull/3561) [`b9cb049d9`](https://github.com/bluesky-social/atproto/commit/b9cb049d940cc706681142ef498238f74e2f539c) Thanks [@foysalit](https://github.com/foysalit)! - Add Divert event to the list of allowed ozone events
+
+- Updated dependencies [[`b9cb049d9`](https://github.com/bluesky-social/atproto/commit/b9cb049d940cc706681142ef498238f74e2f539c)]:
+  - @atproto/api@0.14.4
+
 ## 0.1.82
 
 ### Patch Changes
diff --git a/packages/ozone/package.json b/packages/ozone/package.json
index 2c04712d122..05fb2565c44 100644
--- a/packages/ozone/package.json
+++ b/packages/ozone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.1.82",
+  "version": "0.1.83",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
diff --git a/packages/pds/CHANGELOG.md b/packages/pds/CHANGELOG.md
index ad873ba1be9..d5bf78427bf 100644
--- a/packages/pds/CHANGELOG.md
+++ b/packages/pds/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @atproto/pds
 
+## 0.4.100
+
+### Patch Changes
+
+- [#3561](https://github.com/bluesky-social/atproto/pull/3561) [`b9cb049d9`](https://github.com/bluesky-social/atproto/commit/b9cb049d940cc706681142ef498238f74e2f539c) Thanks [@foysalit](https://github.com/foysalit)! - Add Divert event to the list of allowed ozone events
+
+- Updated dependencies [[`b9cb049d9`](https://github.com/bluesky-social/atproto/commit/b9cb049d940cc706681142ef498238f74e2f539c)]:
+  - @atproto/api@0.14.4
+
 ## 0.4.99
 
 ### Patch Changes
diff --git a/packages/pds/package.json b/packages/pds/package.json
index b595b4c1a38..30fae1f9279 100644
--- a/packages/pds/package.json
+++ b/packages/pds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/pds",
-  "version": "0.4.99",
+  "version": "0.4.100",
   "license": "MIT",
   "description": "Reference implementation of atproto Personal Data Server (PDS)",
   "keywords": [

From 7e3678c089d2faa1a884a52a4fb80b8116c9854f Mon Sep 17 00:00:00 2001
From: Daniel Holmgren <dtholmgren@gmail.com>
Date: Fri, 21 Feb 2025 15:01:08 -0600
Subject: [PATCH 084/101] Send prevs on firehose (#3449)

* schema

* reset rate limit codegen

* codegen

* send prev cids on firehose

* fix test

* fix some test compiler errors & add experimental note

* fix linting

* build branch

* add prevData to commit event

* fix cbor undefined err

* add sibling proofs to relevant blocks

* bump depth of obj in test

* fix bug on right sibling proof & add some tests

* another test

* refactor proof construction

* more tests

* factor into fixtures

* fix styles in json

* lint: import ordering

* pr feedback

* add invertible op test

* remove prev from outgoing events

* return to original proof construction

* dont build branch

* changeset
---
 .changeset/kind-buttons-worry.md              |   7 +
 lexicons/com/atproto/sync/subscribeRepos.json |  14 +-
 packages/api/src/client/lexicons.ts           |  17 +-
 .../types/com/atproto/sync/subscribeRepos.ts  |   6 +-
 packages/bsky/src/lexicon/lexicons.ts         |  17 +-
 .../types/com/atproto/sync/subscribeRepos.ts  |   6 +-
 .../bsky/tests/data-plane/indexing.test.ts    |   6 +-
 .../tests/data-plane/subscription.test.ts     |   8 +-
 packages/ozone/src/lexicon/lexicons.ts        |  17 +-
 .../types/com/atproto/sync/subscribeRepos.ts  |   6 +-
 .../pds/src/actor-store/repo/transactor.ts    |  68 +++--
 packages/pds/src/actor-store/repo/util.ts     |  22 ++
 .../src/api/com/atproto/repo/applyWrites.ts   |   2 +-
 .../src/api/com/atproto/repo/createRecord.ts  |  59 ++--
 .../src/api/com/atproto/repo/deleteRecord.ts  |   2 +-
 .../pds/src/api/com/atproto/repo/putRecord.ts |   6 +-
 .../api/com/atproto/server/activateAccount.ts |   5 +-
 .../api/com/atproto/server/createAccount.ts   |   2 +-
 packages/pds/src/index.ts                     |   2 +-
 packages/pds/src/lexicon/lexicons.ts          |  17 +-
 .../types/com/atproto/sync/subscribeRepos.ts  |   6 +-
 packages/pds/src/repo/types.ts                |  15 +-
 packages/pds/src/scripts/rebuild-repo.ts      |   5 +-
 packages/pds/src/sequencer/events.ts          |  84 +++---
 packages/pds/src/sequencer/sequencer.ts       |   8 +-
 packages/pds/tests/crud.test.ts               |   2 +-
 packages/pds/tests/sequencer.test.ts          |   6 +-
 .../pds/tests/sync/invertible-ops.test.ts     | 104 +++++++
 packages/repo/src/block-map.ts                |   9 +-
 packages/repo/src/mst/mst.ts                  | 112 +++++++-
 packages/repo/src/repo.ts                     |  11 +-
 packages/repo/tests/_keys.ts                  | 156 +++++++++++
 .../repo/tests/commit-proof-fixtures.json     |  96 +++++++
 packages/repo/tests/commit-proofs.test.ts     |  63 +++++
 packages/repo/tests/covering-proofs.test.ts   | 256 ++++++++++++++++++
 35 files changed, 1029 insertions(+), 193 deletions(-)
 create mode 100644 .changeset/kind-buttons-worry.md
 create mode 100644 packages/pds/src/actor-store/repo/util.ts
 create mode 100644 packages/pds/tests/sync/invertible-ops.test.ts
 create mode 100644 packages/repo/tests/_keys.ts
 create mode 100644 packages/repo/tests/commit-proof-fixtures.json
 create mode 100644 packages/repo/tests/commit-proofs.test.ts
 create mode 100644 packages/repo/tests/covering-proofs.test.ts

diff --git a/.changeset/kind-buttons-worry.md b/.changeset/kind-buttons-worry.md
new file mode 100644
index 00000000000..2cc8c7d1ee9
--- /dev/null
+++ b/.changeset/kind-buttons-worry.md
@@ -0,0 +1,7 @@
+---
+"@atproto/repo": minor
+"@atproto/api": patch
+"@atproto/pds": patch
+---
+
+Updated subscribeRepo to include prev CIDs for operations and covering proofs for all ops.
diff --git a/lexicons/com/atproto/sync/subscribeRepos.json b/lexicons/com/atproto/sync/subscribeRepos.json
index 07640f9599f..c92373dd2c9 100644
--- a/lexicons/com/atproto/sync/subscribeRepos.json
+++ b/lexicons/com/atproto/sync/subscribeRepos.json
@@ -52,7 +52,7 @@
         "blobs",
         "time"
       ],
-      "nullable": ["prev", "since"],
+      "nullable": ["since"],
       "properties": {
         "seq": {
           "type": "integer",
@@ -72,10 +72,6 @@
           "type": "cid-link",
           "description": "Repo commit object CID."
         },
-        "prev": {
-          "type": "cid-link",
-          "description": "DEPRECATED -- unused. WARNING -- nullable and optional; stick with optional to ensure golang interoperability."
-        },
         "rev": {
           "type": "string",
           "format": "tid",
@@ -107,6 +103,10 @@
             "description": "List of new blobs (by CID) referenced by records in this commit."
           }
         },
+        "prevData": {
+          "type": "cid-link",
+          "description": "EXPERIMENTAL. The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose."
+        },
         "time": {
           "type": "string",
           "format": "datetime",
@@ -208,6 +208,10 @@
         "cid": {
           "type": "cid-link",
           "description": "For creates and updates, the new record CID. For deletions, null."
+        },
+        "prev": {
+          "type": "cid-link",
+          "description": "EXPERIMENTAL. For deletes and updates, the CID  of the previous record. For creates, undefined."
         }
       }
     }
diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
index f69259304a7..5bfaa47d21d 100644
--- a/packages/api/src/client/lexicons.ts
+++ b/packages/api/src/client/lexicons.ts
@@ -3847,7 +3847,7 @@ export const schemaDict = {
           'blobs',
           'time',
         ],
-        nullable: ['prev', 'since'],
+        nullable: ['since'],
         properties: {
           seq: {
             type: 'integer',
@@ -3871,11 +3871,6 @@ export const schemaDict = {
             type: 'cid-link',
             description: 'Repo commit object CID.',
           },
-          prev: {
-            type: 'cid-link',
-            description:
-              'DEPRECATED -- unused. WARNING -- nullable and optional; stick with optional to ensure golang interoperability.',
-          },
           rev: {
             type: 'string',
             format: 'tid',
@@ -3912,6 +3907,11 @@ export const schemaDict = {
                 'List of new blobs (by CID) referenced by records in this commit.',
             },
           },
+          prevData: {
+            type: 'cid-link',
+            description:
+              "EXPERIMENTAL. The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose.",
+          },
           time: {
             type: 'string',
             format: 'datetime',
@@ -4068,6 +4068,11 @@ export const schemaDict = {
             description:
               'For creates and updates, the new record CID. For deletions, null.',
           },
+          prev: {
+            type: 'cid-link',
+            description:
+              'EXPERIMENTAL. For deletes and updates, the CID  of the previous record. For creates, undefined.',
+          },
         },
       },
     },
diff --git a/packages/api/src/client/types/com/atproto/sync/subscribeRepos.ts b/packages/api/src/client/types/com/atproto/sync/subscribeRepos.ts
index 48e573423ad..671101cd512 100644
--- a/packages/api/src/client/types/com/atproto/sync/subscribeRepos.ts
+++ b/packages/api/src/client/types/com/atproto/sync/subscribeRepos.ts
@@ -24,8 +24,6 @@ export interface Commit {
   repo: string
   /** Repo commit object CID. */
   commit: CID
-  /** DEPRECATED -- unused. WARNING -- nullable and optional; stick with optional to ensure golang interoperability. */
-  prev?: CID | null
   /** The rev of the emitted commit. Note that this information is also in the commit object included in blocks, unless this is a tooBig event. */
   rev: string
   /** The rev of the last emitted commit from this repo (if any). */
@@ -34,6 +32,8 @@ export interface Commit {
   blocks: Uint8Array
   ops: RepoOp[]
   blobs: CID[]
+  /** EXPERIMENTAL. The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose. */
+  prevData?: CID
   /** Timestamp of when this message was originally broadcast. */
   time: string
 }
@@ -169,6 +169,8 @@ export interface RepoOp {
   path: string
   /** For creates and updates, the new record CID. For deletions, null. */
   cid: CID | null
+  /** EXPERIMENTAL. For deletes and updates, the CID  of the previous record. For creates, undefined. */
+  prev?: CID
 }
 
 const hashRepoOp = 'repoOp'
diff --git a/packages/bsky/src/lexicon/lexicons.ts b/packages/bsky/src/lexicon/lexicons.ts
index 760662248b4..6d6f13e4ab7 100644
--- a/packages/bsky/src/lexicon/lexicons.ts
+++ b/packages/bsky/src/lexicon/lexicons.ts
@@ -3847,7 +3847,7 @@ export const schemaDict = {
           'blobs',
           'time',
         ],
-        nullable: ['prev', 'since'],
+        nullable: ['since'],
         properties: {
           seq: {
             type: 'integer',
@@ -3871,11 +3871,6 @@ export const schemaDict = {
             type: 'cid-link',
             description: 'Repo commit object CID.',
           },
-          prev: {
-            type: 'cid-link',
-            description:
-              'DEPRECATED -- unused. WARNING -- nullable and optional; stick with optional to ensure golang interoperability.',
-          },
           rev: {
             type: 'string',
             format: 'tid',
@@ -3912,6 +3907,11 @@ export const schemaDict = {
                 'List of new blobs (by CID) referenced by records in this commit.',
             },
           },
+          prevData: {
+            type: 'cid-link',
+            description:
+              "EXPERIMENTAL. The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose.",
+          },
           time: {
             type: 'string',
             format: 'datetime',
@@ -4068,6 +4068,11 @@ export const schemaDict = {
             description:
               'For creates and updates, the new record CID. For deletions, null.',
           },
+          prev: {
+            type: 'cid-link',
+            description:
+              'EXPERIMENTAL. For deletes and updates, the CID  of the previous record. For creates, undefined.',
+          },
         },
       },
     },
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/subscribeRepos.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
index 0cb11e48b86..c5c4f9bf2eb 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
@@ -51,8 +51,6 @@ export interface Commit {
   repo: string
   /** Repo commit object CID. */
   commit: CID
-  /** DEPRECATED -- unused. WARNING -- nullable and optional; stick with optional to ensure golang interoperability. */
-  prev?: CID | null
   /** The rev of the emitted commit. Note that this information is also in the commit object included in blocks, unless this is a tooBig event. */
   rev: string
   /** The rev of the last emitted commit from this repo (if any). */
@@ -61,6 +59,8 @@ export interface Commit {
   blocks: Uint8Array
   ops: RepoOp[]
   blobs: CID[]
+  /** EXPERIMENTAL. The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose. */
+  prevData?: CID
   /** Timestamp of when this message was originally broadcast. */
   time: string
 }
@@ -196,6 +196,8 @@ export interface RepoOp {
   path: string
   /** For creates and updates, the new record CID. For deletions, null. */
   cid: CID | null
+  /** EXPERIMENTAL. For deletes and updates, the CID  of the previous record. For creates, undefined. */
+  prev?: CID
 }
 
 const hashRepoOp = 'repoOp'
diff --git a/packages/bsky/tests/data-plane/indexing.test.ts b/packages/bsky/tests/data-plane/indexing.test.ts
index 74b6d5cf560..fd7fd3add1c 100644
--- a/packages/bsky/tests/data-plane/indexing.test.ts
+++ b/packages/bsky/tests/data-plane/indexing.test.ts
@@ -592,11 +592,7 @@ describe('indexing', () => {
         writeCommit.cid,
         writeCommit.rev,
       )
-      await network.pds.ctx.sequencer.sequenceCommit(
-        sc.dids.alice,
-        writeCommit,
-        writes,
-      )
+      await network.pds.ctx.sequencer.sequenceCommit(sc.dids.alice, writeCommit)
       // Index
       const { data: commit } =
         await pdsAgent.api.com.atproto.sync.getLatestCommit({
diff --git a/packages/bsky/tests/data-plane/subscription.test.ts b/packages/bsky/tests/data-plane/subscription.test.ts
index cd1ff717e8c..8303e17854d 100644
--- a/packages/bsky/tests/data-plane/subscription.test.ts
+++ b/packages/bsky/tests/data-plane/subscription.test.ts
@@ -1,8 +1,7 @@
 import { AtpAgent } from '@atproto/api'
 import { cborDecode, cborEncode } from '@atproto/common'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
-import { PreparedWrite, sequencer } from '@atproto/pds'
-import { CommitData } from '@atproto/repo'
+import { CommitDataWithOps, sequencer } from '@atproto/pds'
 import { DatabaseSchemaType } from '../../src/data-plane/server/db/database-schema'
 import { ids } from '../../src/lexicon/lexicons'
 import { forSnapshot } from '../_util'
@@ -74,10 +73,9 @@ describe('sync', () => {
     const sequenceCommitOrig = network.pds.ctx.sequencer.sequenceCommit
     network.pds.ctx.sequencer.sequenceCommit = async function (
       did: string,
-      commitData: CommitData,
-      writes: PreparedWrite[],
+      commitData: CommitDataWithOps,
     ) {
-      const seqEvt = await sequencer.formatSeqCommit(did, commitData, writes)
+      const seqEvt = await sequencer.formatSeqCommit(did, commitData)
       const evt = cborDecode(seqEvt.event) as sequencer.CommitEvt
       evt.blocks = new Uint8Array() // bad blocks
       seqEvt.event = cborEncode(evt)
diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
index f69259304a7..5bfaa47d21d 100644
--- a/packages/ozone/src/lexicon/lexicons.ts
+++ b/packages/ozone/src/lexicon/lexicons.ts
@@ -3847,7 +3847,7 @@ export const schemaDict = {
           'blobs',
           'time',
         ],
-        nullable: ['prev', 'since'],
+        nullable: ['since'],
         properties: {
           seq: {
             type: 'integer',
@@ -3871,11 +3871,6 @@ export const schemaDict = {
             type: 'cid-link',
             description: 'Repo commit object CID.',
           },
-          prev: {
-            type: 'cid-link',
-            description:
-              'DEPRECATED -- unused. WARNING -- nullable and optional; stick with optional to ensure golang interoperability.',
-          },
           rev: {
             type: 'string',
             format: 'tid',
@@ -3912,6 +3907,11 @@ export const schemaDict = {
                 'List of new blobs (by CID) referenced by records in this commit.',
             },
           },
+          prevData: {
+            type: 'cid-link',
+            description:
+              "EXPERIMENTAL. The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose.",
+          },
           time: {
             type: 'string',
             format: 'datetime',
@@ -4068,6 +4068,11 @@ export const schemaDict = {
             description:
               'For creates and updates, the new record CID. For deletions, null.',
           },
+          prev: {
+            type: 'cid-link',
+            description:
+              'EXPERIMENTAL. For deletes and updates, the CID  of the previous record. For creates, undefined.',
+          },
         },
       },
     },
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/subscribeRepos.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
index 0cb11e48b86..c5c4f9bf2eb 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
@@ -51,8 +51,6 @@ export interface Commit {
   repo: string
   /** Repo commit object CID. */
   commit: CID
-  /** DEPRECATED -- unused. WARNING -- nullable and optional; stick with optional to ensure golang interoperability. */
-  prev?: CID | null
   /** The rev of the emitted commit. Note that this information is also in the commit object included in blocks, unless this is a tooBig event. */
   rev: string
   /** The rev of the last emitted commit from this repo (if any). */
@@ -61,6 +59,8 @@ export interface Commit {
   blocks: Uint8Array
   ops: RepoOp[]
   blobs: CID[]
+  /** EXPERIMENTAL. The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose. */
+  prevData?: CID
   /** Timestamp of when this message was originally broadcast. */
   time: string
 }
@@ -196,6 +196,8 @@ export interface RepoOp {
   path: string
   /** For creates and updates, the new record CID. For deletions, null. */
   cid: CID | null
+  /** EXPERIMENTAL. For deletes and updates, the CID  of the previous record. For creates, undefined. */
+  prev?: CID
 }
 
 const hashRepoOp = 'repoOp'
diff --git a/packages/pds/src/actor-store/repo/transactor.ts b/packages/pds/src/actor-store/repo/transactor.ts
index b64eaca6081..06357ccd96d 100644
--- a/packages/pds/src/actor-store/repo/transactor.ts
+++ b/packages/pds/src/actor-store/repo/transactor.ts
@@ -1,6 +1,6 @@
 import { CID } from 'multiformats/cid'
 import * as crypto from '@atproto/crypto'
-import { BlobStore, CommitData, Repo, WriteOpAction } from '@atproto/repo'
+import { BlobStore, Repo, WriteOpAction, formatDataKey } from '@atproto/repo'
 import { AtUri } from '@atproto/syntax'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { BackgroundQueue } from '../../background'
@@ -8,6 +8,8 @@ import { createWriteToOp, writeToOp } from '../../repo'
 import {
   BadCommitSwapError,
   BadRecordSwapError,
+  CommitDataWithOps,
+  CommitOp,
   PreparedCreate,
   PreparedWrite,
 } from '../../repo/types'
@@ -16,6 +18,7 @@ import { ActorDb } from '../db'
 import { RecordTransactor } from '../record/transactor'
 import { RepoReader } from './reader'
 import { SqlRepoTransactor } from './sql-repo-transactor'
+import { blobCidsFromWrites, commitOpsFromCreates } from './util'
 
 export class RepoTransactor extends RepoReader {
   blob: BlobTransactor
@@ -45,24 +48,31 @@ export class RepoTransactor extends RepoReader {
     return res ? Repo.load(this.storage, CID.parse(res.cid)) : null
   }
 
-  async createRepo(writes: PreparedCreate[]): Promise<CommitData> {
+  async createRepo(writes: PreparedCreate[]): Promise<CommitDataWithOps> {
     this.db.assertTransaction()
-    const writeOps = writes.map(createWriteToOp)
     const commit = await Repo.formatInitCommit(
       this.storage,
       this.did,
       this.signingKey,
-      writeOps,
+      writes.map(createWriteToOp),
     )
     await Promise.all([
       this.storage.applyCommit(commit, true),
       this.indexWrites(writes, commit.rev),
       this.blob.processWriteBlobs(commit.rev, writes),
     ])
-    return commit
+    return {
+      ...commit,
+      ops: commitOpsFromCreates(writes),
+      blobs: blobCidsFromWrites(writes),
+      prevData: null,
+    }
   }
 
-  async processWrites(writes: PreparedWrite[], swapCommitCid?: CID) {
+  async processWrites(
+    writes: PreparedWrite[],
+    swapCommitCid?: CID,
+  ): Promise<CommitDataWithOps> {
     this.db.assertTransaction()
     const commit = await this.formatCommit(writes, swapCommitCid)
     await Promise.all([
@@ -79,7 +89,7 @@ export class RepoTransactor extends RepoReader {
   async formatCommit(
     writes: PreparedWrite[],
     swapCommit?: CID,
-  ): Promise<CommitData> {
+  ): Promise<CommitDataWithOps> {
     // this is not in a txn, so this won't actually hold the lock,
     // we just check if it is currently held by another txn
     const currRoot = await this.storage.getRootDetailed()
@@ -93,6 +103,7 @@ export class RepoTransactor extends RepoReader {
     await this.storage.cacheRev(currRoot.rev)
     const newRecordCids: CID[] = []
     const delAndUpdateUris: AtUri[] = []
+    const commitOps: CommitOp[] = []
     for (const write of writes) {
       const { action, uri, swapCid } = write
       if (action !== WriteOpAction.Delete) {
@@ -101,26 +112,36 @@ export class RepoTransactor extends RepoReader {
       if (action !== WriteOpAction.Create) {
         delAndUpdateUris.push(uri)
       }
-      if (swapCid === undefined) {
-        continue
-      }
       const record = await this.record.getRecord(uri, null, true)
-      const currRecord = record && CID.parse(record.cid)
-      if (action === WriteOpAction.Create && swapCid !== null) {
-        throw new BadRecordSwapError(currRecord) // There should be no current record for a create
-      }
-      if (action === WriteOpAction.Update && swapCid === null) {
-        throw new BadRecordSwapError(currRecord) // There should be a current record for an update
+      const currRecord = record ? CID.parse(record.cid) : null
+
+      const op: CommitOp = {
+        action,
+        path: formatDataKey(uri.collection, uri.rkey),
+        cid: write.action === WriteOpAction.Delete ? null : write.cid,
       }
-      if (action === WriteOpAction.Delete && swapCid === null) {
-        throw new BadRecordSwapError(currRecord) // There should be a current record for a delete
+      if (currRecord) {
+        op.prev = currRecord
       }
-      if ((currRecord || swapCid) && !currRecord?.equals(swapCid)) {
-        throw new BadRecordSwapError(currRecord)
+      commitOps.push(op)
+      if (swapCid !== undefined) {
+        if (action === WriteOpAction.Create && swapCid !== null) {
+          throw new BadRecordSwapError(currRecord) // There should be no current record for a create
+        }
+        if (action === WriteOpAction.Update && swapCid === null) {
+          throw new BadRecordSwapError(currRecord) // There should be a current record for an update
+        }
+        if (action === WriteOpAction.Delete && swapCid === null) {
+          throw new BadRecordSwapError(currRecord) // There should be a current record for a delete
+        }
+        if ((currRecord || swapCid) && !currRecord?.equals(swapCid)) {
+          throw new BadRecordSwapError(currRecord)
+        }
       }
     }
 
     const repo = await Repo.load(this.storage, currRoot.cid)
+    const prevData = repo.commit.data
     const writeOps = writes.map(writeToOp)
     const commit = await repo.formatCommit(writeOps, this.signingKey)
 
@@ -142,7 +163,12 @@ export class RepoTransactor extends RepoReader {
       )
       commit.relevantBlocks.addMap(missingBlocks.blocks)
     }
-    return commit
+    return {
+      ...commit,
+      ops: commitOps,
+      blobs: blobCidsFromWrites(writes),
+      prevData,
+    }
   }
 
   async indexWrites(writes: PreparedWrite[], rev: string) {
diff --git a/packages/pds/src/actor-store/repo/util.ts b/packages/pds/src/actor-store/repo/util.ts
new file mode 100644
index 00000000000..6d2c7799a47
--- /dev/null
+++ b/packages/pds/src/actor-store/repo/util.ts
@@ -0,0 +1,22 @@
+import { CidSet, formatDataKey } from '@atproto/repo'
+import { CommitOp, PreparedCreate, PreparedWrite } from '../../repo'
+
+export const blobCidsFromWrites = (writes: PreparedWrite[]): CidSet => {
+  const blobCids = new CidSet()
+  for (const w of writes) {
+    if (w.action === 'create' || w.action === 'update') {
+      for (const blob of w.blobs) {
+        blobCids.add(blob.cid)
+      }
+    }
+  }
+  return blobCids
+}
+
+export const commitOpsFromCreates = (writes: PreparedCreate[]): CommitOp[] => {
+  return writes.map((w) => ({
+    action: 'create' as const,
+    path: formatDataKey(w.uri.collection, w.uri.rkey),
+    cid: w.cid,
+  }))
+}
diff --git a/packages/pds/src/api/com/atproto/repo/applyWrites.ts b/packages/pds/src/api/com/atproto/repo/applyWrites.ts
index 1b4d8ebd70e..235254bbde5 100644
--- a/packages/pds/src/api/com/atproto/repo/applyWrites.ts
+++ b/packages/pds/src/api/com/atproto/repo/applyWrites.ts
@@ -130,7 +130,7 @@ export default function (server: Server, ctx: AppContext) {
         }
       })
 
-      await ctx.sequencer.sequenceCommit(did, commit, writes)
+      await ctx.sequencer.sequenceCommit(did, commit)
       await ctx.accountManager.updateRepoRoot(did, commit.cid, commit.rev)
 
       return {
diff --git a/packages/pds/src/api/com/atproto/repo/createRecord.ts b/packages/pds/src/api/com/atproto/repo/createRecord.ts
index ee93555a922..39aaecbf7c9 100644
--- a/packages/pds/src/api/com/atproto/repo/createRecord.ts
+++ b/packages/pds/src/api/com/atproto/repo/createRecord.ts
@@ -66,40 +66,37 @@ export default function (server: Server, ctx: AppContext) {
         throw err
       }
 
-      const { commit, writes } = await ctx.actorStore.transact(
-        did,
-        async (actorTxn) => {
-          const backlinkConflicts =
-            validate !== false
-              ? await actorTxn.record.getBacklinkConflicts(
-                  write.uri,
-                  write.record,
-                )
-              : []
-          const backlinkDeletions = backlinkConflicts.map((uri) =>
-            prepareDelete({
-              did: uri.hostname,
-              collection: uri.collection,
-              rkey: uri.rkey,
-            }),
+      const commit = await ctx.actorStore.transact(did, async (actorTxn) => {
+        const backlinkConflicts =
+          validate !== false
+            ? await actorTxn.record.getBacklinkConflicts(
+                write.uri,
+                write.record,
+              )
+            : []
+        const backlinkDeletions = backlinkConflicts.map((uri) =>
+          prepareDelete({
+            did: uri.hostname,
+            collection: uri.collection,
+            rkey: uri.rkey,
+          }),
+        )
+        const writes = [...backlinkDeletions, write]
+        try {
+          const commit = await actorTxn.repo.processWrites(
+            writes,
+            swapCommitCid,
           )
-          const writes = [...backlinkDeletions, write]
-          try {
-            const commit = await actorTxn.repo.processWrites(
-              writes,
-              swapCommitCid,
-            )
-            return { commit, writes }
-          } catch (err) {
-            if (err instanceof BadCommitSwapError) {
-              throw new InvalidRequestError(err.message, 'InvalidSwap')
-            }
-            throw err
+          return commit
+        } catch (err) {
+          if (err instanceof BadCommitSwapError) {
+            throw new InvalidRequestError(err.message, 'InvalidSwap')
           }
-        },
-      )
+          throw err
+        }
+      })
 
-      await ctx.sequencer.sequenceCommit(did, commit, writes)
+      await ctx.sequencer.sequenceCommit(did, commit)
       await ctx.accountManager.updateRepoRoot(did, commit.cid, commit.rev)
 
       return {
diff --git a/packages/pds/src/api/com/atproto/repo/deleteRecord.ts b/packages/pds/src/api/com/atproto/repo/deleteRecord.ts
index b39bc8c05e7..4977668462d 100644
--- a/packages/pds/src/api/com/atproto/repo/deleteRecord.ts
+++ b/packages/pds/src/api/com/atproto/repo/deleteRecord.ts
@@ -71,7 +71,7 @@ export default function (server: Server, ctx: AppContext) {
       })
 
       if (commit !== null) {
-        await ctx.sequencer.sequenceCommit(did, commit, [write])
+        await ctx.sequencer.sequenceCommit(did, commit)
         await ctx.accountManager.updateRepoRoot(did, commit.cid, commit.rev)
       }
       return {
diff --git a/packages/pds/src/api/com/atproto/repo/putRecord.ts b/packages/pds/src/api/com/atproto/repo/putRecord.ts
index 3b72e255e7b..82e3063c31d 100644
--- a/packages/pds/src/api/com/atproto/repo/putRecord.ts
+++ b/packages/pds/src/api/com/atproto/repo/putRecord.ts
@@ -1,6 +1,5 @@
 import { CID } from 'multiformats/cid'
 import { BlobRef } from '@atproto/lexicon'
-import { CommitData } from '@atproto/repo'
 import { AtUri } from '@atproto/syntax'
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
 import { ActorStoreTransactor } from '../../../../actor-store/actor-store-transactor'
@@ -11,6 +10,7 @@ import { Record as ProfileRecord } from '../../../../lexicon/types/app/bsky/acto
 import {
   BadCommitSwapError,
   BadRecordSwapError,
+  CommitDataWithOps,
   InvalidRecordError,
   PreparedCreate,
   PreparedUpdate,
@@ -104,7 +104,7 @@ export default function (server: Server, ctx: AppContext) {
             }
           }
 
-          let commit: CommitData
+          let commit: CommitDataWithOps
           try {
             commit = await actorTxn.repo.processWrites([write], swapCommitCid)
           } catch (err) {
@@ -122,7 +122,7 @@ export default function (server: Server, ctx: AppContext) {
       )
 
       if (commit !== null) {
-        await ctx.sequencer.sequenceCommit(did, commit, [write])
+        await ctx.sequencer.sequenceCommit(did, commit)
         await ctx.accountManager.updateRepoRoot(did, commit.cid, commit.rev)
       }
 
diff --git a/packages/pds/src/api/com/atproto/server/activateAccount.ts b/packages/pds/src/api/com/atproto/server/activateAccount.ts
index 7d57b97d01d..b0e90404cc8 100644
--- a/packages/pds/src/api/com/atproto/server/activateAccount.ts
+++ b/packages/pds/src/api/com/atproto/server/activateAccount.ts
@@ -43,6 +43,9 @@ export default function (server: Server, ctx: AppContext) {
           newBlocks: blocks.blocks,
           relevantBlocks: blocks.blocks,
           removedCids: new CidSet(),
+          ops: [],
+          blobs: new CidSet(),
+          prevData: null,
         }
       })
 
@@ -53,7 +56,7 @@ export default function (server: Server, ctx: AppContext) {
         requester,
         account.handle ?? INVALID_HANDLE,
       )
-      await ctx.sequencer.sequenceCommit(requester, commitData, [])
+      await ctx.sequencer.sequenceCommit(requester, commitData)
     },
   })
 }
diff --git a/packages/pds/src/api/com/atproto/server/createAccount.ts b/packages/pds/src/api/com/atproto/server/createAccount.ts
index 090b847bbe0..58c0dbd84c0 100644
--- a/packages/pds/src/api/com/atproto/server/createAccount.ts
+++ b/packages/pds/src/api/com/atproto/server/createAccount.ts
@@ -74,7 +74,7 @@ export default function (server: Server, ctx: AppContext) {
         if (!deactivated) {
           await ctx.sequencer.sequenceIdentityEvt(did, handle)
           await ctx.sequencer.sequenceAccountEvt(did, AccountStatus.Active)
-          await ctx.sequencer.sequenceCommit(did, commit, [])
+          await ctx.sequencer.sequenceCommit(did, commit)
         }
         await ctx.accountManager.updateRepoRoot(did, commit.cid, commit.rev)
         await ctx.actorStore.clearReservedKeypair(signingKey.did(), did)
diff --git a/packages/pds/src/index.ts b/packages/pds/src/index.ts
index 6cef35eb512..d26509b1a9f 100644
--- a/packages/pds/src/index.ts
+++ b/packages/pds/src/index.ts
@@ -37,7 +37,7 @@ export { createSecretKeyObject } from './auth-verifier'
 export { type Handler as SkeletonHandler } from './lexicon/types/app/bsky/feed/getFeedSkeleton'
 export { createServer as createLexiconServer } from './lexicon'
 export * as sequencer from './sequencer'
-export { type PreparedWrite } from './repo'
+export { type CommitDataWithOps, type PreparedWrite } from './repo'
 export * as repoPrepare from './repo/prepare'
 export { scripts } from './scripts'
 
diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
index f69259304a7..5bfaa47d21d 100644
--- a/packages/pds/src/lexicon/lexicons.ts
+++ b/packages/pds/src/lexicon/lexicons.ts
@@ -3847,7 +3847,7 @@ export const schemaDict = {
           'blobs',
           'time',
         ],
-        nullable: ['prev', 'since'],
+        nullable: ['since'],
         properties: {
           seq: {
             type: 'integer',
@@ -3871,11 +3871,6 @@ export const schemaDict = {
             type: 'cid-link',
             description: 'Repo commit object CID.',
           },
-          prev: {
-            type: 'cid-link',
-            description:
-              'DEPRECATED -- unused. WARNING -- nullable and optional; stick with optional to ensure golang interoperability.',
-          },
           rev: {
             type: 'string',
             format: 'tid',
@@ -3912,6 +3907,11 @@ export const schemaDict = {
                 'List of new blobs (by CID) referenced by records in this commit.',
             },
           },
+          prevData: {
+            type: 'cid-link',
+            description:
+              "EXPERIMENTAL. The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose.",
+          },
           time: {
             type: 'string',
             format: 'datetime',
@@ -4068,6 +4068,11 @@ export const schemaDict = {
             description:
               'For creates and updates, the new record CID. For deletions, null.',
           },
+          prev: {
+            type: 'cid-link',
+            description:
+              'EXPERIMENTAL. For deletes and updates, the CID  of the previous record. For creates, undefined.',
+          },
         },
       },
     },
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/subscribeRepos.ts b/packages/pds/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
index 0cb11e48b86..c5c4f9bf2eb 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
@@ -51,8 +51,6 @@ export interface Commit {
   repo: string
   /** Repo commit object CID. */
   commit: CID
-  /** DEPRECATED -- unused. WARNING -- nullable and optional; stick with optional to ensure golang interoperability. */
-  prev?: CID | null
   /** The rev of the emitted commit. Note that this information is also in the commit object included in blocks, unless this is a tooBig event. */
   rev: string
   /** The rev of the last emitted commit from this repo (if any). */
@@ -61,6 +59,8 @@ export interface Commit {
   blocks: Uint8Array
   ops: RepoOp[]
   blobs: CID[]
+  /** EXPERIMENTAL. The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose. */
+  prevData?: CID
   /** Timestamp of when this message was originally broadcast. */
   time: string
 }
@@ -196,6 +196,8 @@ export interface RepoOp {
   path: string
   /** For creates and updates, the new record CID. For deletions, null. */
   cid: CID | null
+  /** EXPERIMENTAL. For deletes and updates, the CID  of the previous record. For creates, undefined. */
+  prev?: CID
 }
 
 const hashRepoOp = 'repoOp'
diff --git a/packages/pds/src/repo/types.ts b/packages/pds/src/repo/types.ts
index 41fbba73260..ccf61a787c8 100644
--- a/packages/pds/src/repo/types.ts
+++ b/packages/pds/src/repo/types.ts
@@ -1,6 +1,6 @@
 import { CID } from 'multiformats/cid'
 import { RepoRecord } from '@atproto/lexicon'
-import { WriteOpAction } from '@atproto/repo'
+import { CidSet, CommitData, WriteOpAction } from '@atproto/repo'
 import { AtUri } from '@atproto/syntax'
 
 export type ValidationStatus = 'valid' | 'unknown' | undefined
@@ -42,6 +42,19 @@ export type PreparedDelete = {
   swapCid?: CID | null
 }
 
+export type CommitOp = {
+  action: 'create' | 'update' | 'delete'
+  path: string
+  cid: CID | null
+  prev?: CID
+}
+
+export type CommitDataWithOps = CommitData & {
+  ops: CommitOp[]
+  blobs: CidSet
+  prevData: CID | null
+}
+
 export type PreparedWrite = PreparedCreate | PreparedUpdate | PreparedDelete
 
 export class InvalidRecordError extends Error {}
diff --git a/packages/pds/src/scripts/rebuild-repo.ts b/packages/pds/src/scripts/rebuild-repo.ts
index 6be44546111..ccb4ca92769 100644
--- a/packages/pds/src/scripts/rebuild-repo.ts
+++ b/packages/pds/src/scripts/rebuild-repo.ts
@@ -71,10 +71,13 @@ export const rebuildRepo = async (ctx: AppContext, args: string[]) => {
       newBlocks,
       relevantBlocks: newBlocks,
       removedCids: toDelete,
+      ops: [],
+      blobs: new CidSet(),
+      prevData: null,
     }
   })
   await ctx.accountManager.updateRepoRoot(did, commit.cid, rev)
-  await ctx.sequencer.sequenceCommit(did, commit, [])
+  await ctx.sequencer.sequenceCommit(did, commit)
 }
 
 const promptContinue = async (): Promise<boolean> => {
diff --git a/packages/pds/src/sequencer/events.ts b/packages/pds/src/sequencer/events.ts
index c314c7b7e71..536d874c196 100644
--- a/packages/pds/src/sequencer/events.ts
+++ b/packages/pds/src/sequencer/events.ts
@@ -1,74 +1,59 @@
-import { CID } from 'multiformats/cid'
 import { z } from 'zod'
-import { cborEncode, schema } from '@atproto/common'
-import {
-  BlockMap,
-  CidSet,
-  CommitData,
-  WriteOpAction,
-  blocksToCarFile,
-} from '@atproto/repo'
+import { cborEncode, noUndefinedVals, schema } from '@atproto/common'
+import { BlockMap, blocksToCarFile } from '@atproto/repo'
 import { AccountStatus } from '../account-manager'
-import { PreparedWrite } from '../repo'
+import { CommitDataWithOps } from '../repo'
 import { RepoSeqInsert } from './db'
 
 export const formatSeqCommit = async (
   did: string,
-  commitData: CommitData,
-  writes: PreparedWrite[],
+  commitData: CommitDataWithOps,
 ): Promise<RepoSeqInsert> => {
-  let tooBig: boolean
-  const ops: CommitEvtOp[] = []
-  const blobs = new CidSet()
-  let carSlice: Uint8Array
-
   const blocksToSend = new BlockMap()
   blocksToSend.addMap(commitData.newBlocks)
   blocksToSend.addMap(commitData.relevantBlocks)
 
-  // max 200 ops or 1MB of data
-  if (writes.length > 200 || blocksToSend.byteSize > 1000000) {
-    tooBig = true
+  let evt: CommitEvt
+
+  // If event is too big (max 200 ops or 1MB of data)
+  if (commitData.ops.length > 200 || blocksToSend.byteSize > 1000000) {
     const justRoot = new BlockMap()
     const rootBlock = blocksToSend.get(commitData.cid)
     if (rootBlock) {
       justRoot.set(commitData.cid, rootBlock)
     }
-    carSlice = await blocksToCarFile(commitData.cid, justRoot)
+
+    evt = {
+      rebase: false,
+      tooBig: true,
+      repo: did,
+      commit: commitData.cid,
+      rev: commitData.rev,
+      since: commitData.since,
+      blocks: await blocksToCarFile(commitData.cid, justRoot),
+      ops: [],
+      blobs: [],
+      prevData: commitData.prevData ?? undefined,
+    }
   } else {
-    tooBig = false
-    for (const w of writes) {
-      const path = w.uri.collection + '/' + w.uri.rkey
-      let cid: CID | null
-      if (w.action === WriteOpAction.Delete) {
-        cid = null
-      } else {
-        cid = w.cid
-        w.blobs.forEach((blob) => {
-          blobs.add(blob.cid)
-        })
-      }
-      ops.push({ action: w.action, path, cid })
+    evt = {
+      rebase: false,
+      tooBig: false,
+      repo: did,
+      commit: commitData.cid,
+      rev: commitData.rev,
+      since: commitData.since,
+      blocks: await blocksToCarFile(commitData.cid, blocksToSend),
+      ops: commitData.ops,
+      blobs: commitData.blobs.toList(),
+      prevData: commitData.prevData ?? undefined,
     }
-    carSlice = await blocksToCarFile(commitData.cid, blocksToSend)
   }
 
-  const evt: CommitEvt = {
-    rebase: false,
-    tooBig,
-    repo: did,
-    commit: commitData.cid,
-    prev: commitData.prev,
-    rev: commitData.rev,
-    since: commitData.since,
-    ops,
-    blocks: carSlice,
-    blobs: blobs.toList(),
-  }
   return {
     did,
     eventType: 'append' as const,
-    event: cborEncode(evt),
+    event: cborEncode(noUndefinedVals(evt)),
     sequencedAt: new Date().toISOString(),
   }
 }
@@ -149,6 +134,7 @@ export const commitEvtOp = z.object({
   ]),
   path: z.string(),
   cid: schema.cid.nullable(),
+  prev: schema.cid.optional(),
 })
 export type CommitEvtOp = z.infer<typeof commitEvtOp>
 
@@ -157,12 +143,12 @@ export const commitEvt = z.object({
   tooBig: z.boolean(),
   repo: z.string(),
   commit: schema.cid,
-  prev: schema.cid.nullable(),
   rev: z.string(),
   since: z.string().nullable(),
   blocks: schema.bytes,
   ops: z.array(commitEvtOp),
   blobs: z.array(schema.cid),
+  prevData: schema.cid.optional(),
 })
 export type CommitEvt = z.infer<typeof commitEvt>
 
diff --git a/packages/pds/src/sequencer/sequencer.ts b/packages/pds/src/sequencer/sequencer.ts
index 0448dec111b..5da563795b3 100644
--- a/packages/pds/src/sequencer/sequencer.ts
+++ b/packages/pds/src/sequencer/sequencer.ts
@@ -1,11 +1,10 @@
 import EventEmitter from 'node:events'
 import TypedEmitter from 'typed-emitter'
 import { SECOND, cborDecode, wait } from '@atproto/common'
-import { CommitData } from '@atproto/repo'
 import { AccountStatus } from '../account-manager/helpers/account'
 import { Crawlers } from '../crawlers'
 import { seqLogger as log } from '../logger'
-import { PreparedWrite } from '../repo'
+import { CommitDataWithOps } from '../repo'
 import {
   RepoSeqEntry,
   RepoSeqInsert,
@@ -217,10 +216,9 @@ export class Sequencer extends (EventEmitter as new () => SequencerEmitter) {
 
   async sequenceCommit(
     did: string,
-    commitData: CommitData,
-    writes: PreparedWrite[],
+    commitData: CommitDataWithOps,
   ): Promise<number> {
-    const evt = await formatSeqCommit(did, commitData, writes)
+    const evt = await formatSeqCommit(did, commitData)
     return await this.sequenceEvt(evt)
   }
 
diff --git a/packages/pds/tests/crud.test.ts b/packages/pds/tests/crud.test.ts
index b4b22fb71a7..e9ac90cc568 100644
--- a/packages/pds/tests/crud.test.ts
+++ b/packages/pds/tests/crud.test.ts
@@ -1191,7 +1191,7 @@ describe('crud operations', () => {
           record: {
             text: 'x',
             createdAt: new Date().toISOString(),
-            deepObject: createDeepObject(3000),
+            deepObject: createDeepObject(4000),
           },
         }),
         {
diff --git a/packages/pds/tests/sequencer.test.ts b/packages/pds/tests/sequencer.test.ts
index 04e7f6b2bd2..b8e64fcd08c 100644
--- a/packages/pds/tests/sequencer.test.ts
+++ b/packages/pds/tests/sequencer.test.ts
@@ -241,11 +241,7 @@ describe('sequencer', () => {
       (store) => store.repo.formatCommit(writes),
     )
 
-    const repoSeqInsert = await formatSeqCommit(
-      sc.dids.alice,
-      writeCommit,
-      writes,
-    )
+    const repoSeqInsert = await formatSeqCommit(sc.dids.alice, writeCommit)
 
     const evt = cborDecode<sequencer.CommitEvt>(repoSeqInsert.event)
     expect(evt.tooBig).toBe(true)
diff --git a/packages/pds/tests/sync/invertible-ops.test.ts b/packages/pds/tests/sync/invertible-ops.test.ts
new file mode 100644
index 00000000000..e1a253a1b10
--- /dev/null
+++ b/packages/pds/tests/sync/invertible-ops.test.ts
@@ -0,0 +1,104 @@
+import { CID } from 'multiformats/cid'
+import { AtUri } from '@atproto/api'
+import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
+import * as repo from '@atproto/repo'
+import { Subscription } from '@atproto/xrpc-server'
+import {
+  OutputSchema as SubscribeReposOutput,
+  RepoOp,
+  isCommit,
+} from '../../src/lexicon/types/com/atproto/sync/subscribeRepos'
+import basicSeed from '../seeds/basic'
+
+describe('invertible ops', () => {
+  let network: TestNetworkNoAppView
+  let sc: SeedClient
+
+  beforeAll(async () => {
+    network = await TestNetworkNoAppView.create({
+      dbPostgresSchema: 'repo_invertible_ops',
+    })
+    sc = network.getSeedClient()
+    await basicSeed(sc)
+
+    let posts: AtUri[] = []
+    for (let i = 0; i < 20; i++) {
+      const [aliceRef, bobRef, carolRef, danRef] = await Promise.all([
+        sc.post(sc.dids.alice, 'test'),
+        sc.post(sc.dids.bob, 'test'),
+        sc.post(sc.dids.carol, 'test'),
+        sc.post(sc.dids.dan, 'test'),
+      ])
+      posts = [
+        ...posts,
+        aliceRef.ref.uri,
+        bobRef.ref.uri,
+        carolRef.ref.uri,
+        danRef.ref.uri,
+      ]
+    }
+    for (const post of posts) {
+      await sc.deletePost(post.hostname, post)
+    }
+
+    await network.processAll()
+  })
+
+  afterAll(async () => {
+    await network.close()
+  })
+
+  it('works', async () => {
+    const currSeq = (await network.pds.ctx.sequencer.curr()) ?? 0
+
+    const sub = new Subscription({
+      service: network.pds.url.replace('http://', 'ws://'),
+      method: 'com.atproto.sync.subscribeRepos',
+      validate: (value: unknown): SubscribeReposOutput => {
+        return value as any
+      },
+      getParams: () => {
+        return { cursor: 0 }
+      },
+    })
+
+    for await (const evt of sub) {
+      if (!isCommit(evt)) {
+        continue
+      }
+      const prevData = evt.prevData as CID | undefined
+      if (!prevData) {
+        continue
+      }
+
+      const { blocks, root } = await repo.readCarWithRoot(
+        evt.blocks as Uint8Array,
+      )
+      const storage = new repo.MemoryBlockstore(blocks)
+      const slice = await repo.Repo.load(storage, root)
+
+      let data = slice.data
+      const ops = evt.ops as RepoOp[]
+      for (const op of ops) {
+        if (op.action === 'create') {
+          data = await data.delete(op.path)
+        } else if (op.action === 'update') {
+          if (!op.prev) throw new Error('missing prev')
+          data = await data.update(op.path, op.prev)
+        } else if (op.action === 'delete') {
+          if (!op.prev) throw new Error('missing prev')
+          data = await data.add(op.path, op.prev)
+        } else {
+          throw new Error('unknown action')
+        }
+      }
+
+      const invertedRoot = await data.getPointer()
+      expect(invertedRoot.equals(prevData)).toBe(true)
+
+      if (evt.seq >= currSeq) {
+        break
+      }
+    }
+  })
+})
diff --git a/packages/repo/src/block-map.ts b/packages/repo/src/block-map.ts
index 5d3211e528e..f52e7fb55fb 100644
--- a/packages/repo/src/block-map.ts
+++ b/packages/repo/src/block-map.ts
@@ -12,16 +12,18 @@ export class BlockMap {
     return block.cid
   }
 
-  set(cid: CID, bytes: Uint8Array) {
+  set(cid: CID, bytes: Uint8Array): BlockMap {
     this.map.set(cid.toString(), bytes)
+    return this
   }
 
   get(cid: CID): Uint8Array | undefined {
     return this.map.get(cid.toString())
   }
 
-  delete(cid: CID) {
+  delete(cid: CID): BlockMap {
     this.map.delete(cid.toString())
+    return this
   }
 
   getMany(cids: CID[]): { blocks: BlockMap; missing: CID[] } {
@@ -62,10 +64,11 @@ export class BlockMap {
     return this.entries().map((e) => e.cid)
   }
 
-  addMap(toAdd: BlockMap) {
+  addMap(toAdd: BlockMap): BlockMap {
     toAdd.forEach((bytes, cid) => {
       this.set(cid, bytes)
     })
+    return this
   }
 
   get size(): number {
diff --git a/packages/repo/src/mst/mst.ts b/packages/repo/src/mst/mst.ts
index 01fbd13b699..e0da6bb72ed 100644
--- a/packages/repo/src/mst/mst.ts
+++ b/packages/repo/src/mst/mst.ts
@@ -442,7 +442,16 @@ export class MST {
 
   // if the topmost node in the tree only points to another tree, trim the top and return the subtree
   async trimTop(): Promise<MST> {
-    const entries = await this.getEntries()
+    let entries: NodeEntry[]
+    try {
+      entries = await this.getEntries()
+    } catch (err) {
+      if (err instanceof MissingBlockError) {
+        return this
+      } else {
+        throw err
+      }
+    }
     if (entries.length === 1 && entries[0].isTree()) {
       return entries[0].trimTop()
     } else {
@@ -544,23 +553,38 @@ export class MST {
   // @TODO write tests for these
 
   // Walk tree starting at key
-  async *walkLeavesFrom(key: string): AsyncIterable<Leaf> {
+  async *walkFrom(key: string): AsyncIterable<NodeEntry> {
+    yield this
     const index = await this.findGtOrEqualLeafIndex(key)
     const entries = await this.getEntries()
-    const prev = entries[index - 1]
-    if (prev && prev.isTree()) {
-      for await (const e of prev.walkLeavesFrom(key)) {
-        yield e
+    const found = entries[index]
+    if (found && found.isLeaf() && found.key === key) {
+      yield found
+    } else {
+      const prev = entries[index - 1]
+      if (prev) {
+        if (prev.isLeaf() && prev.key === key) {
+          yield prev
+        } else if (prev.isTree()) {
+          yield* prev.walkFrom(key)
+        }
       }
     }
+
     for (let i = index; i < entries.length; i++) {
       const entry = entries[i]
       if (entry.isLeaf()) {
         yield entry
       } else {
-        for await (const e of entry.walkLeavesFrom(key)) {
-          yield e
-        }
+        yield* entry.walkFrom(key)
+      }
+    }
+  }
+
+  async *walkLeavesFrom(key: string): AsyncIterable<Leaf> {
+    for await (const node of this.walkFrom(key)) {
+      if (node.isLeaf()) {
+        yield node
       }
     }
   }
@@ -755,18 +779,76 @@ export class MST {
     return cids
   }
 
-  async addBlocksForPath(key: string, blocks: BlockMap) {
-    const serialized = await this.serialize()
-    blocks.set(serialized.cid, serialized.bytes)
+  // A covering proof is all MST nodes (leaves excluded) needed to prove the value of a given leaf
+  // and its siblings to its immediate right and left (if applicable)
+  // We simply find the immediately preceeding node and then walk from that node until we reach the
+  // first key that is greater than the requested key (the right sibling)
+  async getCoveringProof(key: string): Promise<BlockMap> {
+    const [self, left, right] = await Promise.all([
+      this.proofForKey(key),
+      this.proofForLeftSib(key),
+      this.proofForRightSib(key),
+    ])
+    return self.addMap(left).addMap(right)
+  }
+
+  async proofForKey(key: string): Promise<BlockMap> {
     const index = await this.findGtOrEqualLeafIndex(key)
     const found = await this.atIndex(index)
+    let blocks: BlockMap
     if (found && found.isLeaf() && found.key === key) {
-      return
+      blocks = new BlockMap()
+    } else {
+      const prev = await this.atIndex(index - 1)
+      if (!prev || prev.isLeaf()) {
+        return new BlockMap()
+      } else {
+        blocks = await prev.proofForKey(key)
+      }
     }
+    const serialized = await this.serialize()
+    return blocks.set(serialized.cid, serialized.bytes)
+  }
+
+  async proofForLeftSib(key: string): Promise<BlockMap> {
+    const index = await this.findGtOrEqualLeafIndex(key)
     const prev = await this.atIndex(index - 1)
-    if (prev && prev.isTree()) {
-      await prev.addBlocksForPath(key, blocks)
+    let blocks: BlockMap
+    if (!prev || prev.isLeaf()) {
+      blocks = new BlockMap()
+    } else {
+      blocks = await prev.proofForLeftSib(key)
+    }
+    const serialized = await this.serialize()
+    return blocks.set(serialized.cid, serialized.bytes)
+  }
+
+  async proofForRightSib(key: string): Promise<BlockMap> {
+    const index = await this.findGtOrEqualLeafIndex(key)
+    let found = await this.atIndex(index)
+    if (!found) {
+      found = await this.atIndex(index - 1)
+    }
+    let blocks: BlockMap
+    if (!found) {
+      // shouldn't ever hit, null case
+      blocks = new BlockMap()
+    } else if (found.isTree()) {
+      blocks = await found.proofForRightSib(key)
+      // recurse down
+    } else {
+      const node =
+        found.key === key
+          ? await this.atIndex(index + 1)
+          : await this.atIndex(index - 1)
+      if (!node || node.isLeaf()) {
+        blocks = new BlockMap()
+      } else {
+        blocks = await node.proofForRightSib(key)
+      }
     }
+    const serialized = await this.serialize()
+    return blocks.set(serialized.cid, serialized.bytes)
   }
 
   // Matching Leaf interface
diff --git a/packages/repo/src/repo.ts b/packages/repo/src/repo.ts
index af1ce4a1d63..f38fe05c963 100644
--- a/packages/repo/src/repo.ts
+++ b/packages/repo/src/repo.ts
@@ -142,15 +142,14 @@ export class Repo extends ReadableRepo {
     const newBlocks = diff.newMstBlocks
     const removedCids = diff.removedCids
 
-    const relevantBlocks = new BlockMap()
-    await Promise.all(
+    const proofs = await Promise.all(
       writes.map((op) =>
-        data.addBlocksForPath(
-          util.formatDataKey(op.collection, op.rkey),
-          relevantBlocks,
-        ),
+        data.getCoveringProof(util.formatDataKey(op.collection, op.rkey)),
       ),
     )
+    const relevantBlocks = proofs.reduce((acc, cur) => {
+      return acc.addMap(cur)
+    }, new BlockMap())
 
     const addedLeaves = leaves.getMany(diff.newLeafCids.toList())
     if (addedLeaves.missing.length > 0) {
diff --git a/packages/repo/tests/_keys.ts b/packages/repo/tests/_keys.ts
new file mode 100644
index 00000000000..2789c74cad4
--- /dev/null
+++ b/packages/repo/tests/_keys.ts
@@ -0,0 +1,156 @@
+export const A0 = 'A0/501344'
+export const A1 = 'A1/700567'
+export const A2 = 'A2/239654'
+export const A3 = 'A3/570745'
+export const A4 = 'A4/231700'
+export const A5 = 'A5/343219'
+export const B0 = 'B0/436099'
+export const B1 = 'B1/293486'
+export const B2 = 'B2/303249'
+export const B3 = 'B3/690557'
+export const B4 = 'B4/522003'
+export const B5 = 'B5/528640'
+export const C0 = 'C0/535043'
+export const C1 = 'C1/970596'
+export const C2 = 'C2/953910'
+export const C3 = 'C3/016643'
+export const C4 = 'C4/687126'
+export const C5 = 'C5/136391'
+export const D0 = 'D0/360671'
+export const D1 = 'D1/637976'
+export const D2 = 'D2/915466'
+export const D3 = 'D3/722333'
+export const D4 = 'D4/816246'
+export const D5 = 'D5/611412'
+export const E0 = 'E0/922708'
+export const E1 = 'E1/710014'
+export const E2 = 'E2/413113'
+export const E3 = 'E3/226890'
+export const E4 = 'E4/349347'
+export const E5 = 'E5/574759'
+export const F0 = 'F0/606463'
+export const F1 = 'F1/415452'
+export const F2 = 'F2/410478'
+export const F3 = 'F3/000172'
+export const F4 = 'F4/438093'
+export const F5 = 'F5/131765'
+export const G0 = 'G0/714257'
+export const G1 = 'G1/254594'
+export const G2 = 'G2/536869'
+export const G3 = 'G3/188348'
+export const G4 = 'G4/627086'
+export const G5 = 'G5/436727'
+export const H0 = 'H0/740256'
+export const H1 = 'H1/113887'
+export const H2 = 'H2/783135'
+export const H3 = 'H3/911996'
+export const H4 = 'H4/413212'
+export const H5 = 'H5/205035'
+export const I0 = 'I0/123247'
+export const I1 = 'I1/186251'
+export const I2 = 'I2/455864'
+export const I3 = 'I3/874267'
+export const I4 = 'I4/700662'
+export const I5 = 'I5/355687'
+export const J0 = 'J0/651505'
+export const J1 = 'J1/747356'
+export const J2 = 'J2/880562'
+export const J3 = 'J3/337247'
+export const J4 = 'J4/333302'
+export const J5 = 'J5/802321'
+export const K0 = 'K0/513509'
+export const K1 = 'K1/512199'
+export const K2 = 'K2/998695'
+export const K3 = 'K3/030175'
+export const K4 = 'K4/843537'
+export const K5 = 'K5/621841'
+export const L0 = 'L0/110539'
+export const L1 = 'L1/902119'
+export const L2 = 'L2/433601'
+export const L3 = 'L3/578589'
+export const L4 = 'L4/179159'
+export const L5 = 'L5/411430'
+export const M0 = 'M0/233209'
+export const M1 = 'M1/807305'
+export const M2 = 'M2/593452'
+export const M3 = 'M3/412948'
+export const M4 = 'M4/230935'
+export const M5 = 'M5/340624'
+export const N0 = 'N0/719700'
+export const N1 = 'N1/322330'
+export const N2 = 'N2/554905'
+export const N3 = 'N3/279414'
+export const N4 = 'N4/223549'
+export const N5 = 'N5/106430'
+export const O0 = 'O0/439753'
+export const O1 = 'O1/184934'
+export const O2 = 'O2/163117'
+export const O3 = 'O3/801944'
+export const O4 = 'O4/769058'
+export const O5 = 'O5/682431'
+export const P0 = 'P0/312289'
+export const P1 = 'P1/708697'
+export const P2 = 'P2/085809'
+export const P3 = 'P3/664012'
+export const P4 = 'P4/515888'
+export const P5 = 'P5/973781'
+export const Q0 = 'Q0/322861'
+export const Q1 = 'Q1/010908'
+export const Q2 = 'Q2/786194'
+export const Q3 = 'Q3/614951'
+export const Q4 = 'Q4/915803'
+export const Q5 = 'Q5/475163'
+export const R0 = 'R0/874630'
+export const R1 = 'R1/430647'
+export const R2 = 'R2/767178'
+export const R3 = 'R3/943288'
+export const R4 = 'R4/582084'
+export const R5 = 'R5/501429'
+export const S0 = 'S0/275258'
+export const S1 = 'S1/739500'
+export const S2 = 'S2/449586'
+export const S3 = 'S3/891280'
+export const S4 = 'S4/156946'
+export const S5 = 'S5/027482'
+export const T0 = 'T0/515259'
+export const T1 = 'T1/898487'
+export const T2 = 'T2/102538'
+export const T3 = 'T3/666778'
+export const T4 = 'T4/976512'
+export const T5 = 'T5/843268'
+export const U0 = 'U0/948132'
+export const U1 = 'U1/844531'
+export const U2 = 'U2/428499'
+export const U3 = 'U3/676721'
+export const U4 = 'U4/746122'
+export const U5 = 'U5/758627'
+export const V0 = 'V0/625208'
+export const V1 = 'V1/894664'
+export const V2 = 'V2/449156'
+export const V3 = 'V3/800489'
+export const V4 = 'V4/715514'
+export const V5 = 'V5/777528'
+export const W0 = 'W0/543856'
+export const W1 = 'W1/610464'
+export const W2 = 'W2/735768'
+export const W3 = 'W3/268620'
+export const W4 = 'W4/542722'
+export const W5 = 'W5/515212'
+export const X0 = 'X0/358710'
+export const X1 = 'X1/930435'
+export const X2 = 'X2/229496'
+export const X3 = 'X3/642411'
+export const X4 = 'X4/792973'
+export const X5 = 'X5/997958'
+export const Y0 = 'Y0/224673'
+export const Y1 = 'Y1/383255'
+export const Y2 = 'Y2/036710'
+export const Y3 = 'Y3/941868'
+export const Y4 = 'Y4/989940'
+export const Y5 = 'Y5/885038'
+export const Z0 = 'Z0/660512'
+export const Z1 = 'Z1/946648'
+export const Z2 = 'Z2/470347'
+export const Z3 = 'Z3/744138'
+export const Z4 = 'Z4/679676'
+export const Z5 = 'Z5/904085'
diff --git a/packages/repo/tests/commit-proof-fixtures.json b/packages/repo/tests/commit-proof-fixtures.json
new file mode 100644
index 00000000000..7b35fe88aa5
--- /dev/null
+++ b/packages/repo/tests/commit-proof-fixtures.json
@@ -0,0 +1,96 @@
+[
+  {
+    "comment": "two deep split",
+    "leafValue": "bafyreie5cvv4h45feadgeuwhbcutmh6t2ceseocckahdoe6uat64zmz454",
+    "keys": [
+      "A0/501344",
+      "B1/293486",
+      "C0/535043",
+      "E0/922708",
+      "F1/415452",
+      "G0/714257"
+    ],
+    "adds": ["D2/915466"],
+    "dels": [],
+    "rootBeforeCommit": "bafyreibthlzzn3rwvmomwf4dz6utt7yeh5eyn6qwbumvjfv35gwanh7ovq",
+    "rootAfterCommit": "bafyreidb6bxxylhmlzs4a6ruhcunv3fd32o6i5phlzkmjk6arletj2ua6a",
+    "blocksInProof": [
+      "bafyreidb6bxxylhmlzs4a6ruhcunv3fd32o6i5phlzkmjk6arletj2ua6a",
+      "bafyreifjsxnultnc3tbvnrawqpmrk6d76ymcstwcr5e3hn6u472nasb2xq",
+      "bafyreibzch5k5j5xkg6dcwmur2p6jqwavyjhdtvifr6g2gnccwhixibzsi",
+      "bafyreiamcu5ud3j4ovclrgq2sdyev5oajsmpnl2fdu5ffgpfint64n2jme",
+      "bafyreidxvw3sbdg4t5b2mbtozitnyu7kjien2zcrtgdj4ssgmjb72mzawe"
+    ]
+  },
+  {
+    "comment": "two deep leafless split",
+    "leafValue": "bafyreie5cvv4h45feadgeuwhbcutmh6t2ceseocckahdoe6uat64zmz454",
+    "keys": ["A0/501344", "B0/436099", "D0/360671", "E0/922708"],
+    "adds": ["C2/953910"],
+    "dels": [],
+    "rootBeforeCommit": "bafyreid7jnvjg7mr4akmyf7rtaz47duex2l47rz36nvs4i7yjnpuhfmehe",
+    "rootAfterCommit": "bafyreih2ry5gae5r4m47unhhuw4w2qjdhe6oprw3w2uico2tzbflwi74eu",
+    "blocksInProof": [
+      "bafyreih2ry5gae5r4m47unhhuw4w2qjdhe6oprw3w2uico2tzbflwi74eu",
+      "bafyreiag5ata5gtynbpef26l4kus2uz4nshuo526h275oljwlm5dwsvhqm",
+      "bafyreiaybgpm7ahyiy7fko7c4czjokhzajvimot6lfi6mxqzw2bzwoddn4",
+      "bafyreiheqxxydll4b4zlyemmegb7q3chs7aacczuotpxkqils6bufnsyse",
+      "bafyreigkijiuasyl5x4f2j3kxzou2vsdyc3vockx63r6bvgoip4ybhj2sa"
+    ]
+  },
+  {
+    "comment": "add on edge with neighbor two layers down",
+    "leafValue": "bafyreie5cvv4h45feadgeuwhbcutmh6t2ceseocckahdoe6uat64zmz454",
+    "keys": ["A0/501344", "B2/303249", "C0/535043"],
+    "adds": ["D2/915466"],
+    "dels": [],
+    "rootBeforeCommit": "bafyreifoy7ierkqljk37wozudqhqjuuahjnubqvd3qprx5ocwcfrx5v3hm",
+    "rootAfterCommit": "bafyreid2i3nxmsvv3ifb53nlkjh3qaymygrrxuno6z22gctzdme5lbptky",
+    "blocksInProof": [
+      "bafyreid2i3nxmsvv3ifb53nlkjh3qaymygrrxuno6z22gctzdme5lbptky",
+      "bafyreiagiwrefvm27hvgryirykp7reqcpz56v6txzksgbargjlibtpsqwu",
+      "bafyreiewdvzcopoza6bdntvhmvdfqeolql6sckkiu75jpvfnwwnfi57jia"
+    ]
+  },
+  {
+    "comment": "merge and split in multi-op commit",
+    "leafValue": "bafyreie5cvv4h45feadgeuwhbcutmh6t2ceseocckahdoe6uat64zmz454",
+    "keys": ["A0/501344", "B2/303249", "D2/915466", "E0/922708"],
+    "adds": ["C2/953910"],
+    "dels": ["B2/303249", "D2/915466"],
+    "rootBeforeCommit": "bafyreielnllkafudlseizljjx32rkkivlgxziqayhctgbxncw2srrox7ny",
+    "rootAfterCommit": "bafyreih6464tr7ue67qgllhiekgfmwiz45zuthrv72gwi2tjpuu5dbxt3a",
+    "blocksInProof": [
+      "bafyreih6464tr7ue67qgllhiekgfmwiz45zuthrv72gwi2tjpuu5dbxt3a",
+      "bafyreihexby6fnhajsjzzqkmegqpqt2lrr3rpesyl6kt3t3xppid7tuvfy",
+      "bafyreiciix65xuk62hu6ew6jdy3m2swqstvnuhuwcwffidk3nduf7eaoh4",
+      "bafyreieneexkszoung4zc5jzkjukjbbxm74ukz6mylydj7q2v42zqp6vmy",
+      "bafyreidxvw3sbdg4t5b2mbtozitnyu7kjien2zcrtgdj4ssgmjb72mzawe"
+    ]
+  },
+  {
+    "comment": "complex multi-op commit",
+    "leafValue": "bafyreie5cvv4h45feadgeuwhbcutmh6t2ceseocckahdoe6uat64zmz454",
+    "keys": [
+      "B0/436099",
+      "C2/953910",
+      "D0/360671",
+      "E2/413113",
+      "F0/606463",
+      "H0/740256"
+    ],
+    "adds": ["A2/239654", "G2/536869"],
+    "dels": ["C2/953910"],
+    "rootBeforeCommit": "bafyreiej4jqggfhidabjfrjgogdwed5eglhnboepxscbwfrss4uclnrrmi",
+    "rootAfterCommit": "bafyreifykpu67c4w4ynkx4lvjfjwxdofax6gx7j2wxrl6ewt3yslezcb6i",
+    "blocksInProof": [
+      "bafyreifykpu67c4w4ynkx4lvjfjwxdofax6gx7j2wxrl6ewt3yslezcb6i",
+      "bafyreig5pe2hdnhfbqleo6yyipkw3tdiju7tlm4sqp7btsiicxe4tex5de",
+      "bafyreievjgro75jk6ma3xwuqvalsydtzgvbbaduhazbvajvslaf3l6kcxu",
+      "bafyreieax6243224jnbout6ynursux2dvt6fabonofdu47dxupkxvmflvu",
+      "bafyreie44qmlnwlyeh6ubb2eocfko6st7gmbarplmcci6c7ilx24vh4iym",
+      "bafyreihlhqn4quwcgbum5g4wzkini2c42j7zi5dsjdgkzm55jxyvebndue",
+      "bafyreiggcbzkb2wgenvyfhkh2nggf7pohb7uzjm6bs7hixhjxw2xpmnq6u"
+    ]
+  }
+]
diff --git a/packages/repo/tests/commit-proofs.test.ts b/packages/repo/tests/commit-proofs.test.ts
new file mode 100644
index 00000000000..344d87a58c9
--- /dev/null
+++ b/packages/repo/tests/commit-proofs.test.ts
@@ -0,0 +1,63 @@
+import { CID } from 'multiformats'
+import { BlockMap } from '../src'
+import { MST } from '../src/mst'
+import { MemoryBlockstore } from '../src/storage'
+import fixtures from './commit-proof-fixtures.json'
+
+describe('commit proofs', () => {
+  for (const fixture of fixtures) {
+    it(fixture.comment, async () => {
+      const { leafValue, keys, adds, dels } = fixture
+      const leaf = CID.parse(leafValue)
+
+      const storage = new MemoryBlockstore()
+      let mst = await MST.create(storage)
+      for (const key of keys) {
+        mst = await mst.add(key, leaf)
+      }
+
+      const rootBeforeCommit = await mst.getPointer()
+      expect(rootBeforeCommit.toString()).toEqual(fixture.rootBeforeCommit)
+
+      for (const key of adds) {
+        mst = await mst.add(key, leaf)
+      }
+      for (const key of dels) {
+        mst = await mst.delete(key)
+      }
+      const rootAfterCommit = await mst.getPointer()
+      expect(rootAfterCommit.toString()).toEqual(fixture.rootAfterCommit)
+      const proofs = await Promise.all(
+        [...adds, ...dels].map((key) => mst.getCoveringProof(key)),
+      )
+      const proof = proofs.reduce((acc, cur) => acc.addMap(cur), new BlockMap())
+      const blocksInProof = fixture.blocksInProof.map((cid) => CID.parse(cid))
+      for (const cid of blocksInProof) {
+        expect(proof.has(cid)).toBe(true)
+      }
+
+      const invertAdds = adds.map((k) => (mst: MST) => mst.delete(k))
+      const invertDels = dels.map((k) => (mst: MST) => mst.add(k, leaf))
+      const invertOrders = permutations([...invertAdds, ...invertDels])
+
+      const proofStorage = new MemoryBlockstore(proof)
+      for (const order of invertOrders) {
+        let proofMst = await MST.load(proofStorage, rootAfterCommit)
+        for (const fn of order) {
+          proofMst = await fn(proofMst)
+        }
+        const rootAfterInvert = await proofMst.getPointer()
+        expect(rootAfterInvert.toString()).toEqual(fixture.rootBeforeCommit)
+      }
+    })
+  }
+})
+
+function permutations<T>(arr: T[]): T[][] {
+  if (arr.length <= 1) return [arr]
+
+  return arr.reduce((perms: T[][], item: T, i: number) => {
+    const rest = [...arr.slice(0, i), ...arr.slice(i + 1)]
+    return perms.concat(permutations(rest).map((p) => [item, ...p]))
+  }, [])
+}
diff --git a/packages/repo/tests/covering-proofs.test.ts b/packages/repo/tests/covering-proofs.test.ts
new file mode 100644
index 00000000000..90d761f5e7c
--- /dev/null
+++ b/packages/repo/tests/covering-proofs.test.ts
@@ -0,0 +1,256 @@
+import { CID } from 'multiformats'
+import { BlockMap } from '../src'
+import { MST } from '../src/mst'
+import { MemoryBlockstore } from '../src/storage'
+import * as k from './_keys'
+
+// @NOTE these tests are the exact same as the tests in commit-proof-fixtures.json but in code from
+// kept around currently because they are a bit easier to understand/work with
+// we should delete in the future once the fixtures are pulled into our test suite
+
+describe('covering proofs', () => {
+  /**
+   *
+   *                *                                  *
+   *       _________|________                      ____|____
+   *       |   |    |    |   |                    |    |    |
+   *       *   b  __*__  f   *       ->         __*__  d  __*__
+   *       |     |     |     |                 |  |  |   |  |  |
+   *       a     c     e     g                 *  b  *   *  f  *
+   *                                           |     |   |     |
+   *                                           a     c   e     g
+   *
+   *
+   *
+   */
+  it('two deep split ', async () => {
+    const storage = new MemoryBlockstore()
+    const cid = CID.parse(
+      'bafyreie5cvv4h45feadgeuwhbcutmh6t2ceseocckahdoe6uat64zmz454',
+    )
+
+    let mst = await MST.create(storage)
+    mst = await mst.add(k.A0, cid)
+    mst = await mst.add(k.B1, cid)
+    mst = await mst.add(k.C0, cid)
+    mst = await mst.add(k.E0, cid)
+    mst = await mst.add(k.F1, cid)
+    mst = await mst.add(k.G0, cid)
+
+    const rootBeforeCommit = await mst.getPointer()
+
+    mst = await mst.add(k.D2, cid)
+    const proof = await mst.getCoveringProof(k.D2)
+
+    const proofStorage = new MemoryBlockstore(proof)
+    let proofMst = await MST.load(proofStorage, await mst.getPointer())
+    proofMst = await proofMst.delete(k.D2)
+    const rootAfterInvert = await proofMst.getPointer()
+    expect(rootAfterInvert.equals(rootBeforeCommit)).toBe(true)
+  })
+
+  /**
+   *
+   *                *                               *
+   *           _____|_____                      ____|____
+   *           |  |   |  |                      |   |   |
+   *           a  b   d  e       ->             *   c   *
+   *                                            |       |
+   *                                          __*__   __*__
+   *                                          |   |   |   |
+   *                                          a   b   d   e
+   *
+   *
+   *
+   */
+  it('two deep leafless splits ', async () => {
+    const storage = new MemoryBlockstore()
+    const cid = CID.parse(
+      'bafyreie5cvv4h45feadgeuwhbcutmh6t2ceseocckahdoe6uat64zmz454',
+    )
+
+    let mst = await MST.create(storage)
+    mst = await mst.add(k.A0, cid)
+    mst = await mst.add(k.B0, cid)
+    mst = await mst.add(k.D0, cid)
+    mst = await mst.add(k.E0, cid)
+
+    const rootBeforeCommit = await mst.getPointer()
+
+    mst = await mst.add(k.C2, cid)
+    const proof = await mst.getCoveringProof(k.C2)
+
+    const proofStorage = new MemoryBlockstore(proof)
+    let proofMst = await MST.load(proofStorage, await mst.getPointer())
+    proofMst = await proofMst.delete(k.C2)
+    const rootAfterInvert = await proofMst.getPointer()
+    expect(rootAfterInvert.equals(rootBeforeCommit)).toBe(true)
+  })
+
+  /**
+   *
+   *               *                            *
+   *           ____|____                    ____|____
+   *          |    b    |                  |   |  |  |
+   *          *         *          ->      *   b  *  d
+   *          |         |                  |      |
+   *          a         c                  a      c
+   *
+   *
+   *
+   *
+   *
+   */
+  it('add on edge with neighbor two layers down', async () => {
+    const storage = new MemoryBlockstore()
+    const cid = CID.parse(
+      'bafyreie5cvv4h45feadgeuwhbcutmh6t2ceseocckahdoe6uat64zmz454',
+    )
+
+    let mst = await MST.create(storage)
+    mst = await mst.add(k.A0, cid)
+    mst = await mst.add(k.B2, cid)
+    mst = await mst.add(k.C0, cid)
+
+    const rootBeforeCommit = await mst.getPointer()
+
+    mst = await mst.add(k.D2, cid)
+    const proof = await mst.getCoveringProof(k.D2)
+
+    const proofStorage = new MemoryBlockstore(proof)
+    let proofMst = await MST.load(proofStorage, await mst.getPointer())
+    proofMst = await proofMst.delete(k.D2)
+    const rootAfterInvert = await proofMst.getPointer()
+    expect(rootAfterInvert.equals(rootBeforeCommit)).toBe(true)
+  })
+
+  /**
+   *
+   *                *                           *
+   *           _____|_____                 _____|_____
+   *          |   |   |   |               |     |     |
+   *          *   b   d   *     ->        *     c     *
+   *          |           |               |           |
+   *          a           e               a           e
+   *
+   *
+   *
+   *
+   *
+   */
+  it('merge and split in multi op commit', async () => {
+    const storage = new MemoryBlockstore()
+    const cid = CID.parse(
+      'bafyreie5cvv4h45feadgeuwhbcutmh6t2ceseocckahdoe6uat64zmz454',
+    )
+
+    let mst = await MST.create(storage)
+    mst = await mst.add(k.A0, cid)
+    mst = await mst.add(k.B2, cid)
+    mst = await mst.add(k.D2, cid)
+    mst = await mst.add(k.E0, cid)
+
+    const rootBeforeCommit = await mst.getPointer()
+
+    mst = await mst.delete(k.B2)
+    mst = await mst.delete(k.D2)
+    mst = await mst.add(k.C2, cid)
+
+    const proofs = await Promise.all([
+      mst.getCoveringProof(k.B2),
+      mst.getCoveringProof(k.D2),
+      mst.getCoveringProof(k.C2),
+    ])
+    const proof = proofs.reduce((acc, cur) => acc.addMap(cur), new BlockMap())
+    const proofStorage = new MemoryBlockstore(proof)
+
+    const addB = async (mst: MST) => mst.add(k.B2, cid)
+    const addD = async (mst: MST) => mst.add(k.D2, cid)
+    const delC = async (mst: MST) => mst.delete(k.C2)
+
+    const testOrder = async (fns: ((mst: MST) => Promise<MST>)[]) => {
+      let proofMst = await MST.load(proofStorage, await mst.getPointer())
+      for (const fn of fns) {
+        proofMst = await fn(proofMst)
+      }
+      const rootAfterInvert = await proofMst.getPointer()
+      expect(rootAfterInvert.equals(rootBeforeCommit)).toBe(true)
+    }
+
+    // test that the operations work in any order
+    await testOrder([addB, addD, delC])
+    await testOrder([addB, delC, addD])
+    await testOrder([addD, addB, delC])
+    await testOrder([addD, delC, addB])
+    await testOrder([delC, addB, addD])
+    await testOrder([delC, addD, addB])
+  })
+
+  // This complex multi op commit includes:
+  // - a two deep split
+  // - a two deep merge
+  // - an addition that requires knowledge of a leaf two deeper
+  /**
+   *
+   *                *                               *
+   *           _____|_____                    ______|_______
+   *          |  |  |  |  |                  |  |  |  |  |  |
+   *          *  c  *  e  *     ->           a  *  e  *  g  *
+   *          |     |    _|_                    |     |     |
+   *          *     *   |   |                  _*_    *     *
+   *          b     d   f   h                 |   |   |     |
+   *                                          b   d   f     h
+   *
+   *
+   *
+   */
+  it('complex multi-op commit', async () => {
+    const storage = new MemoryBlockstore()
+    const cid = CID.parse(
+      'bafyreie5cvv4h45feadgeuwhbcutmh6t2ceseocckahdoe6uat64zmz454',
+    )
+
+    let mst = await MST.create(storage)
+    mst = await mst.add(k.B0, cid)
+    mst = await mst.add(k.C2, cid)
+    mst = await mst.add(k.D0, cid)
+    mst = await mst.add(k.E2, cid)
+    mst = await mst.add(k.F0, cid)
+    mst = await mst.add(k.H0, cid)
+
+    const rootBeforeCommit = await mst.getPointer()
+
+    mst = await mst.add(k.A2, cid)
+    mst = await mst.add(k.G2, cid)
+    mst = await mst.delete(k.C2)
+
+    const proofs = await Promise.all([
+      mst.getCoveringProof(k.A2),
+      mst.getCoveringProof(k.G2),
+      mst.getCoveringProof(k.C2),
+    ])
+    const proof = proofs.reduce((acc, cur) => acc.addMap(cur), new BlockMap())
+    const proofStorage = new MemoryBlockstore(proof)
+
+    const delA = async (mst: MST) => mst.delete(k.A2)
+    const delG = async (mst: MST) => mst.delete(k.G2)
+    const addC = async (mst: MST) => mst.add(k.C2, cid)
+
+    const testOrder = async (fns: ((mst: MST) => Promise<MST>)[]) => {
+      let proofMst = await MST.load(proofStorage, await mst.getPointer())
+      for (const fn of fns) {
+        proofMst = await fn(proofMst)
+      }
+      const rootAfterInvert = await proofMst.getPointer()
+      expect(rootAfterInvert.equals(rootBeforeCommit)).toBe(true)
+    }
+
+    // test that the operations work in any order
+    await testOrder([delA, delG, addC])
+    await testOrder([delA, addC, delG])
+    await testOrder([delG, delA, addC])
+    await testOrder([delG, addC, delA])
+    await testOrder([addC, delA, delG])
+    await testOrder([addC, delG, delA])
+  })
+})

From 6e382f67aa73532efadfea80ff96a27b526cb178 Mon Sep 17 00:00:00 2001
From: bnewbold <bnewbold@robocracy.org>
Date: Fri, 21 Feb 2025 17:01:13 -0800
Subject: [PATCH 085/101] Lexicon updates for Sync v1.1 (inductive firehose)
 (#3391)

* mark 'blobs' as deprecated (can parse from records blocks)

* add 'prev' CID to record ops

* add inductive changes and #resync event

* updates from recent discussion

* add sync v1.1 account hosting status states (broken, throttled)

* prettier

* updates from discussion

* remove 'data' from #sync message

* add note on 'repo' field about inconsistent name

* codegen

* changeset
---
 .changeset/unlucky-tools-run.md               |  5 ++
 lexicons/com/atproto/sync/getRepoStatus.json  |  9 ++-
 lexicons/com/atproto/sync/listRepos.json      |  9 ++-
 lexicons/com/atproto/sync/subscribeRepos.json | 54 +++++++++++--
 packages/api/src/client/lexicons.ts           | 78 ++++++++++++++++---
 .../types/com/atproto/sync/getRepoStatus.ts   |  9 ++-
 .../types/com/atproto/sync/listRepos.ts       |  9 ++-
 .../types/com/atproto/sync/subscribeRepos.ts  | 44 +++++++++--
 packages/bsky/src/lexicon/lexicons.ts         | 78 ++++++++++++++++---
 .../types/com/atproto/sync/getRepoStatus.ts   |  9 ++-
 .../types/com/atproto/sync/listRepos.ts       |  9 ++-
 .../types/com/atproto/sync/subscribeRepos.ts  | 45 +++++++++--
 packages/ozone/src/lexicon/lexicons.ts        | 78 ++++++++++++++++---
 .../types/com/atproto/sync/getRepoStatus.ts   |  9 ++-
 .../types/com/atproto/sync/listRepos.ts       |  9 ++-
 .../types/com/atproto/sync/subscribeRepos.ts  | 45 +++++++++--
 packages/pds/src/lexicon/lexicons.ts          | 78 ++++++++++++++++---
 .../types/com/atproto/sync/getRepoStatus.ts   |  9 ++-
 .../types/com/atproto/sync/listRepos.ts       |  9 ++-
 .../types/com/atproto/sync/subscribeRepos.ts  | 45 +++++++++--
 20 files changed, 558 insertions(+), 82 deletions(-)
 create mode 100644 .changeset/unlucky-tools-run.md

diff --git a/.changeset/unlucky-tools-run.md b/.changeset/unlucky-tools-run.md
new file mode 100644
index 00000000000..ee0fe219a52
--- /dev/null
+++ b/.changeset/unlucky-tools-run.md
@@ -0,0 +1,5 @@
+---
+"@atproto/api": patch
+---
+
+update sync lexicons for induction firehose
diff --git a/lexicons/com/atproto/sync/getRepoStatus.json b/lexicons/com/atproto/sync/getRepoStatus.json
index 51dfb825b6b..347a710c7fa 100644
--- a/lexicons/com/atproto/sync/getRepoStatus.json
+++ b/lexicons/com/atproto/sync/getRepoStatus.json
@@ -27,7 +27,14 @@
             "status": {
               "type": "string",
               "description": "If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted.",
-              "knownValues": ["takendown", "suspended", "deactivated"]
+              "knownValues": [
+                "takendown",
+                "suspended",
+                "deleted",
+                "deactivated",
+                "desynchronized",
+                "throttled"
+              ]
             },
             "rev": {
               "type": "string",
diff --git a/lexicons/com/atproto/sync/listRepos.json b/lexicons/com/atproto/sync/listRepos.json
index ce240876d7c..8115bbd6867 100644
--- a/lexicons/com/atproto/sync/listRepos.json
+++ b/lexicons/com/atproto/sync/listRepos.json
@@ -47,7 +47,14 @@
         "status": {
           "type": "string",
           "description": "If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted.",
-          "knownValues": ["takendown", "suspended", "deactivated"]
+          "knownValues": [
+            "takendown",
+            "suspended",
+            "deleted",
+            "deactivated",
+            "desynchronized",
+            "throttled"
+          ]
         }
       }
     }
diff --git a/lexicons/com/atproto/sync/subscribeRepos.json b/lexicons/com/atproto/sync/subscribeRepos.json
index c92373dd2c9..b52a70d31f8 100644
--- a/lexicons/com/atproto/sync/subscribeRepos.json
+++ b/lexicons/com/atproto/sync/subscribeRepos.json
@@ -19,6 +19,7 @@
           "type": "union",
           "refs": [
             "#commit",
+            "#sync",
             "#identity",
             "#account",
             "#handle",
@@ -61,12 +62,12 @@
         "rebase": { "type": "boolean", "description": "DEPRECATED -- unused" },
         "tooBig": {
           "type": "boolean",
-          "description": "Indicates that this commit contained too many ops, or data size was too large. Consumers will need to make a separate request to get missing data."
+          "description": "DEPRECATED -- replaced by #sync event and data limits. Indicates that this commit contained too many ops, or data size was too large. Consumers will need to make a separate request to get missing data."
         },
         "repo": {
           "type": "string",
           "format": "did",
-          "description": "The repo this event comes from."
+          "description": "The repo this event comes from. Note that all other message types name this field 'did'."
         },
         "commit": {
           "type": "cid-link",
@@ -84,8 +85,8 @@
         },
         "blocks": {
           "type": "bytes",
-          "description": "CAR file containing relevant blocks, as a diff since the previous repo state.",
-          "maxLength": 1000000
+          "description": "CAR file containing relevant blocks, as a diff since the previous repo state. The commit must be included as a block, and the commit block CID must be the first entry in the CAR header 'roots' list.",
+          "maxLength": 2000000
         },
         "ops": {
           "type": "array",
@@ -100,12 +101,42 @@
           "type": "array",
           "items": {
             "type": "cid-link",
-            "description": "List of new blobs (by CID) referenced by records in this commit."
+            "description": "DEPRECATED -- will soon always be empty. List of new blobs (by CID) referenced by records in this commit."
           }
         },
         "prevData": {
           "type": "cid-link",
-          "description": "EXPERIMENTAL. The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose."
+          "description": "The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose."
+        },
+        "time": {
+          "type": "string",
+          "format": "datetime",
+          "description": "Timestamp of when this message was originally broadcast."
+        }
+      }
+    },
+    "sync": {
+      "type": "object",
+      "description": "Updates the repo to a new state, without necessarily including that state on the firehose. Used to recover from broken commit streams, data loss incidents, or in situations where upstream host does not know recent state of the repository.",
+      "required": ["seq", "did", "blocks", "rev", "time"],
+      "properties": {
+        "seq": {
+          "type": "integer",
+          "description": "The stream sequence number of this message."
+        },
+        "did": {
+          "type": "string",
+          "format": "did",
+          "description": "The account this repo event corresponds to. Must match that in the commit object."
+        },
+        "blocks": {
+          "type": "bytes",
+          "description": "CAR file containing the commit, as a block. The CAR header must include the commit block CID as the first 'root'.",
+          "maxLength": 10000
+        },
+        "rev": {
+          "type": "string",
+          "description": "The rev of the commit. This value must match that in the commit object."
         },
         "time": {
           "type": "string",
@@ -144,7 +175,14 @@
         "status": {
           "type": "string",
           "description": "If active=false, this optional field indicates a reason for why the account is not active.",
-          "knownValues": ["takendown", "suspended", "deleted", "deactivated"]
+          "knownValues": [
+            "takendown",
+            "suspended",
+            "deleted",
+            "deactivated",
+            "desynchronized",
+            "throttled"
+          ]
         }
       }
     },
@@ -211,7 +249,7 @@
         },
         "prev": {
           "type": "cid-link",
-          "description": "EXPERIMENTAL. For deletes and updates, the CID  of the previous record. For creates, undefined."
+          "description": "For updates and deletes, the previous record CID (required for inductive firehose). For creations, field should not be defined."
         }
       }
     }
diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
index 5bfaa47d21d..65add200b8c 100644
--- a/packages/api/src/client/lexicons.ts
+++ b/packages/api/src/client/lexicons.ts
@@ -3517,7 +3517,14 @@ export const schemaDict = {
                 type: 'string',
                 description:
                   'If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted.',
-                knownValues: ['takendown', 'suspended', 'deactivated'],
+                knownValues: [
+                  'takendown',
+                  'suspended',
+                  'deleted',
+                  'deactivated',
+                  'desynchronized',
+                  'throttled',
+                ],
               },
               rev: {
                 type: 'string',
@@ -3671,7 +3678,14 @@ export const schemaDict = {
             type: 'string',
             description:
               'If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted.',
-            knownValues: ['takendown', 'suspended', 'deactivated'],
+            knownValues: [
+              'takendown',
+              'suspended',
+              'deleted',
+              'deactivated',
+              'desynchronized',
+              'throttled',
+            ],
           },
         },
       },
@@ -3810,6 +3824,7 @@ export const schemaDict = {
             type: 'union',
             refs: [
               'lex:com.atproto.sync.subscribeRepos#commit',
+              'lex:com.atproto.sync.subscribeRepos#sync',
               'lex:com.atproto.sync.subscribeRepos#identity',
               'lex:com.atproto.sync.subscribeRepos#account',
               'lex:com.atproto.sync.subscribeRepos#handle',
@@ -3860,12 +3875,13 @@ export const schemaDict = {
           tooBig: {
             type: 'boolean',
             description:
-              'Indicates that this commit contained too many ops, or data size was too large. Consumers will need to make a separate request to get missing data.',
+              'DEPRECATED -- replaced by #sync event and data limits. Indicates that this commit contained too many ops, or data size was too large. Consumers will need to make a separate request to get missing data.',
           },
           repo: {
             type: 'string',
             format: 'did',
-            description: 'The repo this event comes from.',
+            description:
+              "The repo this event comes from. Note that all other message types name this field 'did'.",
           },
           commit: {
             type: 'cid-link',
@@ -3886,8 +3902,8 @@ export const schemaDict = {
           blocks: {
             type: 'bytes',
             description:
-              'CAR file containing relevant blocks, as a diff since the previous repo state.',
-            maxLength: 1000000,
+              "CAR file containing relevant blocks, as a diff since the previous repo state. The commit must be included as a block, and the commit block CID must be the first entry in the CAR header 'roots' list.",
+            maxLength: 2000000,
           },
           ops: {
             type: 'array',
@@ -3904,13 +3920,48 @@ export const schemaDict = {
             items: {
               type: 'cid-link',
               description:
-                'List of new blobs (by CID) referenced by records in this commit.',
+                'DEPRECATED -- will soon always be empty. List of new blobs (by CID) referenced by records in this commit.',
             },
           },
           prevData: {
             type: 'cid-link',
             description:
-              "EXPERIMENTAL. The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose.",
+              "The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose.",
+          },
+          time: {
+            type: 'string',
+            format: 'datetime',
+            description:
+              'Timestamp of when this message was originally broadcast.',
+          },
+        },
+      },
+      sync: {
+        type: 'object',
+        description:
+          'Updates the repo to a new state, without necessarily including that state on the firehose. Used to recover from broken commit streams, data loss incidents, or in situations where upstream host does not know recent state of the repository.',
+        required: ['seq', 'did', 'blocks', 'rev', 'time'],
+        properties: {
+          seq: {
+            type: 'integer',
+            description: 'The stream sequence number of this message.',
+          },
+          did: {
+            type: 'string',
+            format: 'did',
+            description:
+              'The account this repo event corresponds to. Must match that in the commit object.',
+          },
+          blocks: {
+            type: 'bytes',
+            description:
+              "CAR file containing the commit, as a block. The CAR header must include the commit block CID as the first 'root'.",
+            maxLength: 10000,
+          },
+          rev: {
+            type: 'string',
+            description:
+              'The rev of the commit. This value must match that in the commit object.',
           },
           time: {
             type: 'string',
@@ -3971,7 +4022,14 @@ export const schemaDict = {
             type: 'string',
             description:
               'If active=false, this optional field indicates a reason for why the account is not active.',
-            knownValues: ['takendown', 'suspended', 'deleted', 'deactivated'],
+            knownValues: [
+              'takendown',
+              'suspended',
+              'deleted',
+              'deactivated',
+              'desynchronized',
+              'throttled',
+            ],
           },
         },
       },
@@ -4071,7 +4129,7 @@ export const schemaDict = {
           prev: {
             type: 'cid-link',
             description:
-              'EXPERIMENTAL. For deletes and updates, the CID  of the previous record. For creates, undefined.',
+              'For updates and deletes, the previous record CID (required for inductive firehose). For creations, field should not be defined.',
           },
         },
       },
diff --git a/packages/api/src/client/types/com/atproto/sync/getRepoStatus.ts b/packages/api/src/client/types/com/atproto/sync/getRepoStatus.ts
index 31c7e61197b..d3a29b86b33 100644
--- a/packages/api/src/client/types/com/atproto/sync/getRepoStatus.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getRepoStatus.ts
@@ -22,7 +22,14 @@ export interface OutputSchema {
   did: string
   active: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
-  status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
+  status?:
+    | 'takendown'
+    | 'suspended'
+    | 'deleted'
+    | 'deactivated'
+    | 'desynchronized'
+    | 'throttled'
+    | (string & {})
   /** Optional field, the current rev of the repo, if active=true */
   rev?: string
 }
diff --git a/packages/api/src/client/types/com/atproto/sync/listRepos.ts b/packages/api/src/client/types/com/atproto/sync/listRepos.ts
index c38056ab69a..7ef1ff89b33 100644
--- a/packages/api/src/client/types/com/atproto/sync/listRepos.ts
+++ b/packages/api/src/client/types/com/atproto/sync/listRepos.ts
@@ -46,7 +46,14 @@ export interface Repo {
   rev: string
   active?: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
-  status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
+  status?:
+    | 'takendown'
+    | 'suspended'
+    | 'deleted'
+    | 'deactivated'
+    | 'desynchronized'
+    | 'throttled'
+    | (string & {})
 }
 
 const hashRepo = 'repo'
diff --git a/packages/api/src/client/types/com/atproto/sync/subscribeRepos.ts b/packages/api/src/client/types/com/atproto/sync/subscribeRepos.ts
index 671101cd512..c46173b458d 100644
--- a/packages/api/src/client/types/com/atproto/sync/subscribeRepos.ts
+++ b/packages/api/src/client/types/com/atproto/sync/subscribeRepos.ts
@@ -18,9 +18,9 @@ export interface Commit {
   seq: number
   /** DEPRECATED -- unused */
   rebase: boolean
-  /** Indicates that this commit contained too many ops, or data size was too large. Consumers will need to make a separate request to get missing data. */
+  /** DEPRECATED -- replaced by #sync event and data limits. Indicates that this commit contained too many ops, or data size was too large. Consumers will need to make a separate request to get missing data. */
   tooBig: boolean
-  /** The repo this event comes from. */
+  /** The repo this event comes from. Note that all other message types name this field 'did'. */
   repo: string
   /** Repo commit object CID. */
   commit: CID
@@ -28,11 +28,11 @@ export interface Commit {
   rev: string
   /** The rev of the last emitted commit from this repo (if any). */
   since: string | null
-  /** CAR file containing relevant blocks, as a diff since the previous repo state. */
+  /** CAR file containing relevant blocks, as a diff since the previous repo state. The commit must be included as a block, and the commit block CID must be the first entry in the CAR header 'roots' list. */
   blocks: Uint8Array
   ops: RepoOp[]
   blobs: CID[]
-  /** EXPERIMENTAL. The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose. */
+  /** The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose. */
   prevData?: CID
   /** Timestamp of when this message was originally broadcast. */
   time: string
@@ -48,6 +48,31 @@ export function validateCommit<V>(v: V) {
   return validate<Commit & V>(v, id, hashCommit)
 }
 
+/** Updates the repo to a new state, without necessarily including that state on the firehose. Used to recover from broken commit streams, data loss incidents, or in situations where upstream host does not know recent state of the repository. */
+export interface Sync {
+  $type?: 'com.atproto.sync.subscribeRepos#sync'
+  /** The stream sequence number of this message. */
+  seq: number
+  /** The account this repo event corresponds to. Must match that in the commit object. */
+  did: string
+  /** CAR file containing the commit, as a block. The CAR header must include the commit block CID as the first 'root'. */
+  blocks: Uint8Array
+  /** The rev of the commit. This value must match that in the commit object. */
+  rev: string
+  /** Timestamp of when this message was originally broadcast. */
+  time: string
+}
+
+const hashSync = 'sync'
+
+export function isSync<V>(v: V) {
+  return is$typed(v, id, hashSync)
+}
+
+export function validateSync<V>(v: V) {
+  return validate<Sync & V>(v, id, hashSync)
+}
+
 /** Represents a change to an account's identity. Could be an updated handle, signing key, or pds hosting endpoint. Serves as a prod to all downstream services to refresh their identity cache. */
 export interface Identity {
   $type?: 'com.atproto.sync.subscribeRepos#identity'
@@ -77,7 +102,14 @@ export interface Account {
   /** Indicates that the account has a repository which can be fetched from the host that emitted this event. */
   active: boolean
   /** If active=false, this optional field indicates a reason for why the account is not active. */
-  status?: 'takendown' | 'suspended' | 'deleted' | 'deactivated' | (string & {})
+  status?:
+    | 'takendown'
+    | 'suspended'
+    | 'deleted'
+    | 'deactivated'
+    | 'desynchronized'
+    | 'throttled'
+    | (string & {})
 }
 
 const hashAccount = 'account'
@@ -169,7 +201,7 @@ export interface RepoOp {
   path: string
   /** For creates and updates, the new record CID. For deletions, null. */
   cid: CID | null
-  /** EXPERIMENTAL. For deletes and updates, the CID  of the previous record. For creates, undefined. */
+  /** For updates and deletes, the previous record CID (required for inductive firehose). For creations, field should not be defined. */
   prev?: CID
 }
 
diff --git a/packages/bsky/src/lexicon/lexicons.ts b/packages/bsky/src/lexicon/lexicons.ts
index 6d6f13e4ab7..f9b6e43340f 100644
--- a/packages/bsky/src/lexicon/lexicons.ts
+++ b/packages/bsky/src/lexicon/lexicons.ts
@@ -3517,7 +3517,14 @@ export const schemaDict = {
                 type: 'string',
                 description:
                   'If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted.',
-                knownValues: ['takendown', 'suspended', 'deactivated'],
+                knownValues: [
+                  'takendown',
+                  'suspended',
+                  'deleted',
+                  'deactivated',
+                  'desynchronized',
+                  'throttled',
+                ],
               },
               rev: {
                 type: 'string',
@@ -3671,7 +3678,14 @@ export const schemaDict = {
             type: 'string',
             description:
               'If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted.',
-            knownValues: ['takendown', 'suspended', 'deactivated'],
+            knownValues: [
+              'takendown',
+              'suspended',
+              'deleted',
+              'deactivated',
+              'desynchronized',
+              'throttled',
+            ],
           },
         },
       },
@@ -3810,6 +3824,7 @@ export const schemaDict = {
             type: 'union',
             refs: [
               'lex:com.atproto.sync.subscribeRepos#commit',
+              'lex:com.atproto.sync.subscribeRepos#sync',
               'lex:com.atproto.sync.subscribeRepos#identity',
               'lex:com.atproto.sync.subscribeRepos#account',
               'lex:com.atproto.sync.subscribeRepos#handle',
@@ -3860,12 +3875,13 @@ export const schemaDict = {
           tooBig: {
             type: 'boolean',
             description:
-              'Indicates that this commit contained too many ops, or data size was too large. Consumers will need to make a separate request to get missing data.',
+              'DEPRECATED -- replaced by #sync event and data limits. Indicates that this commit contained too many ops, or data size was too large. Consumers will need to make a separate request to get missing data.',
           },
           repo: {
             type: 'string',
             format: 'did',
-            description: 'The repo this event comes from.',
+            description:
+              "The repo this event comes from. Note that all other message types name this field 'did'.",
           },
           commit: {
             type: 'cid-link',
@@ -3886,8 +3902,8 @@ export const schemaDict = {
           blocks: {
             type: 'bytes',
             description:
-              'CAR file containing relevant blocks, as a diff since the previous repo state.',
-            maxLength: 1000000,
+              "CAR file containing relevant blocks, as a diff since the previous repo state. The commit must be included as a block, and the commit block CID must be the first entry in the CAR header 'roots' list.",
+            maxLength: 2000000,
           },
           ops: {
             type: 'array',
@@ -3904,13 +3920,48 @@ export const schemaDict = {
             items: {
               type: 'cid-link',
               description:
-                'List of new blobs (by CID) referenced by records in this commit.',
+                'DEPRECATED -- will soon always be empty. List of new blobs (by CID) referenced by records in this commit.',
             },
           },
           prevData: {
             type: 'cid-link',
             description:
-              "EXPERIMENTAL. The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose.",
+              "The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose.",
+          },
+          time: {
+            type: 'string',
+            format: 'datetime',
+            description:
+              'Timestamp of when this message was originally broadcast.',
+          },
+        },
+      },
+      sync: {
+        type: 'object',
+        description:
+          'Updates the repo to a new state, without necessarily including that state on the firehose. Used to recover from broken commit streams, data loss incidents, or in situations where upstream host does not know recent state of the repository.',
+        required: ['seq', 'did', 'blocks', 'rev', 'time'],
+        properties: {
+          seq: {
+            type: 'integer',
+            description: 'The stream sequence number of this message.',
+          },
+          did: {
+            type: 'string',
+            format: 'did',
+            description:
+              'The account this repo event corresponds to. Must match that in the commit object.',
+          },
+          blocks: {
+            type: 'bytes',
+            description:
+              "CAR file containing the commit, as a block. The CAR header must include the commit block CID as the first 'root'.",
+            maxLength: 10000,
+          },
+          rev: {
+            type: 'string',
+            description:
+              'The rev of the commit. This value must match that in the commit object.',
           },
           time: {
             type: 'string',
@@ -3971,7 +4022,14 @@ export const schemaDict = {
             type: 'string',
             description:
               'If active=false, this optional field indicates a reason for why the account is not active.',
-            knownValues: ['takendown', 'suspended', 'deleted', 'deactivated'],
+            knownValues: [
+              'takendown',
+              'suspended',
+              'deleted',
+              'deactivated',
+              'desynchronized',
+              'throttled',
+            ],
           },
         },
       },
@@ -4071,7 +4129,7 @@ export const schemaDict = {
           prev: {
             type: 'cid-link',
             description:
-              'EXPERIMENTAL. For deletes and updates, the CID  of the previous record. For creates, undefined.',
+              'For updates and deletes, the previous record CID (required for inductive firehose). For creations, field should not be defined.',
           },
         },
       },
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getRepoStatus.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
index e23b538dc38..b6d327750cc 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
@@ -23,7 +23,14 @@ export interface OutputSchema {
   did: string
   active: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
-  status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
+  status?:
+    | 'takendown'
+    | 'suspended'
+    | 'deleted'
+    | 'deactivated'
+    | 'desynchronized'
+    | 'throttled'
+    | (string & {})
   /** Optional field, the current rev of the repo, if active=true */
   rev?: string
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/listRepos.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/listRepos.ts
index 22d1cfa2db6..241e8e68b52 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/listRepos.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/listRepos.ts
@@ -58,7 +58,14 @@ export interface Repo {
   rev: string
   active?: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
-  status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
+  status?:
+    | 'takendown'
+    | 'suspended'
+    | 'deleted'
+    | 'deactivated'
+    | 'desynchronized'
+    | 'throttled'
+    | (string & {})
 }
 
 const hashRepo = 'repo'
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/subscribeRepos.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
index c5c4f9bf2eb..decfb210b25 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
@@ -19,6 +19,7 @@ export interface QueryParams {
 
 export type OutputSchema =
   | $Typed<Commit>
+  | $Typed<Sync>
   | $Typed<Identity>
   | $Typed<Account>
   | $Typed<Handle>
@@ -45,9 +46,9 @@ export interface Commit {
   seq: number
   /** DEPRECATED -- unused */
   rebase: boolean
-  /** Indicates that this commit contained too many ops, or data size was too large. Consumers will need to make a separate request to get missing data. */
+  /** DEPRECATED -- replaced by #sync event and data limits. Indicates that this commit contained too many ops, or data size was too large. Consumers will need to make a separate request to get missing data. */
   tooBig: boolean
-  /** The repo this event comes from. */
+  /** The repo this event comes from. Note that all other message types name this field 'did'. */
   repo: string
   /** Repo commit object CID. */
   commit: CID
@@ -55,11 +56,11 @@ export interface Commit {
   rev: string
   /** The rev of the last emitted commit from this repo (if any). */
   since: string | null
-  /** CAR file containing relevant blocks, as a diff since the previous repo state. */
+  /** CAR file containing relevant blocks, as a diff since the previous repo state. The commit must be included as a block, and the commit block CID must be the first entry in the CAR header 'roots' list. */
   blocks: Uint8Array
   ops: RepoOp[]
   blobs: CID[]
-  /** EXPERIMENTAL. The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose. */
+  /** The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose. */
   prevData?: CID
   /** Timestamp of when this message was originally broadcast. */
   time: string
@@ -75,6 +76,31 @@ export function validateCommit<V>(v: V) {
   return validate<Commit & V>(v, id, hashCommit)
 }
 
+/** Updates the repo to a new state, without necessarily including that state on the firehose. Used to recover from broken commit streams, data loss incidents, or in situations where upstream host does not know recent state of the repository. */
+export interface Sync {
+  $type?: 'com.atproto.sync.subscribeRepos#sync'
+  /** The stream sequence number of this message. */
+  seq: number
+  /** The account this repo event corresponds to. Must match that in the commit object. */
+  did: string
+  /** CAR file containing the commit, as a block. The CAR header must include the commit block CID as the first 'root'. */
+  blocks: Uint8Array
+  /** The rev of the commit. This value must match that in the commit object. */
+  rev: string
+  /** Timestamp of when this message was originally broadcast. */
+  time: string
+}
+
+const hashSync = 'sync'
+
+export function isSync<V>(v: V) {
+  return is$typed(v, id, hashSync)
+}
+
+export function validateSync<V>(v: V) {
+  return validate<Sync & V>(v, id, hashSync)
+}
+
 /** Represents a change to an account's identity. Could be an updated handle, signing key, or pds hosting endpoint. Serves as a prod to all downstream services to refresh their identity cache. */
 export interface Identity {
   $type?: 'com.atproto.sync.subscribeRepos#identity'
@@ -104,7 +130,14 @@ export interface Account {
   /** Indicates that the account has a repository which can be fetched from the host that emitted this event. */
   active: boolean
   /** If active=false, this optional field indicates a reason for why the account is not active. */
-  status?: 'takendown' | 'suspended' | 'deleted' | 'deactivated' | (string & {})
+  status?:
+    | 'takendown'
+    | 'suspended'
+    | 'deleted'
+    | 'deactivated'
+    | 'desynchronized'
+    | 'throttled'
+    | (string & {})
 }
 
 const hashAccount = 'account'
@@ -196,7 +229,7 @@ export interface RepoOp {
   path: string
   /** For creates and updates, the new record CID. For deletions, null. */
   cid: CID | null
-  /** EXPERIMENTAL. For deletes and updates, the CID  of the previous record. For creates, undefined. */
+  /** For updates and deletes, the previous record CID (required for inductive firehose). For creations, field should not be defined. */
   prev?: CID
 }
 
diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
index 5bfaa47d21d..65add200b8c 100644
--- a/packages/ozone/src/lexicon/lexicons.ts
+++ b/packages/ozone/src/lexicon/lexicons.ts
@@ -3517,7 +3517,14 @@ export const schemaDict = {
                 type: 'string',
                 description:
                   'If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted.',
-                knownValues: ['takendown', 'suspended', 'deactivated'],
+                knownValues: [
+                  'takendown',
+                  'suspended',
+                  'deleted',
+                  'deactivated',
+                  'desynchronized',
+                  'throttled',
+                ],
               },
               rev: {
                 type: 'string',
@@ -3671,7 +3678,14 @@ export const schemaDict = {
             type: 'string',
             description:
               'If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted.',
-            knownValues: ['takendown', 'suspended', 'deactivated'],
+            knownValues: [
+              'takendown',
+              'suspended',
+              'deleted',
+              'deactivated',
+              'desynchronized',
+              'throttled',
+            ],
           },
         },
       },
@@ -3810,6 +3824,7 @@ export const schemaDict = {
             type: 'union',
             refs: [
               'lex:com.atproto.sync.subscribeRepos#commit',
+              'lex:com.atproto.sync.subscribeRepos#sync',
               'lex:com.atproto.sync.subscribeRepos#identity',
               'lex:com.atproto.sync.subscribeRepos#account',
               'lex:com.atproto.sync.subscribeRepos#handle',
@@ -3860,12 +3875,13 @@ export const schemaDict = {
           tooBig: {
             type: 'boolean',
             description:
-              'Indicates that this commit contained too many ops, or data size was too large. Consumers will need to make a separate request to get missing data.',
+              'DEPRECATED -- replaced by #sync event and data limits. Indicates that this commit contained too many ops, or data size was too large. Consumers will need to make a separate request to get missing data.',
           },
           repo: {
             type: 'string',
             format: 'did',
-            description: 'The repo this event comes from.',
+            description:
+              "The repo this event comes from. Note that all other message types name this field 'did'.",
           },
           commit: {
             type: 'cid-link',
@@ -3886,8 +3902,8 @@ export const schemaDict = {
           blocks: {
             type: 'bytes',
             description:
-              'CAR file containing relevant blocks, as a diff since the previous repo state.',
-            maxLength: 1000000,
+              "CAR file containing relevant blocks, as a diff since the previous repo state. The commit must be included as a block, and the commit block CID must be the first entry in the CAR header 'roots' list.",
+            maxLength: 2000000,
           },
           ops: {
             type: 'array',
@@ -3904,13 +3920,48 @@ export const schemaDict = {
             items: {
               type: 'cid-link',
               description:
-                'List of new blobs (by CID) referenced by records in this commit.',
+                'DEPRECATED -- will soon always be empty. List of new blobs (by CID) referenced by records in this commit.',
             },
           },
           prevData: {
             type: 'cid-link',
             description:
-              "EXPERIMENTAL. The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose.",
+              "The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose.",
+          },
+          time: {
+            type: 'string',
+            format: 'datetime',
+            description:
+              'Timestamp of when this message was originally broadcast.',
+          },
+        },
+      },
+      sync: {
+        type: 'object',
+        description:
+          'Updates the repo to a new state, without necessarily including that state on the firehose. Used to recover from broken commit streams, data loss incidents, or in situations where upstream host does not know recent state of the repository.',
+        required: ['seq', 'did', 'blocks', 'rev', 'time'],
+        properties: {
+          seq: {
+            type: 'integer',
+            description: 'The stream sequence number of this message.',
+          },
+          did: {
+            type: 'string',
+            format: 'did',
+            description:
+              'The account this repo event corresponds to. Must match that in the commit object.',
+          },
+          blocks: {
+            type: 'bytes',
+            description:
+              "CAR file containing the commit, as a block. The CAR header must include the commit block CID as the first 'root'.",
+            maxLength: 10000,
+          },
+          rev: {
+            type: 'string',
+            description:
+              'The rev of the commit. This value must match that in the commit object.',
           },
           time: {
             type: 'string',
@@ -3971,7 +4022,14 @@ export const schemaDict = {
             type: 'string',
             description:
               'If active=false, this optional field indicates a reason for why the account is not active.',
-            knownValues: ['takendown', 'suspended', 'deleted', 'deactivated'],
+            knownValues: [
+              'takendown',
+              'suspended',
+              'deleted',
+              'deactivated',
+              'desynchronized',
+              'throttled',
+            ],
           },
         },
       },
@@ -4071,7 +4129,7 @@ export const schemaDict = {
           prev: {
             type: 'cid-link',
             description:
-              'EXPERIMENTAL. For deletes and updates, the CID  of the previous record. For creates, undefined.',
+              'For updates and deletes, the previous record CID (required for inductive firehose). For creations, field should not be defined.',
           },
         },
       },
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getRepoStatus.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
index e23b538dc38..b6d327750cc 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
@@ -23,7 +23,14 @@ export interface OutputSchema {
   did: string
   active: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
-  status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
+  status?:
+    | 'takendown'
+    | 'suspended'
+    | 'deleted'
+    | 'deactivated'
+    | 'desynchronized'
+    | 'throttled'
+    | (string & {})
   /** Optional field, the current rev of the repo, if active=true */
   rev?: string
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/listRepos.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/listRepos.ts
index 22d1cfa2db6..241e8e68b52 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/listRepos.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/listRepos.ts
@@ -58,7 +58,14 @@ export interface Repo {
   rev: string
   active?: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
-  status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
+  status?:
+    | 'takendown'
+    | 'suspended'
+    | 'deleted'
+    | 'deactivated'
+    | 'desynchronized'
+    | 'throttled'
+    | (string & {})
 }
 
 const hashRepo = 'repo'
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/subscribeRepos.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
index c5c4f9bf2eb..decfb210b25 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
@@ -19,6 +19,7 @@ export interface QueryParams {
 
 export type OutputSchema =
   | $Typed<Commit>
+  | $Typed<Sync>
   | $Typed<Identity>
   | $Typed<Account>
   | $Typed<Handle>
@@ -45,9 +46,9 @@ export interface Commit {
   seq: number
   /** DEPRECATED -- unused */
   rebase: boolean
-  /** Indicates that this commit contained too many ops, or data size was too large. Consumers will need to make a separate request to get missing data. */
+  /** DEPRECATED -- replaced by #sync event and data limits. Indicates that this commit contained too many ops, or data size was too large. Consumers will need to make a separate request to get missing data. */
   tooBig: boolean
-  /** The repo this event comes from. */
+  /** The repo this event comes from. Note that all other message types name this field 'did'. */
   repo: string
   /** Repo commit object CID. */
   commit: CID
@@ -55,11 +56,11 @@ export interface Commit {
   rev: string
   /** The rev of the last emitted commit from this repo (if any). */
   since: string | null
-  /** CAR file containing relevant blocks, as a diff since the previous repo state. */
+  /** CAR file containing relevant blocks, as a diff since the previous repo state. The commit must be included as a block, and the commit block CID must be the first entry in the CAR header 'roots' list. */
   blocks: Uint8Array
   ops: RepoOp[]
   blobs: CID[]
-  /** EXPERIMENTAL. The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose. */
+  /** The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose. */
   prevData?: CID
   /** Timestamp of when this message was originally broadcast. */
   time: string
@@ -75,6 +76,31 @@ export function validateCommit<V>(v: V) {
   return validate<Commit & V>(v, id, hashCommit)
 }
 
+/** Updates the repo to a new state, without necessarily including that state on the firehose. Used to recover from broken commit streams, data loss incidents, or in situations where upstream host does not know recent state of the repository. */
+export interface Sync {
+  $type?: 'com.atproto.sync.subscribeRepos#sync'
+  /** The stream sequence number of this message. */
+  seq: number
+  /** The account this repo event corresponds to. Must match that in the commit object. */
+  did: string
+  /** CAR file containing the commit, as a block. The CAR header must include the commit block CID as the first 'root'. */
+  blocks: Uint8Array
+  /** The rev of the commit. This value must match that in the commit object. */
+  rev: string
+  /** Timestamp of when this message was originally broadcast. */
+  time: string
+}
+
+const hashSync = 'sync'
+
+export function isSync<V>(v: V) {
+  return is$typed(v, id, hashSync)
+}
+
+export function validateSync<V>(v: V) {
+  return validate<Sync & V>(v, id, hashSync)
+}
+
 /** Represents a change to an account's identity. Could be an updated handle, signing key, or pds hosting endpoint. Serves as a prod to all downstream services to refresh their identity cache. */
 export interface Identity {
   $type?: 'com.atproto.sync.subscribeRepos#identity'
@@ -104,7 +130,14 @@ export interface Account {
   /** Indicates that the account has a repository which can be fetched from the host that emitted this event. */
   active: boolean
   /** If active=false, this optional field indicates a reason for why the account is not active. */
-  status?: 'takendown' | 'suspended' | 'deleted' | 'deactivated' | (string & {})
+  status?:
+    | 'takendown'
+    | 'suspended'
+    | 'deleted'
+    | 'deactivated'
+    | 'desynchronized'
+    | 'throttled'
+    | (string & {})
 }
 
 const hashAccount = 'account'
@@ -196,7 +229,7 @@ export interface RepoOp {
   path: string
   /** For creates and updates, the new record CID. For deletions, null. */
   cid: CID | null
-  /** EXPERIMENTAL. For deletes and updates, the CID  of the previous record. For creates, undefined. */
+  /** For updates and deletes, the previous record CID (required for inductive firehose). For creations, field should not be defined. */
   prev?: CID
 }
 
diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
index 5bfaa47d21d..65add200b8c 100644
--- a/packages/pds/src/lexicon/lexicons.ts
+++ b/packages/pds/src/lexicon/lexicons.ts
@@ -3517,7 +3517,14 @@ export const schemaDict = {
                 type: 'string',
                 description:
                   'If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted.',
-                knownValues: ['takendown', 'suspended', 'deactivated'],
+                knownValues: [
+                  'takendown',
+                  'suspended',
+                  'deleted',
+                  'deactivated',
+                  'desynchronized',
+                  'throttled',
+                ],
               },
               rev: {
                 type: 'string',
@@ -3671,7 +3678,14 @@ export const schemaDict = {
             type: 'string',
             description:
               'If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted.',
-            knownValues: ['takendown', 'suspended', 'deactivated'],
+            knownValues: [
+              'takendown',
+              'suspended',
+              'deleted',
+              'deactivated',
+              'desynchronized',
+              'throttled',
+            ],
           },
         },
       },
@@ -3810,6 +3824,7 @@ export const schemaDict = {
             type: 'union',
             refs: [
               'lex:com.atproto.sync.subscribeRepos#commit',
+              'lex:com.atproto.sync.subscribeRepos#sync',
               'lex:com.atproto.sync.subscribeRepos#identity',
               'lex:com.atproto.sync.subscribeRepos#account',
               'lex:com.atproto.sync.subscribeRepos#handle',
@@ -3860,12 +3875,13 @@ export const schemaDict = {
           tooBig: {
             type: 'boolean',
             description:
-              'Indicates that this commit contained too many ops, or data size was too large. Consumers will need to make a separate request to get missing data.',
+              'DEPRECATED -- replaced by #sync event and data limits. Indicates that this commit contained too many ops, or data size was too large. Consumers will need to make a separate request to get missing data.',
           },
           repo: {
             type: 'string',
             format: 'did',
-            description: 'The repo this event comes from.',
+            description:
+              "The repo this event comes from. Note that all other message types name this field 'did'.",
           },
           commit: {
             type: 'cid-link',
@@ -3886,8 +3902,8 @@ export const schemaDict = {
           blocks: {
             type: 'bytes',
             description:
-              'CAR file containing relevant blocks, as a diff since the previous repo state.',
-            maxLength: 1000000,
+              "CAR file containing relevant blocks, as a diff since the previous repo state. The commit must be included as a block, and the commit block CID must be the first entry in the CAR header 'roots' list.",
+            maxLength: 2000000,
           },
           ops: {
             type: 'array',
@@ -3904,13 +3920,48 @@ export const schemaDict = {
             items: {
               type: 'cid-link',
               description:
-                'List of new blobs (by CID) referenced by records in this commit.',
+                'DEPRECATED -- will soon always be empty. List of new blobs (by CID) referenced by records in this commit.',
             },
           },
           prevData: {
             type: 'cid-link',
             description:
-              "EXPERIMENTAL. The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose.",
+              "The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose.",
+          },
+          time: {
+            type: 'string',
+            format: 'datetime',
+            description:
+              'Timestamp of when this message was originally broadcast.',
+          },
+        },
+      },
+      sync: {
+        type: 'object',
+        description:
+          'Updates the repo to a new state, without necessarily including that state on the firehose. Used to recover from broken commit streams, data loss incidents, or in situations where upstream host does not know recent state of the repository.',
+        required: ['seq', 'did', 'blocks', 'rev', 'time'],
+        properties: {
+          seq: {
+            type: 'integer',
+            description: 'The stream sequence number of this message.',
+          },
+          did: {
+            type: 'string',
+            format: 'did',
+            description:
+              'The account this repo event corresponds to. Must match that in the commit object.',
+          },
+          blocks: {
+            type: 'bytes',
+            description:
+              "CAR file containing the commit, as a block. The CAR header must include the commit block CID as the first 'root'.",
+            maxLength: 10000,
+          },
+          rev: {
+            type: 'string',
+            description:
+              'The rev of the commit. This value must match that in the commit object.',
           },
           time: {
             type: 'string',
@@ -3971,7 +4022,14 @@ export const schemaDict = {
             type: 'string',
             description:
               'If active=false, this optional field indicates a reason for why the account is not active.',
-            knownValues: ['takendown', 'suspended', 'deleted', 'deactivated'],
+            knownValues: [
+              'takendown',
+              'suspended',
+              'deleted',
+              'deactivated',
+              'desynchronized',
+              'throttled',
+            ],
           },
         },
       },
@@ -4071,7 +4129,7 @@ export const schemaDict = {
           prev: {
             type: 'cid-link',
             description:
-              'EXPERIMENTAL. For deletes and updates, the CID  of the previous record. For creates, undefined.',
+              'For updates and deletes, the previous record CID (required for inductive firehose). For creations, field should not be defined.',
           },
         },
       },
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getRepoStatus.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
index e23b538dc38..b6d327750cc 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
@@ -23,7 +23,14 @@ export interface OutputSchema {
   did: string
   active: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
-  status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
+  status?:
+    | 'takendown'
+    | 'suspended'
+    | 'deleted'
+    | 'deactivated'
+    | 'desynchronized'
+    | 'throttled'
+    | (string & {})
   /** Optional field, the current rev of the repo, if active=true */
   rev?: string
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/listRepos.ts b/packages/pds/src/lexicon/types/com/atproto/sync/listRepos.ts
index 22d1cfa2db6..241e8e68b52 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/listRepos.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/listRepos.ts
@@ -58,7 +58,14 @@ export interface Repo {
   rev: string
   active?: boolean
   /** If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. */
-  status?: 'takendown' | 'suspended' | 'deactivated' | (string & {})
+  status?:
+    | 'takendown'
+    | 'suspended'
+    | 'deleted'
+    | 'deactivated'
+    | 'desynchronized'
+    | 'throttled'
+    | (string & {})
 }
 
 const hashRepo = 'repo'
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/subscribeRepos.ts b/packages/pds/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
index c5c4f9bf2eb..decfb210b25 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
@@ -19,6 +19,7 @@ export interface QueryParams {
 
 export type OutputSchema =
   | $Typed<Commit>
+  | $Typed<Sync>
   | $Typed<Identity>
   | $Typed<Account>
   | $Typed<Handle>
@@ -45,9 +46,9 @@ export interface Commit {
   seq: number
   /** DEPRECATED -- unused */
   rebase: boolean
-  /** Indicates that this commit contained too many ops, or data size was too large. Consumers will need to make a separate request to get missing data. */
+  /** DEPRECATED -- replaced by #sync event and data limits. Indicates that this commit contained too many ops, or data size was too large. Consumers will need to make a separate request to get missing data. */
   tooBig: boolean
-  /** The repo this event comes from. */
+  /** The repo this event comes from. Note that all other message types name this field 'did'. */
   repo: string
   /** Repo commit object CID. */
   commit: CID
@@ -55,11 +56,11 @@ export interface Commit {
   rev: string
   /** The rev of the last emitted commit from this repo (if any). */
   since: string | null
-  /** CAR file containing relevant blocks, as a diff since the previous repo state. */
+  /** CAR file containing relevant blocks, as a diff since the previous repo state. The commit must be included as a block, and the commit block CID must be the first entry in the CAR header 'roots' list. */
   blocks: Uint8Array
   ops: RepoOp[]
   blobs: CID[]
-  /** EXPERIMENTAL. The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose. */
+  /** The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose. */
   prevData?: CID
   /** Timestamp of when this message was originally broadcast. */
   time: string
@@ -75,6 +76,31 @@ export function validateCommit<V>(v: V) {
   return validate<Commit & V>(v, id, hashCommit)
 }
 
+/** Updates the repo to a new state, without necessarily including that state on the firehose. Used to recover from broken commit streams, data loss incidents, or in situations where upstream host does not know recent state of the repository. */
+export interface Sync {
+  $type?: 'com.atproto.sync.subscribeRepos#sync'
+  /** The stream sequence number of this message. */
+  seq: number
+  /** The account this repo event corresponds to. Must match that in the commit object. */
+  did: string
+  /** CAR file containing the commit, as a block. The CAR header must include the commit block CID as the first 'root'. */
+  blocks: Uint8Array
+  /** The rev of the commit. This value must match that in the commit object. */
+  rev: string
+  /** Timestamp of when this message was originally broadcast. */
+  time: string
+}
+
+const hashSync = 'sync'
+
+export function isSync<V>(v: V) {
+  return is$typed(v, id, hashSync)
+}
+
+export function validateSync<V>(v: V) {
+  return validate<Sync & V>(v, id, hashSync)
+}
+
 /** Represents a change to an account's identity. Could be an updated handle, signing key, or pds hosting endpoint. Serves as a prod to all downstream services to refresh their identity cache. */
 export interface Identity {
   $type?: 'com.atproto.sync.subscribeRepos#identity'
@@ -104,7 +130,14 @@ export interface Account {
   /** Indicates that the account has a repository which can be fetched from the host that emitted this event. */
   active: boolean
   /** If active=false, this optional field indicates a reason for why the account is not active. */
-  status?: 'takendown' | 'suspended' | 'deleted' | 'deactivated' | (string & {})
+  status?:
+    | 'takendown'
+    | 'suspended'
+    | 'deleted'
+    | 'deactivated'
+    | 'desynchronized'
+    | 'throttled'
+    | (string & {})
 }
 
 const hashAccount = 'account'
@@ -196,7 +229,7 @@ export interface RepoOp {
   path: string
   /** For creates and updates, the new record CID. For deletions, null. */
   cid: CID | null
-  /** EXPERIMENTAL. For deletes and updates, the CID  of the previous record. For creates, undefined. */
+  /** For updates and deletes, the previous record CID (required for inductive firehose). For creations, field should not be defined. */
   prev?: CID
 }
 

From 5e6112615784a10e852a52b99718c66646e2f5e7 Mon Sep 17 00:00:00 2001
From: Foysal Ahamed <foysal@blueskyweb.xyz>
Date: Mon, 24 Feb 2025 13:15:20 +0000
Subject: [PATCH 086/101] :bug: Store empty comment for ozone events (#3571)

* :bug: Store empty comment for ozone events

* :sparkles: Make comment property optional

* :memo: Better comment event description
---
 lexicons/tools/ozone/moderation/defs.json                     | 3 +--
 packages/api/src/client/lexicons.ts                           | 4 ++--
 packages/api/src/client/types/tools/ozone/moderation/defs.ts  | 4 ++--
 packages/ozone/src/lexicon/lexicons.ts                        | 4 ++--
 .../ozone/src/lexicon/types/tools/ozone/moderation/defs.ts    | 4 ++--
 packages/pds/src/lexicon/lexicons.ts                          | 4 ++--
 packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts | 4 ++--
 7 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/lexicons/tools/ozone/moderation/defs.json b/lexicons/tools/ozone/moderation/defs.json
index b0be0ed51b1..15e3ff1dcc9 100644
--- a/lexicons/tools/ozone/moderation/defs.json
+++ b/lexicons/tools/ozone/moderation/defs.json
@@ -337,8 +337,7 @@
     },
     "modEventComment": {
       "type": "object",
-      "description": "Add a comment to a subject",
-      "required": ["comment"],
+      "description": "Add a comment to a subject. An empty comment will clear any previously set sticky comment.",
       "properties": {
         "comment": {
           "type": "string"
diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
index 65add200b8c..383cd5d7c46 100644
--- a/packages/api/src/client/lexicons.ts
+++ b/packages/api/src/client/lexicons.ts
@@ -11840,8 +11840,8 @@ export const schemaDict = {
       },
       modEventComment: {
         type: 'object',
-        description: 'Add a comment to a subject',
-        required: ['comment'],
+        description:
+          'Add a comment to a subject. An empty comment will clear any previously set sticky comment.',
         properties: {
           comment: {
             type: 'string',
diff --git a/packages/api/src/client/types/tools/ozone/moderation/defs.ts b/packages/api/src/client/types/tools/ozone/moderation/defs.ts
index b1803cada95..496fcc22bb7 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/defs.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/defs.ts
@@ -284,10 +284,10 @@ export function validateModEventResolveAppeal<V>(v: V) {
   return validate<ModEventResolveAppeal & V>(v, id, hashModEventResolveAppeal)
 }
 
-/** Add a comment to a subject */
+/** Add a comment to a subject. An empty comment will clear any previously set sticky comment. */
 export interface ModEventComment {
   $type?: 'tools.ozone.moderation.defs#modEventComment'
-  comment: string
+  comment?: string
   /** Make the comment persistent on the subject */
   sticky?: boolean
 }
diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
index 65add200b8c..383cd5d7c46 100644
--- a/packages/ozone/src/lexicon/lexicons.ts
+++ b/packages/ozone/src/lexicon/lexicons.ts
@@ -11840,8 +11840,8 @@ export const schemaDict = {
       },
       modEventComment: {
         type: 'object',
-        description: 'Add a comment to a subject',
-        required: ['comment'],
+        description:
+          'Add a comment to a subject. An empty comment will clear any previously set sticky comment.',
         properties: {
           comment: {
             type: 'string',
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts
index b1803cada95..496fcc22bb7 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts
@@ -284,10 +284,10 @@ export function validateModEventResolveAppeal<V>(v: V) {
   return validate<ModEventResolveAppeal & V>(v, id, hashModEventResolveAppeal)
 }
 
-/** Add a comment to a subject */
+/** Add a comment to a subject. An empty comment will clear any previously set sticky comment. */
 export interface ModEventComment {
   $type?: 'tools.ozone.moderation.defs#modEventComment'
-  comment: string
+  comment?: string
   /** Make the comment persistent on the subject */
   sticky?: boolean
 }
diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
index 65add200b8c..383cd5d7c46 100644
--- a/packages/pds/src/lexicon/lexicons.ts
+++ b/packages/pds/src/lexicon/lexicons.ts
@@ -11840,8 +11840,8 @@ export const schemaDict = {
       },
       modEventComment: {
         type: 'object',
-        description: 'Add a comment to a subject',
-        required: ['comment'],
+        description:
+          'Add a comment to a subject. An empty comment will clear any previously set sticky comment.',
         properties: {
           comment: {
             type: 'string',
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts
index b1803cada95..496fcc22bb7 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts
@@ -284,10 +284,10 @@ export function validateModEventResolveAppeal<V>(v: V) {
   return validate<ModEventResolveAppeal & V>(v, id, hashModEventResolveAppeal)
 }
 
-/** Add a comment to a subject */
+/** Add a comment to a subject. An empty comment will clear any previously set sticky comment. */
 export interface ModEventComment {
   $type?: 'tools.ozone.moderation.defs#modEventComment'
-  comment: string
+  comment?: string
   /** Make the comment persistent on the subject */
   sticky?: boolean
 }

From 9b643fbecac30de5cfdb80d0671bfa55e9f4512a Mon Sep 17 00:00:00 2001
From: Foysal Ahamed <foysal@blueskyweb.xyz>
Date: Mon, 24 Feb 2025 13:19:06 +0000
Subject: [PATCH 087/101] :memo: Make comment property optional on ozone
 comment event (#3572)

---
 .changeset/real-bats-rule.md | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .changeset/real-bats-rule.md

diff --git a/.changeset/real-bats-rule.md b/.changeset/real-bats-rule.md
new file mode 100644
index 00000000000..1b45295a65f
--- /dev/null
+++ b/.changeset/real-bats-rule.md
@@ -0,0 +1,7 @@
+---
+"@atproto/api": patch
+"@atproto/ozone": patch
+"@atproto/pds": patch
+---
+
+Make comment property optional on ozone comment event

From 95299e0f62012e4a09c9d239c713b636d42b63be Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 24 Feb 2025 14:29:37 +0100
Subject: [PATCH 088/101] Version packages (#3566)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/kind-buttons-worry.md |  7 -------
 .changeset/real-bats-rule.md     |  7 -------
 .changeset/unlucky-tools-run.md  |  5 -----
 packages/api/CHANGELOG.md        | 10 ++++++++++
 packages/api/package.json        |  2 +-
 packages/aws/CHANGELOG.md        |  7 +++++++
 packages/aws/package.json        |  2 +-
 packages/bsky/CHANGELOG.md       |  9 +++++++++
 packages/bsky/package.json       |  2 +-
 packages/dev-env/CHANGELOG.md    | 11 +++++++++++
 packages/dev-env/package.json    |  2 +-
 packages/ozone/CHANGELOG.md      |  9 +++++++++
 packages/ozone/package.json      |  2 +-
 packages/pds/CHANGELOG.md        | 13 +++++++++++++
 packages/pds/package.json        |  2 +-
 packages/repo/CHANGELOG.md       |  6 ++++++
 packages/repo/package.json       |  2 +-
 packages/sync/CHANGELOG.md       |  7 +++++++
 packages/sync/package.json       |  2 +-
 19 files changed, 80 insertions(+), 27 deletions(-)
 delete mode 100644 .changeset/kind-buttons-worry.md
 delete mode 100644 .changeset/real-bats-rule.md
 delete mode 100644 .changeset/unlucky-tools-run.md

diff --git a/.changeset/kind-buttons-worry.md b/.changeset/kind-buttons-worry.md
deleted file mode 100644
index 2cc8c7d1ee9..00000000000
--- a/.changeset/kind-buttons-worry.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-"@atproto/repo": minor
-"@atproto/api": patch
-"@atproto/pds": patch
----
-
-Updated subscribeRepo to include prev CIDs for operations and covering proofs for all ops.
diff --git a/.changeset/real-bats-rule.md b/.changeset/real-bats-rule.md
deleted file mode 100644
index 1b45295a65f..00000000000
--- a/.changeset/real-bats-rule.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-"@atproto/api": patch
-"@atproto/ozone": patch
-"@atproto/pds": patch
----
-
-Make comment property optional on ozone comment event
diff --git a/.changeset/unlucky-tools-run.md b/.changeset/unlucky-tools-run.md
deleted file mode 100644
index ee0fe219a52..00000000000
--- a/.changeset/unlucky-tools-run.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/api": patch
----
-
-update sync lexicons for induction firehose
diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md
index 85f9d71f572..3958483ffc1 100644
--- a/packages/api/CHANGELOG.md
+++ b/packages/api/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @atproto/api
 
+## 0.14.5
+
+### Patch Changes
+
+- [#3449](https://github.com/bluesky-social/atproto/pull/3449) [`7e3678c08`](https://github.com/bluesky-social/atproto/commit/7e3678c089d2faa1a884a52a4fb80b8116c9854f) Thanks [@dholms](https://github.com/dholms)! - Updated subscribeRepo to include prev CIDs for operations and covering proofs for all ops.
+
+- [#3572](https://github.com/bluesky-social/atproto/pull/3572) [`9b643fbec`](https://github.com/bluesky-social/atproto/commit/9b643fbecac30de5cfdb80d0671bfa55e9f4512a) Thanks [@foysalit](https://github.com/foysalit)! - Make comment property optional on ozone comment event
+
+- [#3391](https://github.com/bluesky-social/atproto/pull/3391) [`6e382f67a`](https://github.com/bluesky-social/atproto/commit/6e382f67aa73532efadfea80ff96a27b526cb178) Thanks [@bnewbold](https://github.com/bnewbold)! - update sync lexicons for induction firehose
+
 ## 0.14.4
 
 ### Patch Changes
diff --git a/packages/api/package.json b/packages/api/package.json
index dc18b632d3f..174767a1182 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/api",
-  "version": "0.14.4",
+  "version": "0.14.5",
   "license": "MIT",
   "description": "Client library for atproto and Bluesky",
   "keywords": [
diff --git a/packages/aws/CHANGELOG.md b/packages/aws/CHANGELOG.md
index 2ed95ff626d..1897bed12c1 100644
--- a/packages/aws/CHANGELOG.md
+++ b/packages/aws/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/aws
 
+## 0.2.16
+
+### Patch Changes
+
+- Updated dependencies [[`7e3678c08`](https://github.com/bluesky-social/atproto/commit/7e3678c089d2faa1a884a52a4fb80b8116c9854f)]:
+  - @atproto/repo@0.7.0
+
 ## 0.2.15
 
 ### Patch Changes
diff --git a/packages/aws/package.json b/packages/aws/package.json
index 5b16fe4c93d..fd865d154c0 100644
--- a/packages/aws/package.json
+++ b/packages/aws/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/aws",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "license": "MIT",
   "description": "Shared AWS cloud API helpers for atproto services",
   "keywords": [
diff --git a/packages/bsky/CHANGELOG.md b/packages/bsky/CHANGELOG.md
index 5500cf967ea..9ad17db53fe 100644
--- a/packages/bsky/CHANGELOG.md
+++ b/packages/bsky/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @atproto/bsky
 
+## 0.0.122
+
+### Patch Changes
+
+- Updated dependencies [[`7e3678c08`](https://github.com/bluesky-social/atproto/commit/7e3678c089d2faa1a884a52a4fb80b8116c9854f), [`9b643fbec`](https://github.com/bluesky-social/atproto/commit/9b643fbecac30de5cfdb80d0671bfa55e9f4512a), [`6e382f67a`](https://github.com/bluesky-social/atproto/commit/6e382f67aa73532efadfea80ff96a27b526cb178)]:
+  - @atproto/repo@0.7.0
+  - @atproto/api@0.14.5
+  - @atproto/sync@0.1.15
+
 ## 0.0.121
 
 ### Patch Changes
diff --git a/packages/bsky/package.json b/packages/bsky/package.json
index 11388cea87b..c82416d2b75 100644
--- a/packages/bsky/package.json
+++ b/packages/bsky/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.121",
+  "version": "0.0.122",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
diff --git a/packages/dev-env/CHANGELOG.md b/packages/dev-env/CHANGELOG.md
index f4b5f2ceb71..8f3971e9023 100644
--- a/packages/dev-env/CHANGELOG.md
+++ b/packages/dev-env/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @atproto/dev-env
 
+## 0.3.94
+
+### Patch Changes
+
+- Updated dependencies [[`7e3678c08`](https://github.com/bluesky-social/atproto/commit/7e3678c089d2faa1a884a52a4fb80b8116c9854f), [`9b643fbec`](https://github.com/bluesky-social/atproto/commit/9b643fbecac30de5cfdb80d0671bfa55e9f4512a), [`6e382f67a`](https://github.com/bluesky-social/atproto/commit/6e382f67aa73532efadfea80ff96a27b526cb178)]:
+  - @atproto/api@0.14.5
+  - @atproto/pds@0.4.101
+  - @atproto/ozone@0.1.84
+  - @atproto/bsky@0.0.122
+  - @atproto/sync@0.1.15
+
 ## 0.3.93
 
 ### Patch Changes
diff --git a/packages/dev-env/package.json b/packages/dev-env/package.json
index 38e507d04a7..95d95cf4881 100644
--- a/packages/dev-env/package.json
+++ b/packages/dev-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/dev-env",
-  "version": "0.3.93",
+  "version": "0.3.94",
   "license": "MIT",
   "description": "Local development environment helper for atproto development",
   "keywords": [
diff --git a/packages/ozone/CHANGELOG.md b/packages/ozone/CHANGELOG.md
index 6a327f67c54..340ff8b92c8 100644
--- a/packages/ozone/CHANGELOG.md
+++ b/packages/ozone/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @atproto/ozone
 
+## 0.1.84
+
+### Patch Changes
+
+- [#3572](https://github.com/bluesky-social/atproto/pull/3572) [`9b643fbec`](https://github.com/bluesky-social/atproto/commit/9b643fbecac30de5cfdb80d0671bfa55e9f4512a) Thanks [@foysalit](https://github.com/foysalit)! - Make comment property optional on ozone comment event
+
+- Updated dependencies [[`7e3678c08`](https://github.com/bluesky-social/atproto/commit/7e3678c089d2faa1a884a52a4fb80b8116c9854f), [`9b643fbec`](https://github.com/bluesky-social/atproto/commit/9b643fbecac30de5cfdb80d0671bfa55e9f4512a), [`6e382f67a`](https://github.com/bluesky-social/atproto/commit/6e382f67aa73532efadfea80ff96a27b526cb178)]:
+  - @atproto/api@0.14.5
+
 ## 0.1.83
 
 ### Patch Changes
diff --git a/packages/ozone/package.json b/packages/ozone/package.json
index 05fb2565c44..8ada8a9e5b5 100644
--- a/packages/ozone/package.json
+++ b/packages/ozone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.1.83",
+  "version": "0.1.84",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
diff --git a/packages/pds/CHANGELOG.md b/packages/pds/CHANGELOG.md
index d5bf78427bf..6b19b08a0f5 100644
--- a/packages/pds/CHANGELOG.md
+++ b/packages/pds/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @atproto/pds
 
+## 0.4.101
+
+### Patch Changes
+
+- [#3449](https://github.com/bluesky-social/atproto/pull/3449) [`7e3678c08`](https://github.com/bluesky-social/atproto/commit/7e3678c089d2faa1a884a52a4fb80b8116c9854f) Thanks [@dholms](https://github.com/dholms)! - Updated subscribeRepo to include prev CIDs for operations and covering proofs for all ops.
+
+- [#3572](https://github.com/bluesky-social/atproto/pull/3572) [`9b643fbec`](https://github.com/bluesky-social/atproto/commit/9b643fbecac30de5cfdb80d0671bfa55e9f4512a) Thanks [@foysalit](https://github.com/foysalit)! - Make comment property optional on ozone comment event
+
+- Updated dependencies [[`7e3678c08`](https://github.com/bluesky-social/atproto/commit/7e3678c089d2faa1a884a52a4fb80b8116c9854f), [`9b643fbec`](https://github.com/bluesky-social/atproto/commit/9b643fbecac30de5cfdb80d0671bfa55e9f4512a), [`6e382f67a`](https://github.com/bluesky-social/atproto/commit/6e382f67aa73532efadfea80ff96a27b526cb178)]:
+  - @atproto/repo@0.7.0
+  - @atproto/api@0.14.5
+  - @atproto/aws@0.2.16
+
 ## 0.4.100
 
 ### Patch Changes
diff --git a/packages/pds/package.json b/packages/pds/package.json
index 30fae1f9279..a7fbad32b38 100644
--- a/packages/pds/package.json
+++ b/packages/pds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/pds",
-  "version": "0.4.100",
+  "version": "0.4.101",
   "license": "MIT",
   "description": "Reference implementation of atproto Personal Data Server (PDS)",
   "keywords": [
diff --git a/packages/repo/CHANGELOG.md b/packages/repo/CHANGELOG.md
index 75d7940762b..fed4b2049df 100644
--- a/packages/repo/CHANGELOG.md
+++ b/packages/repo/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @atproto/repo
 
+## 0.7.0
+
+### Minor Changes
+
+- [#3449](https://github.com/bluesky-social/atproto/pull/3449) [`7e3678c08`](https://github.com/bluesky-social/atproto/commit/7e3678c089d2faa1a884a52a4fb80b8116c9854f) Thanks [@dholms](https://github.com/dholms)! - Updated subscribeRepo to include prev CIDs for operations and covering proofs for all ops.
+
 ## 0.6.5
 
 ### Patch Changes
diff --git a/packages/repo/package.json b/packages/repo/package.json
index 190679fe9a7..3664f326391 100644
--- a/packages/repo/package.json
+++ b/packages/repo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/repo",
-  "version": "0.6.5",
+  "version": "0.7.0",
   "license": "MIT",
   "description": "atproto repo and MST implementation",
   "keywords": [
diff --git a/packages/sync/CHANGELOG.md b/packages/sync/CHANGELOG.md
index bd29b398d71..c9c80ff4615 100644
--- a/packages/sync/CHANGELOG.md
+++ b/packages/sync/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/sync
 
+## 0.1.15
+
+### Patch Changes
+
+- Updated dependencies [[`7e3678c08`](https://github.com/bluesky-social/atproto/commit/7e3678c089d2faa1a884a52a4fb80b8116c9854f)]:
+  - @atproto/repo@0.7.0
+
 ## 0.1.14
 
 ### Patch Changes
diff --git a/packages/sync/package.json b/packages/sync/package.json
index c162bd4a792..f54fe6285f7 100644
--- a/packages/sync/package.json
+++ b/packages/sync/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/sync",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "license": "MIT",
   "description": "atproto sync library",
   "keywords": [

From 44f81f2eb9229e21aec4472b3a05e855396dbec5 Mon Sep 17 00:00:00 2001
From: rafael <rafael@blueskyweb.xyz>
Date: Mon, 24 Feb 2025 13:15:33 -0800
Subject: [PATCH 089/101] Add chat.bsky.convo.updateAllRead lex (#3576)

---
 .changeset/six-fishes-wink.md                 |  5 ++
 lexicons/chat/bsky/convo/updateAllRead.json   | 34 ++++++++++++
 packages/api/src/client/index.ts              | 14 +++++
 packages/api/src/client/lexicons.ts           | 35 ++++++++++++
 .../types/chat/bsky/convo/updateAllRead.ts    | 40 ++++++++++++++
 packages/bsky/src/lexicon/index.ts            | 12 +++++
 packages/bsky/src/lexicon/lexicons.ts         | 35 ++++++++++++
 .../types/chat/bsky/convo/updateAllRead.ts    | 53 +++++++++++++++++++
 packages/ozone/src/lexicon/index.ts           | 12 +++++
 packages/ozone/src/lexicon/lexicons.ts        | 35 ++++++++++++
 .../types/chat/bsky/convo/updateAllRead.ts    | 53 +++++++++++++++++++
 packages/pds/src/lexicon/index.ts             | 12 +++++
 packages/pds/src/lexicon/lexicons.ts          | 35 ++++++++++++
 .../types/chat/bsky/convo/updateAllRead.ts    | 53 +++++++++++++++++++
 14 files changed, 428 insertions(+)
 create mode 100644 .changeset/six-fishes-wink.md
 create mode 100644 lexicons/chat/bsky/convo/updateAllRead.json
 create mode 100644 packages/api/src/client/types/chat/bsky/convo/updateAllRead.ts
 create mode 100644 packages/bsky/src/lexicon/types/chat/bsky/convo/updateAllRead.ts
 create mode 100644 packages/ozone/src/lexicon/types/chat/bsky/convo/updateAllRead.ts
 create mode 100644 packages/pds/src/lexicon/types/chat/bsky/convo/updateAllRead.ts

diff --git a/.changeset/six-fishes-wink.md b/.changeset/six-fishes-wink.md
new file mode 100644
index 00000000000..a422bca05b8
--- /dev/null
+++ b/.changeset/six-fishes-wink.md
@@ -0,0 +1,5 @@
+---
+"@atproto/api": patch
+---
+
+Add chat.bsky.convo.updateAllRead lex
diff --git a/lexicons/chat/bsky/convo/updateAllRead.json b/lexicons/chat/bsky/convo/updateAllRead.json
new file mode 100644
index 00000000000..eab4b29efa3
--- /dev/null
+++ b/lexicons/chat/bsky/convo/updateAllRead.json
@@ -0,0 +1,34 @@
+{
+  "lexicon": 1,
+  "id": "chat.bsky.convo.updateAllRead",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "input": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "properties": {
+            "status": {
+              "type": "string",
+              "knownValues": ["request", "accepted"]
+            }
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["updatedCount"],
+          "properties": {
+            "updatedCount": {
+              "description": "The count of updated convos.",
+              "type": "integer"
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/packages/api/src/client/index.ts b/packages/api/src/client/index.ts
index b8e88e4aef6..ed749b3d3d5 100644
--- a/packages/api/src/client/index.ts
+++ b/packages/api/src/client/index.ts
@@ -196,6 +196,7 @@ import * as ChatBskyConvoMuteConvo from './types/chat/bsky/convo/muteConvo.js'
 import * as ChatBskyConvoSendMessage from './types/chat/bsky/convo/sendMessage.js'
 import * as ChatBskyConvoSendMessageBatch from './types/chat/bsky/convo/sendMessageBatch.js'
 import * as ChatBskyConvoUnmuteConvo from './types/chat/bsky/convo/unmuteConvo.js'
+import * as ChatBskyConvoUpdateAllRead from './types/chat/bsky/convo/updateAllRead.js'
 import * as ChatBskyConvoUpdateRead from './types/chat/bsky/convo/updateRead.js'
 import * as ChatBskyModerationGetActorMetadata from './types/chat/bsky/moderation/getActorMetadata.js'
 import * as ChatBskyModerationGetMessageContext from './types/chat/bsky/moderation/getMessageContext.js'
@@ -429,6 +430,7 @@ export * as ChatBskyConvoMuteConvo from './types/chat/bsky/convo/muteConvo.js'
 export * as ChatBskyConvoSendMessage from './types/chat/bsky/convo/sendMessage.js'
 export * as ChatBskyConvoSendMessageBatch from './types/chat/bsky/convo/sendMessageBatch.js'
 export * as ChatBskyConvoUnmuteConvo from './types/chat/bsky/convo/unmuteConvo.js'
+export * as ChatBskyConvoUpdateAllRead from './types/chat/bsky/convo/updateAllRead.js'
 export * as ChatBskyConvoUpdateRead from './types/chat/bsky/convo/updateRead.js'
 export * as ChatBskyModerationGetActorMetadata from './types/chat/bsky/moderation/getActorMetadata.js'
 export * as ChatBskyModerationGetMessageContext from './types/chat/bsky/moderation/getMessageContext.js'
@@ -3564,6 +3566,18 @@ export class ChatBskyConvoNS {
     )
   }
 
+  updateAllRead(
+    data?: ChatBskyConvoUpdateAllRead.InputSchema,
+    opts?: ChatBskyConvoUpdateAllRead.CallOptions,
+  ): Promise<ChatBskyConvoUpdateAllRead.Response> {
+    return this._client.call(
+      'chat.bsky.convo.updateAllRead',
+      opts?.qp,
+      data,
+      opts,
+    )
+  }
+
   updateRead(
     data?: ChatBskyConvoUpdateRead.InputSchema,
     opts?: ChatBskyConvoUpdateRead.CallOptions,
diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
index 383cd5d7c46..abececf5d20 100644
--- a/packages/api/src/client/lexicons.ts
+++ b/packages/api/src/client/lexicons.ts
@@ -11042,6 +11042,40 @@ export const schemaDict = {
       },
     },
   },
+  ChatBskyConvoUpdateAllRead: {
+    lexicon: 1,
+    id: 'chat.bsky.convo.updateAllRead',
+    defs: {
+      main: {
+        type: 'procedure',
+        input: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            properties: {
+              status: {
+                type: 'string',
+                knownValues: ['request', 'accepted'],
+              },
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['updatedCount'],
+            properties: {
+              updatedCount: {
+                description: 'The count of updated convos.',
+                type: 'integer',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
   ChatBskyConvoUpdateRead: {
     lexicon: 1,
     id: 'chat.bsky.convo.updateRead',
@@ -14508,6 +14542,7 @@ export const ids = {
   ChatBskyConvoSendMessage: 'chat.bsky.convo.sendMessage',
   ChatBskyConvoSendMessageBatch: 'chat.bsky.convo.sendMessageBatch',
   ChatBskyConvoUnmuteConvo: 'chat.bsky.convo.unmuteConvo',
+  ChatBskyConvoUpdateAllRead: 'chat.bsky.convo.updateAllRead',
   ChatBskyConvoUpdateRead: 'chat.bsky.convo.updateRead',
   ChatBskyModerationGetActorMetadata: 'chat.bsky.moderation.getActorMetadata',
   ChatBskyModerationGetMessageContext: 'chat.bsky.moderation.getMessageContext',
diff --git a/packages/api/src/client/types/chat/bsky/convo/updateAllRead.ts b/packages/api/src/client/types/chat/bsky/convo/updateAllRead.ts
new file mode 100644
index 00000000000..4ed9f272c81
--- /dev/null
+++ b/packages/api/src/client/types/chat/bsky/convo/updateAllRead.ts
@@ -0,0 +1,40 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { HeadersMap, XRPCError } from '@atproto/xrpc'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.updateAllRead'
+
+export interface QueryParams {}
+
+export interface InputSchema {
+  status?: 'request' | 'accepted' | (string & {})
+}
+
+export interface OutputSchema {
+  /** The count of updated convos. */
+  updatedCount: number
+}
+
+export interface CallOptions {
+  signal?: AbortSignal
+  headers?: HeadersMap
+  qp?: QueryParams
+  encoding?: 'application/json'
+}
+
+export interface Response {
+  success: boolean
+  headers: HeadersMap
+  data: OutputSchema
+}
+
+export function toKnownErr(e: any) {
+  return e
+}
diff --git a/packages/bsky/src/lexicon/index.ts b/packages/bsky/src/lexicon/index.ts
index 6e93f0dd4bd..dc073de665a 100644
--- a/packages/bsky/src/lexicon/index.ts
+++ b/packages/bsky/src/lexicon/index.ts
@@ -163,6 +163,7 @@ import * as ChatBskyConvoMuteConvo from './types/chat/bsky/convo/muteConvo.js'
 import * as ChatBskyConvoSendMessage from './types/chat/bsky/convo/sendMessage.js'
 import * as ChatBskyConvoSendMessageBatch from './types/chat/bsky/convo/sendMessageBatch.js'
 import * as ChatBskyConvoUnmuteConvo from './types/chat/bsky/convo/unmuteConvo.js'
+import * as ChatBskyConvoUpdateAllRead from './types/chat/bsky/convo/updateAllRead.js'
 import * as ChatBskyConvoUpdateRead from './types/chat/bsky/convo/updateRead.js'
 import * as ChatBskyModerationGetActorMetadata from './types/chat/bsky/moderation/getActorMetadata.js'
 import * as ChatBskyModerationGetMessageContext from './types/chat/bsky/moderation/getMessageContext.js'
@@ -2170,6 +2171,17 @@ export class ChatBskyConvoNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
+  updateAllRead<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ChatBskyConvoUpdateAllRead.Handler<ExtractAuth<AV>>,
+      ChatBskyConvoUpdateAllRead.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'chat.bsky.convo.updateAllRead' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   updateRead<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,
diff --git a/packages/bsky/src/lexicon/lexicons.ts b/packages/bsky/src/lexicon/lexicons.ts
index f9b6e43340f..bc8443a5c44 100644
--- a/packages/bsky/src/lexicon/lexicons.ts
+++ b/packages/bsky/src/lexicon/lexicons.ts
@@ -11042,6 +11042,40 @@ export const schemaDict = {
       },
     },
   },
+  ChatBskyConvoUpdateAllRead: {
+    lexicon: 1,
+    id: 'chat.bsky.convo.updateAllRead',
+    defs: {
+      main: {
+        type: 'procedure',
+        input: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            properties: {
+              status: {
+                type: 'string',
+                knownValues: ['request', 'accepted'],
+              },
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['updatedCount'],
+            properties: {
+              updatedCount: {
+                description: 'The count of updated convos.',
+                type: 'integer',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
   ChatBskyConvoUpdateRead: {
     lexicon: 1,
     id: 'chat.bsky.convo.updateRead',
@@ -11462,6 +11496,7 @@ export const ids = {
   ChatBskyConvoSendMessage: 'chat.bsky.convo.sendMessage',
   ChatBskyConvoSendMessageBatch: 'chat.bsky.convo.sendMessageBatch',
   ChatBskyConvoUnmuteConvo: 'chat.bsky.convo.unmuteConvo',
+  ChatBskyConvoUpdateAllRead: 'chat.bsky.convo.updateAllRead',
   ChatBskyConvoUpdateRead: 'chat.bsky.convo.updateRead',
   ChatBskyModerationGetActorMetadata: 'chat.bsky.moderation.getActorMetadata',
   ChatBskyModerationGetMessageContext: 'chat.bsky.moderation.getMessageContext',
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/updateAllRead.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/updateAllRead.ts
new file mode 100644
index 00000000000..61d299af7e2
--- /dev/null
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/updateAllRead.ts
@@ -0,0 +1,53 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.updateAllRead'
+
+export interface QueryParams {}
+
+export interface InputSchema {
+  status?: 'request' | 'accepted' | (string & {})
+}
+
+export interface OutputSchema {
+  /** The count of updated convos. */
+  updatedCount: number
+}
+
+export interface HandlerInput {
+  encoding: 'application/json'
+  body: InputSchema
+}
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+  resetRouteRateLimits: () => Promise<void>
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput
diff --git a/packages/ozone/src/lexicon/index.ts b/packages/ozone/src/lexicon/index.ts
index 436002a62ea..028452a5f1e 100644
--- a/packages/ozone/src/lexicon/index.ts
+++ b/packages/ozone/src/lexicon/index.ts
@@ -163,6 +163,7 @@ import * as ChatBskyConvoMuteConvo from './types/chat/bsky/convo/muteConvo.js'
 import * as ChatBskyConvoSendMessage from './types/chat/bsky/convo/sendMessage.js'
 import * as ChatBskyConvoSendMessageBatch from './types/chat/bsky/convo/sendMessageBatch.js'
 import * as ChatBskyConvoUnmuteConvo from './types/chat/bsky/convo/unmuteConvo.js'
+import * as ChatBskyConvoUpdateAllRead from './types/chat/bsky/convo/updateAllRead.js'
 import * as ChatBskyConvoUpdateRead from './types/chat/bsky/convo/updateRead.js'
 import * as ChatBskyModerationGetActorMetadata from './types/chat/bsky/moderation/getActorMetadata.js'
 import * as ChatBskyModerationGetMessageContext from './types/chat/bsky/moderation/getMessageContext.js'
@@ -2214,6 +2215,17 @@ export class ChatBskyConvoNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
+  updateAllRead<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ChatBskyConvoUpdateAllRead.Handler<ExtractAuth<AV>>,
+      ChatBskyConvoUpdateAllRead.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'chat.bsky.convo.updateAllRead' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   updateRead<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,
diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
index 383cd5d7c46..abececf5d20 100644
--- a/packages/ozone/src/lexicon/lexicons.ts
+++ b/packages/ozone/src/lexicon/lexicons.ts
@@ -11042,6 +11042,40 @@ export const schemaDict = {
       },
     },
   },
+  ChatBskyConvoUpdateAllRead: {
+    lexicon: 1,
+    id: 'chat.bsky.convo.updateAllRead',
+    defs: {
+      main: {
+        type: 'procedure',
+        input: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            properties: {
+              status: {
+                type: 'string',
+                knownValues: ['request', 'accepted'],
+              },
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['updatedCount'],
+            properties: {
+              updatedCount: {
+                description: 'The count of updated convos.',
+                type: 'integer',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
   ChatBskyConvoUpdateRead: {
     lexicon: 1,
     id: 'chat.bsky.convo.updateRead',
@@ -14508,6 +14542,7 @@ export const ids = {
   ChatBskyConvoSendMessage: 'chat.bsky.convo.sendMessage',
   ChatBskyConvoSendMessageBatch: 'chat.bsky.convo.sendMessageBatch',
   ChatBskyConvoUnmuteConvo: 'chat.bsky.convo.unmuteConvo',
+  ChatBskyConvoUpdateAllRead: 'chat.bsky.convo.updateAllRead',
   ChatBskyConvoUpdateRead: 'chat.bsky.convo.updateRead',
   ChatBskyModerationGetActorMetadata: 'chat.bsky.moderation.getActorMetadata',
   ChatBskyModerationGetMessageContext: 'chat.bsky.moderation.getMessageContext',
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/updateAllRead.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/updateAllRead.ts
new file mode 100644
index 00000000000..61d299af7e2
--- /dev/null
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/updateAllRead.ts
@@ -0,0 +1,53 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.updateAllRead'
+
+export interface QueryParams {}
+
+export interface InputSchema {
+  status?: 'request' | 'accepted' | (string & {})
+}
+
+export interface OutputSchema {
+  /** The count of updated convos. */
+  updatedCount: number
+}
+
+export interface HandlerInput {
+  encoding: 'application/json'
+  body: InputSchema
+}
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+  resetRouteRateLimits: () => Promise<void>
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput
diff --git a/packages/pds/src/lexicon/index.ts b/packages/pds/src/lexicon/index.ts
index 436002a62ea..028452a5f1e 100644
--- a/packages/pds/src/lexicon/index.ts
+++ b/packages/pds/src/lexicon/index.ts
@@ -163,6 +163,7 @@ import * as ChatBskyConvoMuteConvo from './types/chat/bsky/convo/muteConvo.js'
 import * as ChatBskyConvoSendMessage from './types/chat/bsky/convo/sendMessage.js'
 import * as ChatBskyConvoSendMessageBatch from './types/chat/bsky/convo/sendMessageBatch.js'
 import * as ChatBskyConvoUnmuteConvo from './types/chat/bsky/convo/unmuteConvo.js'
+import * as ChatBskyConvoUpdateAllRead from './types/chat/bsky/convo/updateAllRead.js'
 import * as ChatBskyConvoUpdateRead from './types/chat/bsky/convo/updateRead.js'
 import * as ChatBskyModerationGetActorMetadata from './types/chat/bsky/moderation/getActorMetadata.js'
 import * as ChatBskyModerationGetMessageContext from './types/chat/bsky/moderation/getMessageContext.js'
@@ -2214,6 +2215,17 @@ export class ChatBskyConvoNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
+  updateAllRead<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ChatBskyConvoUpdateAllRead.Handler<ExtractAuth<AV>>,
+      ChatBskyConvoUpdateAllRead.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'chat.bsky.convo.updateAllRead' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   updateRead<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,
diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
index 383cd5d7c46..abececf5d20 100644
--- a/packages/pds/src/lexicon/lexicons.ts
+++ b/packages/pds/src/lexicon/lexicons.ts
@@ -11042,6 +11042,40 @@ export const schemaDict = {
       },
     },
   },
+  ChatBskyConvoUpdateAllRead: {
+    lexicon: 1,
+    id: 'chat.bsky.convo.updateAllRead',
+    defs: {
+      main: {
+        type: 'procedure',
+        input: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            properties: {
+              status: {
+                type: 'string',
+                knownValues: ['request', 'accepted'],
+              },
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['updatedCount'],
+            properties: {
+              updatedCount: {
+                description: 'The count of updated convos.',
+                type: 'integer',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
   ChatBskyConvoUpdateRead: {
     lexicon: 1,
     id: 'chat.bsky.convo.updateRead',
@@ -14508,6 +14542,7 @@ export const ids = {
   ChatBskyConvoSendMessage: 'chat.bsky.convo.sendMessage',
   ChatBskyConvoSendMessageBatch: 'chat.bsky.convo.sendMessageBatch',
   ChatBskyConvoUnmuteConvo: 'chat.bsky.convo.unmuteConvo',
+  ChatBskyConvoUpdateAllRead: 'chat.bsky.convo.updateAllRead',
   ChatBskyConvoUpdateRead: 'chat.bsky.convo.updateRead',
   ChatBskyModerationGetActorMetadata: 'chat.bsky.moderation.getActorMetadata',
   ChatBskyModerationGetMessageContext: 'chat.bsky.moderation.getMessageContext',
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/updateAllRead.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/updateAllRead.ts
new file mode 100644
index 00000000000..61d299af7e2
--- /dev/null
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/updateAllRead.ts
@@ -0,0 +1,53 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.updateAllRead'
+
+export interface QueryParams {}
+
+export interface InputSchema {
+  status?: 'request' | 'accepted' | (string & {})
+}
+
+export interface OutputSchema {
+  /** The count of updated convos. */
+  updatedCount: number
+}
+
+export interface HandlerInput {
+  encoding: 'application/json'
+  body: InputSchema
+}
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+  resetRouteRateLimits: () => Promise<void>
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput

From 43d2703742a6a9011ff6118be50e0722874ce4f4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 24 Feb 2025 18:20:26 -0300
Subject: [PATCH 090/101] Version packages (#3577)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/six-fishes-wink.md |  5 -----
 packages/api/CHANGELOG.md     |  6 ++++++
 packages/api/package.json     |  2 +-
 packages/bsky/CHANGELOG.md    |  7 +++++++
 packages/bsky/package.json    |  2 +-
 packages/dev-env/CHANGELOG.md | 10 ++++++++++
 packages/dev-env/package.json |  2 +-
 packages/ozone/CHANGELOG.md   |  7 +++++++
 packages/ozone/package.json   |  2 +-
 packages/pds/CHANGELOG.md     |  7 +++++++
 packages/pds/package.json     |  2 +-
 11 files changed, 42 insertions(+), 10 deletions(-)
 delete mode 100644 .changeset/six-fishes-wink.md

diff --git a/.changeset/six-fishes-wink.md b/.changeset/six-fishes-wink.md
deleted file mode 100644
index a422bca05b8..00000000000
--- a/.changeset/six-fishes-wink.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/api": patch
----
-
-Add chat.bsky.convo.updateAllRead lex
diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md
index 3958483ffc1..1f217f82dcb 100644
--- a/packages/api/CHANGELOG.md
+++ b/packages/api/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @atproto/api
 
+## 0.14.6
+
+### Patch Changes
+
+- [#3576](https://github.com/bluesky-social/atproto/pull/3576) [`44f81f2eb`](https://github.com/bluesky-social/atproto/commit/44f81f2eb9229e21aec4472b3a05e855396dbec5) Thanks [@rafaelbsky](https://github.com/rafaelbsky)! - Add chat.bsky.convo.updateAllRead lex
+
 ## 0.14.5
 
 ### Patch Changes
diff --git a/packages/api/package.json b/packages/api/package.json
index 174767a1182..e3ff1adfb86 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/api",
-  "version": "0.14.5",
+  "version": "0.14.6",
   "license": "MIT",
   "description": "Client library for atproto and Bluesky",
   "keywords": [
diff --git a/packages/bsky/CHANGELOG.md b/packages/bsky/CHANGELOG.md
index 9ad17db53fe..ec0926540d1 100644
--- a/packages/bsky/CHANGELOG.md
+++ b/packages/bsky/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/bsky
 
+## 0.0.123
+
+### Patch Changes
+
+- Updated dependencies [[`44f81f2eb`](https://github.com/bluesky-social/atproto/commit/44f81f2eb9229e21aec4472b3a05e855396dbec5)]:
+  - @atproto/api@0.14.6
+
 ## 0.0.122
 
 ### Patch Changes
diff --git a/packages/bsky/package.json b/packages/bsky/package.json
index c82416d2b75..30408df9928 100644
--- a/packages/bsky/package.json
+++ b/packages/bsky/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.122",
+  "version": "0.0.123",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
diff --git a/packages/dev-env/CHANGELOG.md b/packages/dev-env/CHANGELOG.md
index 8f3971e9023..d2ce152f353 100644
--- a/packages/dev-env/CHANGELOG.md
+++ b/packages/dev-env/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @atproto/dev-env
 
+## 0.3.95
+
+### Patch Changes
+
+- Updated dependencies [[`44f81f2eb`](https://github.com/bluesky-social/atproto/commit/44f81f2eb9229e21aec4472b3a05e855396dbec5)]:
+  - @atproto/api@0.14.6
+  - @atproto/bsky@0.0.123
+  - @atproto/ozone@0.1.85
+  - @atproto/pds@0.4.102
+
 ## 0.3.94
 
 ### Patch Changes
diff --git a/packages/dev-env/package.json b/packages/dev-env/package.json
index 95d95cf4881..4d99a31a93c 100644
--- a/packages/dev-env/package.json
+++ b/packages/dev-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/dev-env",
-  "version": "0.3.94",
+  "version": "0.3.95",
   "license": "MIT",
   "description": "Local development environment helper for atproto development",
   "keywords": [
diff --git a/packages/ozone/CHANGELOG.md b/packages/ozone/CHANGELOG.md
index 340ff8b92c8..567c8c02824 100644
--- a/packages/ozone/CHANGELOG.md
+++ b/packages/ozone/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/ozone
 
+## 0.1.85
+
+### Patch Changes
+
+- Updated dependencies [[`44f81f2eb`](https://github.com/bluesky-social/atproto/commit/44f81f2eb9229e21aec4472b3a05e855396dbec5)]:
+  - @atproto/api@0.14.6
+
 ## 0.1.84
 
 ### Patch Changes
diff --git a/packages/ozone/package.json b/packages/ozone/package.json
index 8ada8a9e5b5..a8d83a1deec 100644
--- a/packages/ozone/package.json
+++ b/packages/ozone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.1.84",
+  "version": "0.1.85",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
diff --git a/packages/pds/CHANGELOG.md b/packages/pds/CHANGELOG.md
index 6b19b08a0f5..ff758dc4e0c 100644
--- a/packages/pds/CHANGELOG.md
+++ b/packages/pds/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/pds
 
+## 0.4.102
+
+### Patch Changes
+
+- Updated dependencies [[`44f81f2eb`](https://github.com/bluesky-social/atproto/commit/44f81f2eb9229e21aec4472b3a05e855396dbec5)]:
+  - @atproto/api@0.14.6
+
 ## 0.4.101
 
 ### Patch Changes
diff --git a/packages/pds/package.json b/packages/pds/package.json
index a7fbad32b38..7650190b845 100644
--- a/packages/pds/package.json
+++ b/packages/pds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/pds",
-  "version": "0.4.101",
+  "version": "0.4.102",
   "license": "MIT",
   "description": "Reference implementation of atproto Personal Data Server (PDS)",
   "keywords": [

From 82d5a2d3617c40caab7a18e46c709c4b3c48e7f8 Mon Sep 17 00:00:00 2001
From: Matthieu Sieben <matthieusieben@users.noreply.github.com>
Date: Mon, 24 Feb 2025 23:12:16 +0100
Subject: [PATCH 091/101] OAuthProvider: Update "trustProxy" options to allow
 function (#3557)

* OAuthProvider: Update "trustProxy" options to allow function

* DeviceManager options can now be passed as argument to the OAuthProvider constructor

* Only trust one level of proxying when computing IP during OAuthFlows

* Prevent invalid use of trustProxy config

* tidy

* make the code compliant with legacy behavior
---
 .changeset/blue-panthers-run.md               |  5 ++
 .changeset/chatty-falcons-deny.md             |  5 ++
 .changeset/short-rats-crash.md                |  5 ++
 packages/oauth/oauth-provider/package.json    |  2 +
 .../src/device/device-manager.ts              |  9 ++-
 .../oauth-provider/src/lib/http/request.ts    | 77 ++++++++++++-------
 .../oauth-provider/src/oauth-provider.ts      | 41 +++++-----
 packages/pds/src/context.ts                   |  3 +
 packages/pds/src/oauth/provider.ts            |  4 +-
 pnpm-lock.yaml                                | 12 +++
 10 files changed, 113 insertions(+), 50 deletions(-)
 create mode 100644 .changeset/blue-panthers-run.md
 create mode 100644 .changeset/chatty-falcons-deny.md
 create mode 100644 .changeset/short-rats-crash.md

diff --git a/.changeset/blue-panthers-run.md b/.changeset/blue-panthers-run.md
new file mode 100644
index 00000000000..7b89705f492
--- /dev/null
+++ b/.changeset/blue-panthers-run.md
@@ -0,0 +1,5 @@
+---
+"@atproto/pds": patch
+---
+
+Only trust one level of proxying when computing IP during OAuthFlows
diff --git a/.changeset/chatty-falcons-deny.md b/.changeset/chatty-falcons-deny.md
new file mode 100644
index 00000000000..c37a8bdbfa7
--- /dev/null
+++ b/.changeset/chatty-falcons-deny.md
@@ -0,0 +1,5 @@
+---
+"@atproto/oauth-provider": minor
+---
+
+DeviceManager options can now be passed as argument to the OAuthProvider constructor
diff --git a/.changeset/short-rats-crash.md b/.changeset/short-rats-crash.md
new file mode 100644
index 00000000000..bfce93b910b
--- /dev/null
+++ b/.changeset/short-rats-crash.md
@@ -0,0 +1,5 @@
+---
+"@atproto/oauth-provider": minor
+---
+
+Update "trustProxy" options to allow function
diff --git a/packages/oauth/oauth-provider/package.json b/packages/oauth/oauth-provider/package.json
index 05e6f45b2c4..e2c2be6bd2e 100644
--- a/packages/oauth/oauth-provider/package.json
+++ b/packages/oauth/oauth-provider/package.json
@@ -44,6 +44,7 @@
     "@hapi/bourne": "^3.0.0",
     "@hapi/content": "^6.0.0",
     "cookie": "^0.6.0",
+    "forwarded": "^0.2.0",
     "http-errors": "^2.0.0",
     "ioredis": "^5.3.2",
     "jose": "^5.2.0",
@@ -58,6 +59,7 @@
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^11.1.6",
     "@types/cookie": "^0.6.0",
+    "@types/forwarded": "0.1.3",
     "@types/psl": "1.1.3",
     "@types/react": "^18.2.50",
     "@types/react-dom": "^18.2.18",
diff --git a/packages/oauth/oauth-provider/src/device/device-manager.ts b/packages/oauth/oauth-provider/src/device/device-manager.ts
index 7efa0c7fa89..7d2a4b17d9b 100644
--- a/packages/oauth/oauth-provider/src/device/device-manager.ts
+++ b/packages/oauth/oauth-provider/src/device/device-manager.ts
@@ -22,10 +22,13 @@ export const deviceManagerOptionsSchema = z.object({
   /**
    * Controls whether the IP address is read from the `X-Forwarded-For` header
    * (if `true`), or from the `req.socket.remoteAddress` property (if `false`).
-   *
-   * @default true // (nowadays, most requests are proxied)
    */
-  trustProxy: z.boolean().default(true),
+  trustProxy: z
+    .function()
+    .args<[addr: z.ZodString, i: z.ZodNumber]>(z.string(), z.number())
+    .returns(z.boolean())
+    .optional(),
+
   /**
    * Amount of time (in ms) after which session IDs will be rotated
    *
diff --git a/packages/oauth/oauth-provider/src/lib/http/request.ts b/packages/oauth/oauth-provider/src/lib/http/request.ts
index 47ebca73004..4479c2ef208 100644
--- a/packages/oauth/oauth-provider/src/lib/http/request.ts
+++ b/packages/oauth/oauth-provider/src/lib/http/request.ts
@@ -1,6 +1,7 @@
 import { randomBytes } from 'node:crypto'
 import type { IncomingMessage, ServerResponse } from 'node:http'
 import { parse as parseCookie, serialize as serializeCookie } from 'cookie'
+import forwarded from 'forwarded'
 import createHttpError from 'http-errors'
 import { appendHeader } from './response.js'
 import { UrlReference, urlMatch } from './url.js'
@@ -164,7 +165,19 @@ export function parseHttpCookies(
 }
 
 export type ExtractRequestMetadataOptions = {
-  trustProxy?: boolean
+  /**
+   * A function that determines whether a given IP address is trusted. The
+   * function is called with the IP addresses and its index in the list of
+   * forwarded addresses (starting from 0, 0 corresponding to the ip of the
+   * incoming HTTP connection, and the last item being the first proxied IP
+   * address in the proxy chain, deduced from the `X-Forwarded-For` header). The
+   * function should return `true` if the IP address is trusted, and `false`
+   * otherwise.
+   *
+   * @see {@link https://www.npmjs.com/package/proxy-addr} for a utility that
+   * allows you to create a trust function.
+   */
+  trustProxy?: (addr: string, i: number) => boolean
 }
 
 export type RequestMetadata = {
@@ -177,42 +190,49 @@ export function extractRequestMetadata(
   req: IncomingMessage,
   options?: ExtractRequestMetadataOptions,
 ): RequestMetadata {
-  const userAgent = req.headers['user-agent'] || undefined
-  const ipAddress = extractIpAddress(req, options) || null
-  const port = extractPort(req, options)
-
-  if (ipAddress == null || port == null) {
-    throw new Error('Could not determine IP address')
+  const ip = extractIp(req, options)
+  return {
+    userAgent: req.headers['user-agent'],
+    ipAddress: ip,
+    port: extractPort(req, ip),
   }
-
-  return { userAgent, ipAddress, port }
 }
 
-function extractIpAddress(
+function extractIp(
   req: IncomingMessage,
   options?: ExtractRequestMetadataOptions,
-): string | undefined {
-  // Express app compatibility
-  if ('ip' in req && typeof req.ip === 'string') {
-    return req.ip
+): string {
+  const trust = options?.trustProxy
+  if (trust) {
+    const ips = forwarded(req)
+    for (let i = 0; i < ips.length; i++) {
+      const isTrusted = trust(ips[i], i)
+      if (!isTrusted) return ips[i]
+    }
+    // Let's return the last ("furthest") IP address in the chain if all of them
+    // are trusted. Note that this may indicate an issue with either the trust
+    // function (too permissive), or the proxy configuration (one of them not
+    // setting the X-Forwarded-For header).
+    const ip = ips[ips.length - 1]
+    if (ip) return ip
   }
 
-  if (options?.trustProxy) {
-    const forwardedFor = req.headers['x-forwarded-for']
-    if (typeof forwardedFor === 'string') {
-      const firstForward = forwardedFor.split(',')[0]!.trim()
-      if (firstForward) return firstForward
-    }
+  // Express app compatibility (see "trust proxy" setting)
+  if ('ip' in req) {
+    const ip = req.ip
+    if (typeof ip === 'string') return ip
   }
 
-  return req.socket.remoteAddress
+  const ip = req.socket.remoteAddress
+  if (ip) return ip
+
+  throw new Error('Could not determine IP address')
 }
 
-function extractPort(
-  req: IncomingMessage,
-  options?: ExtractRequestMetadataOptions,
-): number | undefined {
-  if (options?.trustProxy) {
+function extractPort(req: IncomingMessage, ip: string): number {
+  if (ip !== req.socket.remoteAddress) {
+    // Trust the X-Forwarded-Port header only if the IP address was a trusted
+    // proxied IP.
     const forwardedPort = req.headers['x-forwarded-port']
     if (typeof forwardedPort === 'string') {
       const port = Number(forwardedPort.trim())
@@ -223,5 +243,8 @@ function extractPort(
     }
   }
 
-  return req.socket.remotePort
+  const port = req.socket.remotePort
+  if (port != null) return port
+
+  throw new Error('Could not determine port')
 }
diff --git a/packages/oauth/oauth-provider/src/oauth-provider.ts b/packages/oauth/oauth-provider/src/oauth-provider.ts
index dea0140e5e3..2147b39983e 100644
--- a/packages/oauth/oauth-provider/src/oauth-provider.ts
+++ b/packages/oauth/oauth-provider/src/oauth-provider.ts
@@ -134,12 +134,12 @@ export {
 export type RouterOptions<
   Req extends IncomingMessage = IncomingMessage,
   Res extends ServerResponse = ServerResponse,
-> = DeviceManagerOptions & {
+> = {
   onError?: (req: Req, res: Res, err: unknown, message: string) => void
 }
 
 export type OAuthProviderOptions = Override<
-  OAuthVerifierOptions & OAuthHooks,
+  OAuthVerifierOptions & OAuthHooks & DeviceManagerOptions,
   {
     /**
      * Maximum age a device/account session can be before requiring
@@ -223,15 +223,15 @@ export type OAuthProviderOptions = Override<
 
 export class OAuthProvider extends OAuthVerifier {
   public readonly metadata: OAuthAuthorizationServerMetadata
-  public readonly customization?: Customization
 
   public readonly authenticationMaxAge: number
 
   public readonly accountManager: AccountManager
-  public readonly deviceStore: DeviceStore
+  public readonly deviceManager: DeviceManager
   public readonly clientManager: ClientManager
   public readonly requestManager: RequestManager
   public readonly tokenManager: TokenManager
+  public readonly outputManager: OutputManager
 
   public constructor({
     metadata,
@@ -264,7 +264,7 @@ export class OAuthProvider extends OAuthVerifier {
 
     loopbackMetadata = atprotoLoopbackClientMetadata,
 
-    // OAuthHooks & OAuthVerifierOptions
+    // OAuthHooks & OAuthVerifierOptions & DeviceManagerOptions
     ...rest
   }: OAuthProviderOptions) {
     super({ replayStore, redis, ...rest })
@@ -275,10 +275,9 @@ export class OAuthProvider extends OAuthVerifier {
 
     this.authenticationMaxAge = authenticationMaxAge
     this.metadata = buildMetadata(this.issuer, this.keyset, metadata)
-    this.customization = customization
-
-    this.deviceStore = deviceStore
 
+    this.deviceManager = new DeviceManager(deviceStore, rest)
+    this.outputManager = new OutputManager(customization)
     this.accountManager = new AccountManager(accountStore)
     this.clientManager = new ClientManager(
       this.metadata,
@@ -1025,10 +1024,7 @@ export class OAuthProvider extends OAuthVerifier {
     T = void,
     Req extends IncomingMessage = IncomingMessage,
     Res extends ServerResponse = ServerResponse,
-  >(options?: RouterOptions<Req, Res>) {
-    const deviceManager = new DeviceManager(this.deviceStore, options)
-    const outputManager = new OutputManager(this.customization)
-
+  >(options?: RouterOptions<Req, Res>): Router<T, Req, Res> {
     // eslint-disable-next-line @typescript-eslint/no-this-alias
     const server = this
     const issuerUrl = new URL(server.issuer)
@@ -1145,7 +1141,7 @@ export class OAuthProvider extends OAuthVerifier {
           )
 
           if (!res.headersSent) {
-            await outputManager.sendErrorPage(res, err)
+            await server.outputManager.sendErrorPage(res, err)
           }
         }
       }
@@ -1252,7 +1248,8 @@ export class OAuthProvider extends OAuthVerifier {
       jsonHandler(async function (req, _res) {
         const payload = await parseHttpRequest(req, ['json', 'urlencoded'])
 
-        const clientMetadata = await deviceManager.getRequestMetadata(req)
+        const clientMetadata =
+          await server.deviceManager.getRequestMetadata(req)
 
         const clientCredentials = await oauthClientCredentialsSchema
           .parseAsync(payload, { path: ['body'] })
@@ -1360,7 +1357,10 @@ export class OAuthProvider extends OAuthVerifier {
           .parseAsync(query, { path: ['query'] })
           .catch(throwInvalidRequest)
 
-        const { deviceId, deviceMetadata } = await deviceManager.load(req, res)
+        const { deviceId, deviceMetadata } = await server.deviceManager.load(
+          req,
+          res,
+        )
 
         const data = await server
           .authorize(
@@ -1377,7 +1377,7 @@ export class OAuthProvider extends OAuthVerifier {
           }
           case 'authorize' in data: {
             await setupCsrfToken(req, res, csrfCookie(data.authorize.uri))
-            return outputManager.sendAuthorizePage(res, data)
+            return server.outputManager.sendAuthorizePage(res, data)
           }
           default: {
             // Should never happen
@@ -1418,7 +1418,7 @@ export class OAuthProvider extends OAuthVerifier {
           csrfCookie(input.request_uri),
         )
 
-        const { deviceId } = await deviceManager.load(req, res, true)
+        const { deviceId } = await server.deviceManager.load(req, res, true)
 
         return server.signIn(
           deviceId,
@@ -1471,7 +1471,10 @@ export class OAuthProvider extends OAuthVerifier {
           true,
         )
 
-        const { deviceId, deviceMetadata } = await deviceManager.load(req, res)
+        const { deviceId, deviceMetadata } = await server.deviceManager.load(
+          req,
+          res,
+        )
 
         const data = await server
           .acceptRequest(
@@ -1528,7 +1531,7 @@ export class OAuthProvider extends OAuthVerifier {
           true,
         )
 
-        const { deviceId } = await deviceManager.load(req, res)
+        const { deviceId } = await server.deviceManager.load(req, res)
 
         const data = await server
           .rejectRequest(deviceId, input.request_uri, input.client_id)
diff --git a/packages/pds/src/context.ts b/packages/pds/src/context.ts
index 3ed0b84a31d..e816bac343a 100644
--- a/packages/pds/src/context.ts
+++ b/packages/pds/src/context.ts
@@ -333,6 +333,9 @@ export class AppContext {
           dpopSecret: secrets.dpopSecret,
           customization: cfg.oauth.provider.customization,
           safeFetch,
+          // @TODO: Make this configurable. The legacy implementation used to
+          // blindly trust the X-Forwarded-For header.
+          trustProxy: (_addr: string, _i: number) => true,
         })
       : undefined
 
diff --git a/packages/pds/src/oauth/provider.ts b/packages/pds/src/oauth/provider.ts
index fa1d50bee6d..9f1bf937f59 100644
--- a/packages/pds/src/oauth/provider.ts
+++ b/packages/pds/src/oauth/provider.ts
@@ -10,7 +10,7 @@ export type AuthProviderOptions = {
   accountManager: AccountManager
 } & Pick<
   OAuthProviderOptions,
-  'issuer' | 'redis' | 'keyset' | 'dpopSecret' | 'customization'
+  'issuer' | 'redis' | 'keyset' | 'dpopSecret' | 'customization' | 'trustProxy'
 > &
   Required<Pick<OAuthProviderOptions, 'safeFetch'>>
 
@@ -23,6 +23,7 @@ export class PdsOAuthProvider extends OAuthProvider {
     issuer,
     customization,
     safeFetch,
+    trustProxy,
   }: AuthProviderOptions) {
     super({
       issuer,
@@ -32,6 +33,7 @@ export class PdsOAuthProvider extends OAuthProvider {
       safeFetch,
       customization,
       store: accountManager,
+      trustProxy,
       metadata: {
         // PdsOAuthProvider is used when the PDS is both an authorization server
         // & resource server, in which case the issuer origin is also the
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2e4023cfbb7..1566e8cf639 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1059,6 +1059,9 @@ importers:
       cookie:
         specifier: ^0.6.0
         version: 0.6.0
+      forwarded:
+        specifier: ^0.2.0
+        version: 0.2.0
       http-errors:
         specifier: ^2.0.0
         version: 2.0.0
@@ -1096,6 +1099,9 @@ importers:
       '@types/cookie':
         specifier: ^0.6.0
         version: 0.6.0
+      '@types/forwarded':
+        specifier: 0.1.3
+        version: 0.1.3
       '@types/psl':
         specifier: 1.1.3
         version: 1.1.3
@@ -6340,6 +6346,12 @@ packages:
       '@types/qs': 6.9.7
       '@types/serve-static': 1.15.2
 
+  /@types/forwarded@0.1.3:
+    resolution: {integrity: sha512-b6nH+hVy48XJEtuTkgfk2mY9JuR1JdOanOcDHXf8nJuE8JtZj9Fs46QCalKvjFOyzMLIZEXAYCYfxP/596bMHg==}
+    dependencies:
+      '@types/node': 18.19.67
+    dev: true
+
   /@types/graceful-fs@4.1.6:
     resolution: {integrity: sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==}
     dependencies:

From 78caefd7d4b08d53f48e6942c43083b6d4dc370e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 24 Feb 2025 17:47:09 -0500
Subject: [PATCH 092/101] Version packages (#3578)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/blue-panthers-run.md            | 5 -----
 .changeset/chatty-falcons-deny.md          | 5 -----
 .changeset/short-rats-crash.md             | 5 -----
 packages/dev-env/CHANGELOG.md              | 9 +++++++++
 packages/dev-env/package.json              | 2 +-
 packages/oauth/oauth-provider/CHANGELOG.md | 8 ++++++++
 packages/oauth/oauth-provider/package.json | 2 +-
 packages/pds/CHANGELOG.md                  | 9 +++++++++
 packages/pds/package.json                  | 2 +-
 9 files changed, 29 insertions(+), 18 deletions(-)
 delete mode 100644 .changeset/blue-panthers-run.md
 delete mode 100644 .changeset/chatty-falcons-deny.md
 delete mode 100644 .changeset/short-rats-crash.md

diff --git a/.changeset/blue-panthers-run.md b/.changeset/blue-panthers-run.md
deleted file mode 100644
index 7b89705f492..00000000000
--- a/.changeset/blue-panthers-run.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/pds": patch
----
-
-Only trust one level of proxying when computing IP during OAuthFlows
diff --git a/.changeset/chatty-falcons-deny.md b/.changeset/chatty-falcons-deny.md
deleted file mode 100644
index c37a8bdbfa7..00000000000
--- a/.changeset/chatty-falcons-deny.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/oauth-provider": minor
----
-
-DeviceManager options can now be passed as argument to the OAuthProvider constructor
diff --git a/.changeset/short-rats-crash.md b/.changeset/short-rats-crash.md
deleted file mode 100644
index bfce93b910b..00000000000
--- a/.changeset/short-rats-crash.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/oauth-provider": minor
----
-
-Update "trustProxy" options to allow function
diff --git a/packages/dev-env/CHANGELOG.md b/packages/dev-env/CHANGELOG.md
index d2ce152f353..114ec3d4f43 100644
--- a/packages/dev-env/CHANGELOG.md
+++ b/packages/dev-env/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @atproto/dev-env
 
+## 0.3.96
+
+### Patch Changes
+
+- Updated dependencies [[`82d5a2d36`](https://github.com/bluesky-social/atproto/commit/82d5a2d3617c40caab7a18e46c709c4b3c48e7f8)]:
+  - @atproto/pds@0.4.103
+  - @atproto/bsky@0.0.123
+  - @atproto/ozone@0.1.85
+
 ## 0.3.95
 
 ### Patch Changes
diff --git a/packages/dev-env/package.json b/packages/dev-env/package.json
index 4d99a31a93c..377d5d2fbd7 100644
--- a/packages/dev-env/package.json
+++ b/packages/dev-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/dev-env",
-  "version": "0.3.95",
+  "version": "0.3.96",
   "license": "MIT",
   "description": "Local development environment helper for atproto development",
   "keywords": [
diff --git a/packages/oauth/oauth-provider/CHANGELOG.md b/packages/oauth/oauth-provider/CHANGELOG.md
index e9c72e5eadd..f96f6851ff2 100644
--- a/packages/oauth/oauth-provider/CHANGELOG.md
+++ b/packages/oauth/oauth-provider/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @atproto/oauth-provider
 
+## 0.4.0
+
+### Minor Changes
+
+- [#3557](https://github.com/bluesky-social/atproto/pull/3557) [`82d5a2d36`](https://github.com/bluesky-social/atproto/commit/82d5a2d3617c40caab7a18e46c709c4b3c48e7f8) Thanks [@matthieusieben](https://github.com/matthieusieben)! - DeviceManager options can now be passed as argument to the OAuthProvider constructor
+
+- [#3557](https://github.com/bluesky-social/atproto/pull/3557) [`82d5a2d36`](https://github.com/bluesky-social/atproto/commit/82d5a2d3617c40caab7a18e46c709c4b3c48e7f8) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Update "trustProxy" options to allow function
+
 ## 0.3.1
 
 ### Patch Changes
diff --git a/packages/oauth/oauth-provider/package.json b/packages/oauth/oauth-provider/package.json
index e2c2be6bd2e..9f43d55d2a3 100644
--- a/packages/oauth/oauth-provider/package.json
+++ b/packages/oauth/oauth-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/oauth-provider",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "license": "MIT",
   "description": "Generic OAuth2 and OpenID Connect provider for Node.js. Currently only supports features needed for Atproto.",
   "keywords": [
diff --git a/packages/pds/CHANGELOG.md b/packages/pds/CHANGELOG.md
index ff758dc4e0c..ceaf64c522e 100644
--- a/packages/pds/CHANGELOG.md
+++ b/packages/pds/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @atproto/pds
 
+## 0.4.103
+
+### Patch Changes
+
+- [#3557](https://github.com/bluesky-social/atproto/pull/3557) [`82d5a2d36`](https://github.com/bluesky-social/atproto/commit/82d5a2d3617c40caab7a18e46c709c4b3c48e7f8) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Only trust one level of proxying when computing IP during OAuthFlows
+
+- Updated dependencies [[`82d5a2d36`](https://github.com/bluesky-social/atproto/commit/82d5a2d3617c40caab7a18e46c709c4b3c48e7f8), [`82d5a2d36`](https://github.com/bluesky-social/atproto/commit/82d5a2d3617c40caab7a18e46c709c4b3c48e7f8)]:
+  - @atproto/oauth-provider@0.4.0
+
 ## 0.4.102
 
 ### Patch Changes
diff --git a/packages/pds/package.json b/packages/pds/package.json
index 7650190b845..434342644ba 100644
--- a/packages/pds/package.json
+++ b/packages/pds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/pds",
-  "version": "0.4.102",
+  "version": "0.4.103",
   "license": "MIT",
   "description": "Reference implementation of atproto Personal Data Server (PDS)",
   "keywords": [

From e40758c36ab540347295d0280a7570e89f38fa05 Mon Sep 17 00:00:00 2001
From: Brian Olson <brianolson@users.noreply.github.com>
Date: Tue, 25 Feb 2025 10:36:16 -0500
Subject: [PATCH 093/101] nobody uses notifyOfUpdate, deprecate (#3574)

---
 lexicons/com/atproto/sync/notifyOfUpdate.json | 2 +-
 packages/api/src/client/lexicons.ts           | 2 +-
 packages/bsky/src/lexicon/lexicons.ts         | 2 +-
 packages/ozone/src/lexicon/lexicons.ts        | 2 +-
 packages/pds/src/lexicon/lexicons.ts          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lexicons/com/atproto/sync/notifyOfUpdate.json b/lexicons/com/atproto/sync/notifyOfUpdate.json
index 034a9655a08..630973862fa 100644
--- a/lexicons/com/atproto/sync/notifyOfUpdate.json
+++ b/lexicons/com/atproto/sync/notifyOfUpdate.json
@@ -4,7 +4,7 @@
   "defs": {
     "main": {
       "type": "procedure",
-      "description": "Notify a crawling service of a recent update, and that crawling should resume. Intended use is after a gap between repo stream events caused the crawling service to disconnect. Does not require auth; implemented by Relay.",
+      "description": "Notify a crawling service of a recent update, and that crawling should resume. Intended use is after a gap between repo stream events caused the crawling service to disconnect. Does not require auth; implemented by Relay. DEPRECATED: just use com.atproto.sync.requestCrawl",
       "input": {
         "encoding": "application/json",
         "schema": {
diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
index abececf5d20..a3fafbbd9a3 100644
--- a/packages/api/src/client/lexicons.ts
+++ b/packages/api/src/client/lexicons.ts
@@ -3759,7 +3759,7 @@ export const schemaDict = {
       main: {
         type: 'procedure',
         description:
-          'Notify a crawling service of a recent update, and that crawling should resume. Intended use is after a gap between repo stream events caused the crawling service to disconnect. Does not require auth; implemented by Relay.',
+          'Notify a crawling service of a recent update, and that crawling should resume. Intended use is after a gap between repo stream events caused the crawling service to disconnect. Does not require auth; implemented by Relay. DEPRECATED: just use com.atproto.sync.requestCrawl',
         input: {
           encoding: 'application/json',
           schema: {
diff --git a/packages/bsky/src/lexicon/lexicons.ts b/packages/bsky/src/lexicon/lexicons.ts
index bc8443a5c44..567ed4591b9 100644
--- a/packages/bsky/src/lexicon/lexicons.ts
+++ b/packages/bsky/src/lexicon/lexicons.ts
@@ -3759,7 +3759,7 @@ export const schemaDict = {
       main: {
         type: 'procedure',
         description:
-          'Notify a crawling service of a recent update, and that crawling should resume. Intended use is after a gap between repo stream events caused the crawling service to disconnect. Does not require auth; implemented by Relay.',
+          'Notify a crawling service of a recent update, and that crawling should resume. Intended use is after a gap between repo stream events caused the crawling service to disconnect. Does not require auth; implemented by Relay. DEPRECATED: just use com.atproto.sync.requestCrawl',
         input: {
           encoding: 'application/json',
           schema: {
diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
index abececf5d20..a3fafbbd9a3 100644
--- a/packages/ozone/src/lexicon/lexicons.ts
+++ b/packages/ozone/src/lexicon/lexicons.ts
@@ -3759,7 +3759,7 @@ export const schemaDict = {
       main: {
         type: 'procedure',
         description:
-          'Notify a crawling service of a recent update, and that crawling should resume. Intended use is after a gap between repo stream events caused the crawling service to disconnect. Does not require auth; implemented by Relay.',
+          'Notify a crawling service of a recent update, and that crawling should resume. Intended use is after a gap between repo stream events caused the crawling service to disconnect. Does not require auth; implemented by Relay. DEPRECATED: just use com.atproto.sync.requestCrawl',
         input: {
           encoding: 'application/json',
           schema: {
diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
index abececf5d20..a3fafbbd9a3 100644
--- a/packages/pds/src/lexicon/lexicons.ts
+++ b/packages/pds/src/lexicon/lexicons.ts
@@ -3759,7 +3759,7 @@ export const schemaDict = {
       main: {
         type: 'procedure',
         description:
-          'Notify a crawling service of a recent update, and that crawling should resume. Intended use is after a gap between repo stream events caused the crawling service to disconnect. Does not require auth; implemented by Relay.',
+          'Notify a crawling service of a recent update, and that crawling should resume. Intended use is after a gap between repo stream events caused the crawling service to disconnect. Does not require auth; implemented by Relay. DEPRECATED: just use com.atproto.sync.requestCrawl',
         input: {
           encoding: 'application/json',
           schema: {

From 99e2809ca2ebf70acaa10254f140a8dd0fad4305 Mon Sep 17 00:00:00 2001
From: bnewbold <bnewbold@robocracy.org>
Date: Tue, 25 Feb 2025 07:46:12 -0800
Subject: [PATCH 094/101] [APP-1072] Add labeler declaration lexicons (#3521)

* updates to com.atproto.moderation.* for report routing

* updates to labeler service declaration; and new reason types

* Apply suggestions from code review

Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com>

* remove dupe reasonAppeal

* iterate on labeler declaration lexicons

* Makefile: fast helper for formatting just lex json

* external, not link

* change default when subjectCollections is not defined

* remove 'example reason' disclaimers

* simplify lex report proposal: just labeler declartions

* missed knownValues list

* Codegen, changeset

---------

Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com>
Co-authored-by: Eric Bailey <git@esb.lol>
---
 .changeset/long-garlics-refuse.md             |  5 +++
 Makefile                                      |  4 +++
 lexicons/app/bsky/labeler/service.json        | 23 ++++++++++++-
 lexicons/com/atproto/moderation/defs.json     |  5 +++
 packages/api/src/client/lexicons.ts           | 32 +++++++++++++++++++
 .../client/types/app/bsky/labeler/service.ts  |  7 ++++
 .../types/com/atproto/moderation/defs.ts      |  3 ++
 packages/bsky/src/lexicon/lexicons.ts         | 32 +++++++++++++++++++
 .../lexicon/types/app/bsky/labeler/service.ts |  7 ++++
 .../types/com/atproto/moderation/defs.ts      |  3 ++
 packages/ozone/src/lexicon/lexicons.ts        | 32 +++++++++++++++++++
 .../lexicon/types/app/bsky/labeler/service.ts |  7 ++++
 .../types/com/atproto/moderation/defs.ts      |  3 ++
 packages/pds/src/lexicon/lexicons.ts          | 32 +++++++++++++++++++
 .../lexicon/types/app/bsky/labeler/service.ts |  7 ++++
 .../types/com/atproto/moderation/defs.ts      |  3 ++
 16 files changed, 204 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/long-garlics-refuse.md

diff --git a/.changeset/long-garlics-refuse.md b/.changeset/long-garlics-refuse.md
new file mode 100644
index 00000000000..7060d438e63
--- /dev/null
+++ b/.changeset/long-garlics-refuse.md
@@ -0,0 +1,5 @@
+---
+"@atproto/api": patch
+---
+
+Add `reasonTypes`, `subjectTypes`, and `subjectCollections` properties to labeler service records.
diff --git a/Makefile b/Makefile
index 81b7b8acf67..980cd32e330 100644
--- a/Makefile
+++ b/Makefile
@@ -38,6 +38,10 @@ lint: ## Run style checks and verify syntax
 fmt: ## Run syntax re-formatting
 	pnpm format
 
+.PHONY: fmt-lexicons
+fmt-lexicons: ## Run syntax re-formatting, just on .json files
+	pnpm exec eslint ./lexicons/ --ext .json --fix
+
 .PHONY: deps
 deps: ## Installs dependent libs using 'pnpm install'
 	pnpm install --frozen-lockfile
diff --git a/lexicons/app/bsky/labeler/service.json b/lexicons/app/bsky/labeler/service.json
index a1ae011be56..becf1a12b2f 100644
--- a/lexicons/app/bsky/labeler/service.json
+++ b/lexicons/app/bsky/labeler/service.json
@@ -18,7 +18,28 @@
             "type": "union",
             "refs": ["com.atproto.label.defs#selfLabels"]
           },
-          "createdAt": { "type": "string", "format": "datetime" }
+          "createdAt": { "type": "string", "format": "datetime" },
+          "reasonTypes": {
+            "description": "The set of report reason 'codes' which are in-scope for this service to review and action. These usually align to policy categories. If not defined (distinct from empty array), all reason types are allowed.",
+            "type": "array",
+            "items": {
+              "type": "ref",
+              "ref": "com.atproto.moderation.defs#reasonType"
+            }
+          },
+          "subjectTypes": {
+            "description": "The set of subject types (account, record, etc) this service accepts reports on.",
+            "type": "array",
+            "items": {
+              "type": "ref",
+              "ref": "com.atproto.moderation.defs#subjectType"
+            }
+          },
+          "subjectCollections": {
+            "type": "array",
+            "description": "Set of record types (collection NSIDs) which can be reported to this service. If not defined (distinct from empty array), default is any record type.",
+            "items": { "type": "string", "format": "nsid" }
+          }
         }
       }
     }
diff --git a/lexicons/com/atproto/moderation/defs.json b/lexicons/com/atproto/moderation/defs.json
index b9e980df779..52dfedacd78 100644
--- a/lexicons/com/atproto/moderation/defs.json
+++ b/lexicons/com/atproto/moderation/defs.json
@@ -41,6 +41,11 @@
     "reasonAppeal": {
       "type": "token",
       "description": "Appeal: appeal a previously taken moderation action"
+    },
+    "subjectType": {
+      "type": "string",
+      "description": "Tag describing a type of subject that might be reported.",
+      "knownValues": ["account", "record", "chat"]
     }
   }
 }
diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
index a3fafbbd9a3..56c910fe698 100644
--- a/packages/api/src/client/lexicons.ts
+++ b/packages/api/src/client/lexicons.ts
@@ -1278,6 +1278,11 @@ export const schemaDict = {
         type: 'token',
         description: 'Appeal: appeal a previously taken moderation action',
       },
+      subjectType: {
+        type: 'string',
+        description: 'Tag describing a type of subject that might be reported.',
+        knownValues: ['account', 'record', 'chat'],
+      },
     },
   },
   ComAtprotoRepoApplyWrites: {
@@ -9162,6 +9167,33 @@ export const schemaDict = {
               type: 'string',
               format: 'datetime',
             },
+            reasonTypes: {
+              description:
+                "The set of report reason 'codes' which are in-scope for this service to review and action. These usually align to policy categories. If not defined (distinct from empty array), all reason types are allowed.",
+              type: 'array',
+              items: {
+                type: 'ref',
+                ref: 'lex:com.atproto.moderation.defs#reasonType',
+              },
+            },
+            subjectTypes: {
+              description:
+                'The set of subject types (account, record, etc) this service accepts reports on.',
+              type: 'array',
+              items: {
+                type: 'ref',
+                ref: 'lex:com.atproto.moderation.defs#subjectType',
+              },
+            },
+            subjectCollections: {
+              type: 'array',
+              description:
+                'Set of record types (collection NSIDs) which can be reported to this service. If not defined (distinct from empty array), default is any record type.',
+              items: {
+                type: 'string',
+                format: 'nsid',
+              },
+            },
           },
         },
       },
diff --git a/packages/api/src/client/types/app/bsky/labeler/service.ts b/packages/api/src/client/types/app/bsky/labeler/service.ts
index 368f71e53bc..2966b57a10b 100644
--- a/packages/api/src/client/types/app/bsky/labeler/service.ts
+++ b/packages/api/src/client/types/app/bsky/labeler/service.ts
@@ -7,6 +7,7 @@ import { validate as _validate } from '../../../../lexicons'
 import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import type * as AppBskyLabelerDefs from './defs.js'
 import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as ComAtprotoModerationDefs from '../../../com/atproto/moderation/defs.js'
 
 const is$typed = _is$typed,
   validate = _validate
@@ -17,6 +18,12 @@ export interface Record {
   policies: AppBskyLabelerDefs.LabelerPolicies
   labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   createdAt: string
+  /** The set of report reason 'codes' which are in-scope for this service to review and action. These usually align to policy categories. If not defined (distinct from empty array), all reason types are allowed. */
+  reasonTypes?: ComAtprotoModerationDefs.ReasonType[]
+  /** The set of subject types (account, record, etc) this service accepts reports on. */
+  subjectTypes?: ComAtprotoModerationDefs.SubjectType[]
+  /** Set of record types (collection NSIDs) which can be reported to this service. If not defined (distinct from empty array), default is any record type. */
+  subjectCollections?: string[]
   [k: string]: unknown
 }
 
diff --git a/packages/api/src/client/types/com/atproto/moderation/defs.ts b/packages/api/src/client/types/com/atproto/moderation/defs.ts
index 2d7a46f5dd8..600a59c951f 100644
--- a/packages/api/src/client/types/com/atproto/moderation/defs.ts
+++ b/packages/api/src/client/types/com/atproto/moderation/defs.ts
@@ -34,3 +34,6 @@ export const REASONRUDE = `${id}#reasonRude`
 export const REASONOTHER = `${id}#reasonOther`
 /** Appeal: appeal a previously taken moderation action */
 export const REASONAPPEAL = `${id}#reasonAppeal`
+
+/** Tag describing a type of subject that might be reported. */
+export type SubjectType = 'account' | 'record' | 'chat' | (string & {})
diff --git a/packages/bsky/src/lexicon/lexicons.ts b/packages/bsky/src/lexicon/lexicons.ts
index 567ed4591b9..df6a95efd66 100644
--- a/packages/bsky/src/lexicon/lexicons.ts
+++ b/packages/bsky/src/lexicon/lexicons.ts
@@ -1278,6 +1278,11 @@ export const schemaDict = {
         type: 'token',
         description: 'Appeal: appeal a previously taken moderation action',
       },
+      subjectType: {
+        type: 'string',
+        description: 'Tag describing a type of subject that might be reported.',
+        knownValues: ['account', 'record', 'chat'],
+      },
     },
   },
   ComAtprotoRepoApplyWrites: {
@@ -9162,6 +9167,33 @@ export const schemaDict = {
               type: 'string',
               format: 'datetime',
             },
+            reasonTypes: {
+              description:
+                "The set of report reason 'codes' which are in-scope for this service to review and action. These usually align to policy categories. If not defined (distinct from empty array), all reason types are allowed.",
+              type: 'array',
+              items: {
+                type: 'ref',
+                ref: 'lex:com.atproto.moderation.defs#reasonType',
+              },
+            },
+            subjectTypes: {
+              description:
+                'The set of subject types (account, record, etc) this service accepts reports on.',
+              type: 'array',
+              items: {
+                type: 'ref',
+                ref: 'lex:com.atproto.moderation.defs#subjectType',
+              },
+            },
+            subjectCollections: {
+              type: 'array',
+              description:
+                'Set of record types (collection NSIDs) which can be reported to this service. If not defined (distinct from empty array), default is any record type.',
+              items: {
+                type: 'string',
+                format: 'nsid',
+              },
+            },
           },
         },
       },
diff --git a/packages/bsky/src/lexicon/types/app/bsky/labeler/service.ts b/packages/bsky/src/lexicon/types/app/bsky/labeler/service.ts
index 368f71e53bc..2966b57a10b 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/labeler/service.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/labeler/service.ts
@@ -7,6 +7,7 @@ import { validate as _validate } from '../../../../lexicons'
 import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import type * as AppBskyLabelerDefs from './defs.js'
 import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as ComAtprotoModerationDefs from '../../../com/atproto/moderation/defs.js'
 
 const is$typed = _is$typed,
   validate = _validate
@@ -17,6 +18,12 @@ export interface Record {
   policies: AppBskyLabelerDefs.LabelerPolicies
   labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   createdAt: string
+  /** The set of report reason 'codes' which are in-scope for this service to review and action. These usually align to policy categories. If not defined (distinct from empty array), all reason types are allowed. */
+  reasonTypes?: ComAtprotoModerationDefs.ReasonType[]
+  /** The set of subject types (account, record, etc) this service accepts reports on. */
+  subjectTypes?: ComAtprotoModerationDefs.SubjectType[]
+  /** Set of record types (collection NSIDs) which can be reported to this service. If not defined (distinct from empty array), default is any record type. */
+  subjectCollections?: string[]
   [k: string]: unknown
 }
 
diff --git a/packages/bsky/src/lexicon/types/com/atproto/moderation/defs.ts b/packages/bsky/src/lexicon/types/com/atproto/moderation/defs.ts
index 2d7a46f5dd8..600a59c951f 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/moderation/defs.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/moderation/defs.ts
@@ -34,3 +34,6 @@ export const REASONRUDE = `${id}#reasonRude`
 export const REASONOTHER = `${id}#reasonOther`
 /** Appeal: appeal a previously taken moderation action */
 export const REASONAPPEAL = `${id}#reasonAppeal`
+
+/** Tag describing a type of subject that might be reported. */
+export type SubjectType = 'account' | 'record' | 'chat' | (string & {})
diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
index a3fafbbd9a3..56c910fe698 100644
--- a/packages/ozone/src/lexicon/lexicons.ts
+++ b/packages/ozone/src/lexicon/lexicons.ts
@@ -1278,6 +1278,11 @@ export const schemaDict = {
         type: 'token',
         description: 'Appeal: appeal a previously taken moderation action',
       },
+      subjectType: {
+        type: 'string',
+        description: 'Tag describing a type of subject that might be reported.',
+        knownValues: ['account', 'record', 'chat'],
+      },
     },
   },
   ComAtprotoRepoApplyWrites: {
@@ -9162,6 +9167,33 @@ export const schemaDict = {
               type: 'string',
               format: 'datetime',
             },
+            reasonTypes: {
+              description:
+                "The set of report reason 'codes' which are in-scope for this service to review and action. These usually align to policy categories. If not defined (distinct from empty array), all reason types are allowed.",
+              type: 'array',
+              items: {
+                type: 'ref',
+                ref: 'lex:com.atproto.moderation.defs#reasonType',
+              },
+            },
+            subjectTypes: {
+              description:
+                'The set of subject types (account, record, etc) this service accepts reports on.',
+              type: 'array',
+              items: {
+                type: 'ref',
+                ref: 'lex:com.atproto.moderation.defs#subjectType',
+              },
+            },
+            subjectCollections: {
+              type: 'array',
+              description:
+                'Set of record types (collection NSIDs) which can be reported to this service. If not defined (distinct from empty array), default is any record type.',
+              items: {
+                type: 'string',
+                format: 'nsid',
+              },
+            },
           },
         },
       },
diff --git a/packages/ozone/src/lexicon/types/app/bsky/labeler/service.ts b/packages/ozone/src/lexicon/types/app/bsky/labeler/service.ts
index 368f71e53bc..2966b57a10b 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/labeler/service.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/labeler/service.ts
@@ -7,6 +7,7 @@ import { validate as _validate } from '../../../../lexicons'
 import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import type * as AppBskyLabelerDefs from './defs.js'
 import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as ComAtprotoModerationDefs from '../../../com/atproto/moderation/defs.js'
 
 const is$typed = _is$typed,
   validate = _validate
@@ -17,6 +18,12 @@ export interface Record {
   policies: AppBskyLabelerDefs.LabelerPolicies
   labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   createdAt: string
+  /** The set of report reason 'codes' which are in-scope for this service to review and action. These usually align to policy categories. If not defined (distinct from empty array), all reason types are allowed. */
+  reasonTypes?: ComAtprotoModerationDefs.ReasonType[]
+  /** The set of subject types (account, record, etc) this service accepts reports on. */
+  subjectTypes?: ComAtprotoModerationDefs.SubjectType[]
+  /** Set of record types (collection NSIDs) which can be reported to this service. If not defined (distinct from empty array), default is any record type. */
+  subjectCollections?: string[]
   [k: string]: unknown
 }
 
diff --git a/packages/ozone/src/lexicon/types/com/atproto/moderation/defs.ts b/packages/ozone/src/lexicon/types/com/atproto/moderation/defs.ts
index 2d7a46f5dd8..600a59c951f 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/moderation/defs.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/moderation/defs.ts
@@ -34,3 +34,6 @@ export const REASONRUDE = `${id}#reasonRude`
 export const REASONOTHER = `${id}#reasonOther`
 /** Appeal: appeal a previously taken moderation action */
 export const REASONAPPEAL = `${id}#reasonAppeal`
+
+/** Tag describing a type of subject that might be reported. */
+export type SubjectType = 'account' | 'record' | 'chat' | (string & {})
diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
index a3fafbbd9a3..56c910fe698 100644
--- a/packages/pds/src/lexicon/lexicons.ts
+++ b/packages/pds/src/lexicon/lexicons.ts
@@ -1278,6 +1278,11 @@ export const schemaDict = {
         type: 'token',
         description: 'Appeal: appeal a previously taken moderation action',
       },
+      subjectType: {
+        type: 'string',
+        description: 'Tag describing a type of subject that might be reported.',
+        knownValues: ['account', 'record', 'chat'],
+      },
     },
   },
   ComAtprotoRepoApplyWrites: {
@@ -9162,6 +9167,33 @@ export const schemaDict = {
               type: 'string',
               format: 'datetime',
             },
+            reasonTypes: {
+              description:
+                "The set of report reason 'codes' which are in-scope for this service to review and action. These usually align to policy categories. If not defined (distinct from empty array), all reason types are allowed.",
+              type: 'array',
+              items: {
+                type: 'ref',
+                ref: 'lex:com.atproto.moderation.defs#reasonType',
+              },
+            },
+            subjectTypes: {
+              description:
+                'The set of subject types (account, record, etc) this service accepts reports on.',
+              type: 'array',
+              items: {
+                type: 'ref',
+                ref: 'lex:com.atproto.moderation.defs#subjectType',
+              },
+            },
+            subjectCollections: {
+              type: 'array',
+              description:
+                'Set of record types (collection NSIDs) which can be reported to this service. If not defined (distinct from empty array), default is any record type.',
+              items: {
+                type: 'string',
+                format: 'nsid',
+              },
+            },
           },
         },
       },
diff --git a/packages/pds/src/lexicon/types/app/bsky/labeler/service.ts b/packages/pds/src/lexicon/types/app/bsky/labeler/service.ts
index 368f71e53bc..2966b57a10b 100644
--- a/packages/pds/src/lexicon/types/app/bsky/labeler/service.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/labeler/service.ts
@@ -7,6 +7,7 @@ import { validate as _validate } from '../../../../lexicons'
 import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import type * as AppBskyLabelerDefs from './defs.js'
 import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as ComAtprotoModerationDefs from '../../../com/atproto/moderation/defs.js'
 
 const is$typed = _is$typed,
   validate = _validate
@@ -17,6 +18,12 @@ export interface Record {
   policies: AppBskyLabelerDefs.LabelerPolicies
   labels?: $Typed<ComAtprotoLabelDefs.SelfLabels> | { $type: string }
   createdAt: string
+  /** The set of report reason 'codes' which are in-scope for this service to review and action. These usually align to policy categories. If not defined (distinct from empty array), all reason types are allowed. */
+  reasonTypes?: ComAtprotoModerationDefs.ReasonType[]
+  /** The set of subject types (account, record, etc) this service accepts reports on. */
+  subjectTypes?: ComAtprotoModerationDefs.SubjectType[]
+  /** Set of record types (collection NSIDs) which can be reported to this service. If not defined (distinct from empty array), default is any record type. */
+  subjectCollections?: string[]
   [k: string]: unknown
 }
 
diff --git a/packages/pds/src/lexicon/types/com/atproto/moderation/defs.ts b/packages/pds/src/lexicon/types/com/atproto/moderation/defs.ts
index 2d7a46f5dd8..600a59c951f 100644
--- a/packages/pds/src/lexicon/types/com/atproto/moderation/defs.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/moderation/defs.ts
@@ -34,3 +34,6 @@ export const REASONRUDE = `${id}#reasonRude`
 export const REASONOTHER = `${id}#reasonOther`
 /** Appeal: appeal a previously taken moderation action */
 export const REASONAPPEAL = `${id}#reasonAppeal`
+
+/** Tag describing a type of subject that might be reported. */
+export type SubjectType = 'account' | 'record' | 'chat' | (string & {})

From 5cce7667058981561340107e0124093203e796e3 Mon Sep 17 00:00:00 2001
From: devin ivy <devinivy@gmail.com>
Date: Tue, 25 Feb 2025 11:11:53 -0500
Subject: [PATCH 095/101] Add x-forwarded-for to PDS-proxied requests to
 entryway (#3553)

* add x-forward-for to pds proxied requests to entryway

* pds: pull entryway auth/passthru headers into own methods, adjust forwarding

* tidy

* changeset

* pds: switch back to forward just first untrusted ips, trust local ips
---
 .changeset/small-chicken-smell.md             |  5 +++
 .../src/api/com/atproto/admin/sendEmail.ts    |  8 ++--
 .../com/atproto/admin/updateAccountEmail.ts   |  3 +-
 .../atproto/admin/updateAccountPassword.ts    |  3 +-
 .../identity/requestPlcOperationSignature.ts  |  8 ++--
 .../com/atproto/identity/signPlcOperation.ts  |  8 ++--
 .../api/com/atproto/identity/updateHandle.ts  |  9 ++---
 .../api/com/atproto/server/activateAccount.ts |  3 +-
 .../api/com/atproto/server/confirmEmail.ts    |  8 ++--
 .../com/atproto/server/createAppPassword.ts   |  9 ++---
 .../api/com/atproto/server/createSession.ts   |  4 +-
 .../com/atproto/server/deactivateAccount.ts   |  3 +-
 .../api/com/atproto/server/deleteAccount.ts   |  3 +-
 .../api/com/atproto/server/deleteSession.ts   |  5 +--
 .../atproto/server/getAccountInviteCodes.ts   |  8 ++--
 .../src/api/com/atproto/server/getSession.ts  |  4 +-
 .../com/atproto/server/listAppPasswords.ts    |  8 ++--
 .../api/com/atproto/server/refreshSession.ts  |  4 +-
 .../atproto/server/requestAccountDelete.ts    |  8 ++--
 .../server/requestEmailConfirmation.ts        |  8 ++--
 .../com/atproto/server/requestEmailUpdate.ts  |  8 ++--
 .../atproto/server/requestPasswordReset.ts    |  3 +-
 .../api/com/atproto/server/resetPassword.ts   |  3 +-
 .../com/atproto/server/revokeAppPassword.ts   |  8 ++--
 .../src/api/com/atproto/server/updateEmail.ts |  8 ++--
 .../api/com/atproto/temp/checkSignupQueue.ts  |  4 +-
 packages/pds/src/api/proxy.ts                 | 38 +++++++++----------
 packages/pds/src/context.ts                   | 16 ++++++++
 packages/pds/src/index.ts                     |  2 +-
 29 files changed, 97 insertions(+), 112 deletions(-)
 create mode 100644 .changeset/small-chicken-smell.md

diff --git a/.changeset/small-chicken-smell.md b/.changeset/small-chicken-smell.md
new file mode 100644
index 00000000000..418c8170f1c
--- /dev/null
+++ b/.changeset/small-chicken-smell.md
@@ -0,0 +1,5 @@
+---
+"@atproto/pds": patch
+---
+
+Add x-forwarded-for to PDS-proxied requests to entryway
diff --git a/packages/pds/src/api/com/atproto/admin/sendEmail.ts b/packages/pds/src/api/com/atproto/admin/sendEmail.ts
index 74a73417627..68c3b5790d0 100644
--- a/packages/pds/src/api/com/atproto/admin/sendEmail.ts
+++ b/packages/pds/src/api/com/atproto/admin/sendEmail.ts
@@ -1,4 +1,3 @@
-import assert from 'node:assert'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
@@ -8,7 +7,7 @@ import { resultPassthru } from '../../../proxy'
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.admin.sendEmail({
     auth: ctx.authVerifier.moderator,
-    handler: async ({ input }) => {
+    handler: async ({ input, req }) => {
       const {
         content,
         recipientDid,
@@ -24,13 +23,12 @@ export default function (server: Server, ctx: AppContext) {
       }
 
       if (ctx.entrywayAgent) {
-        assert(ctx.cfg.entryway)
         return resultPassthru(
           await ctx.entrywayAgent.com.atproto.admin.sendEmail(
             input.body,
-            await ctx.serviceAuthHeaders(
+            await ctx.entrywayAuthHeaders(
+              req,
               recipientDid,
-              ctx.cfg.entryway.did,
               ids.ComAtprotoAdminSendEmail,
             ),
           ),
diff --git a/packages/pds/src/api/com/atproto/admin/updateAccountEmail.ts b/packages/pds/src/api/com/atproto/admin/updateAccountEmail.ts
index d4c5c0853f9..0b016ab2267 100644
--- a/packages/pds/src/api/com/atproto/admin/updateAccountEmail.ts
+++ b/packages/pds/src/api/com/atproto/admin/updateAccountEmail.ts
@@ -1,7 +1,6 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import { authPassthru } from './util'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.admin.updateAccountEmail({
@@ -20,7 +19,7 @@ export default function (server: Server, ctx: AppContext) {
       if (ctx.entrywayAgent) {
         await ctx.entrywayAgent.com.atproto.admin.updateAccountEmail(
           input.body,
-          authPassthru(req, true),
+          ctx.entrywayPassthruHeaders(req),
         )
         return
       }
diff --git a/packages/pds/src/api/com/atproto/admin/updateAccountPassword.ts b/packages/pds/src/api/com/atproto/admin/updateAccountPassword.ts
index bd025bb9b87..9376a064c11 100644
--- a/packages/pds/src/api/com/atproto/admin/updateAccountPassword.ts
+++ b/packages/pds/src/api/com/atproto/admin/updateAccountPassword.ts
@@ -1,6 +1,5 @@
 import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import { authPassthru } from './util'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.admin.updateAccountPassword({
@@ -9,7 +8,7 @@ export default function (server: Server, ctx: AppContext) {
       if (ctx.entrywayAgent) {
         await ctx.entrywayAgent.com.atproto.admin.updateAccountPassword(
           input.body,
-          authPassthru(req, true),
+          ctx.entrywayPassthruHeaders(req),
         )
         return
       }
diff --git a/packages/pds/src/api/com/atproto/identity/requestPlcOperationSignature.ts b/packages/pds/src/api/com/atproto/identity/requestPlcOperationSignature.ts
index 044d81ebbf7..79364c38171 100644
--- a/packages/pds/src/api/com/atproto/identity/requestPlcOperationSignature.ts
+++ b/packages/pds/src/api/com/atproto/identity/requestPlcOperationSignature.ts
@@ -1,4 +1,3 @@
-import assert from 'node:assert'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { AuthScope } from '../../../../auth-verifier'
 import { AppContext } from '../../../../context'
@@ -8,14 +7,13 @@ import { ids } from '../../../../lexicon/lexicons'
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.identity.requestPlcOperationSignature({
     auth: ctx.authVerifier.accessFull({ additional: [AuthScope.Takendown] }),
-    handler: async ({ auth }) => {
+    handler: async ({ auth, req }) => {
       if (ctx.entrywayAgent) {
-        assert(ctx.cfg.entryway)
         await ctx.entrywayAgent.com.atproto.identity.requestPlcOperationSignature(
           undefined,
-          await ctx.serviceAuthHeaders(
+          await ctx.entrywayAuthHeaders(
+            req,
             auth.credentials.did,
-            ctx.cfg.entryway.did,
             ids.ComAtprotoIdentityRequestPlcOperationSignature,
           ),
         )
diff --git a/packages/pds/src/api/com/atproto/identity/signPlcOperation.ts b/packages/pds/src/api/com/atproto/identity/signPlcOperation.ts
index ecfd7882a3d..4802cfc46a1 100644
--- a/packages/pds/src/api/com/atproto/identity/signPlcOperation.ts
+++ b/packages/pds/src/api/com/atproto/identity/signPlcOperation.ts
@@ -1,4 +1,3 @@
-import assert from 'node:assert'
 import * as plc from '@did-plc/lib'
 import { check } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
@@ -10,15 +9,14 @@ import { resultPassthru } from '../../../proxy'
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.identity.signPlcOperation({
     auth: ctx.authVerifier.accessFull(),
-    handler: async ({ auth, input }) => {
+    handler: async ({ auth, input, req }) => {
       if (ctx.entrywayAgent) {
-        assert(ctx.cfg.entryway)
         return resultPassthru(
           await ctx.entrywayAgent.com.atproto.identity.signPlcOperation(
             input.body,
-            await ctx.serviceAuthHeaders(
+            await ctx.entrywayAuthHeaders(
+              req,
               auth.credentials.did,
-              ctx.cfg.entryway.did,
               ids.ComAtprotoIdentitySignPlcOperation,
             ),
           ),
diff --git a/packages/pds/src/api/com/atproto/identity/updateHandle.ts b/packages/pds/src/api/com/atproto/identity/updateHandle.ts
index b2058c92f29..61c42bae53e 100644
--- a/packages/pds/src/api/com/atproto/identity/updateHandle.ts
+++ b/packages/pds/src/api/com/atproto/identity/updateHandle.ts
@@ -1,4 +1,3 @@
-import assert from 'node:assert'
 import { DAY, MINUTE } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
@@ -22,21 +21,19 @@ export default function (server: Server, ctx: AppContext) {
         calcKey: ({ auth }) => auth.credentials.did,
       },
     ],
-    handler: async ({ auth, input }) => {
+    handler: async ({ auth, input, req }) => {
       const requester = auth.credentials.did
 
       if (ctx.entrywayAgent) {
-        assert(ctx.cfg.entryway)
-
         // the full flow is:
         // -> entryway(identity.updateHandle) [update handle, submit plc op]
         // -> pds(admin.updateAccountHandle)  [track handle, sequence handle update]
         await ctx.entrywayAgent.com.atproto.identity.updateHandle(
           // @ts-expect-error "did" is not in the schema
           { did: requester, handle: input.body.handle },
-          await ctx.serviceAuthHeaders(
+          await ctx.entrywayAuthHeaders(
+            req,
             auth.credentials.did,
-            ctx.cfg.entryway.did,
             ids.ComAtprotoIdentityUpdateHandle,
           ),
         )
diff --git a/packages/pds/src/api/com/atproto/server/activateAccount.ts b/packages/pds/src/api/com/atproto/server/activateAccount.ts
index b0e90404cc8..d3c73d077d7 100644
--- a/packages/pds/src/api/com/atproto/server/activateAccount.ts
+++ b/packages/pds/src/api/com/atproto/server/activateAccount.ts
@@ -3,7 +3,6 @@ import { INVALID_HANDLE } from '@atproto/syntax'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import { authPassthru } from '../../../proxy'
 import { assertValidDidDocumentForService } from './util'
 
 export default function (server: Server, ctx: AppContext) {
@@ -14,7 +13,7 @@ export default function (server: Server, ctx: AppContext) {
       if (ctx.entrywayAgent) {
         await ctx.entrywayAgent.com.atproto.server.activateAccount(
           undefined,
-          authPassthru(req),
+          ctx.entrywayPassthruHeaders(req),
         )
         return
       }
diff --git a/packages/pds/src/api/com/atproto/server/confirmEmail.ts b/packages/pds/src/api/com/atproto/server/confirmEmail.ts
index fd8d1ff7f2e..799e0e3faef 100644
--- a/packages/pds/src/api/com/atproto/server/confirmEmail.ts
+++ b/packages/pds/src/api/com/atproto/server/confirmEmail.ts
@@ -1,4 +1,3 @@
-import assert from 'node:assert'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
@@ -7,7 +6,7 @@ import { ids } from '../../../../lexicon/lexicons'
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.server.confirmEmail({
     auth: ctx.authVerifier.accessStandard({ checkTakedown: true }),
-    handler: async ({ auth, input }) => {
+    handler: async ({ auth, input, req }) => {
       const did = auth.credentials.did
 
       const user = await ctx.accountManager.getAccount(did, {
@@ -18,12 +17,11 @@ export default function (server: Server, ctx: AppContext) {
       }
 
       if (ctx.entrywayAgent) {
-        assert(ctx.cfg.entryway)
         await ctx.entrywayAgent.com.atproto.server.confirmEmail(
           input.body,
-          await ctx.serviceAuthHeaders(
+          await ctx.entrywayAuthHeaders(
+            req,
             auth.credentials.did,
-            ctx.cfg.entryway.did,
             ids.ComAtprotoServerConfirmEmail,
           ),
         )
diff --git a/packages/pds/src/api/com/atproto/server/createAppPassword.ts b/packages/pds/src/api/com/atproto/server/createAppPassword.ts
index a1039e26419..84f9c31e3d5 100644
--- a/packages/pds/src/api/com/atproto/server/createAppPassword.ts
+++ b/packages/pds/src/api/com/atproto/server/createAppPassword.ts
@@ -1,4 +1,3 @@
-import assert from 'node:assert'
 import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import { ids } from '../../../../lexicon/lexicons'
@@ -9,16 +8,14 @@ export default function (server: Server, ctx: AppContext) {
     auth: ctx.authVerifier.accessFull({
       checkTakedown: true,
     }),
-    handler: async ({ auth, input }) => {
+    handler: async ({ auth, input, req }) => {
       if (ctx.entrywayAgent) {
-        assert(ctx.cfg.entryway)
-
         return resultPassthru(
           await ctx.entrywayAgent.com.atproto.server.createAppPassword(
             input.body,
-            await ctx.serviceAuthHeaders(
+            await ctx.entrywayAuthHeaders(
+              req,
               auth.credentials.did,
-              ctx.cfg.entryway.did,
               ids.ComAtprotoServerCreateAppPassword,
             ),
           ),
diff --git a/packages/pds/src/api/com/atproto/server/createSession.ts b/packages/pds/src/api/com/atproto/server/createSession.ts
index 36c269a3ab7..8d8cc3a1e1b 100644
--- a/packages/pds/src/api/com/atproto/server/createSession.ts
+++ b/packages/pds/src/api/com/atproto/server/createSession.ts
@@ -4,7 +4,7 @@ import { AuthRequiredError } from '@atproto/xrpc-server'
 import { formatAccountStatus } from '../../../../account-manager'
 import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import { authPassthru, resultPassthru } from '../../../proxy'
+import { resultPassthru } from '../../../proxy'
 import { didDocForSession } from './util'
 
 export default function (server: Server, ctx: AppContext) {
@@ -26,7 +26,7 @@ export default function (server: Server, ctx: AppContext) {
         return resultPassthru(
           await ctx.entrywayAgent.com.atproto.server.createSession(
             input.body,
-            authPassthru(req, true),
+            ctx.entrywayPassthruHeaders(req),
           ),
         )
       }
diff --git a/packages/pds/src/api/com/atproto/server/deactivateAccount.ts b/packages/pds/src/api/com/atproto/server/deactivateAccount.ts
index ff21d6e772f..b8d46f58b40 100644
--- a/packages/pds/src/api/com/atproto/server/deactivateAccount.ts
+++ b/packages/pds/src/api/com/atproto/server/deactivateAccount.ts
@@ -1,7 +1,6 @@
 import { AuthScope } from '../../../../auth-verifier'
 import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import { authPassthru } from '../../../proxy'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.server.deactivateAccount({
@@ -11,7 +10,7 @@ export default function (server: Server, ctx: AppContext) {
       if (ctx.entrywayAgent) {
         await ctx.entrywayAgent.com.atproto.server.deactivateAccount(
           input.body,
-          authPassthru(req),
+          ctx.entrywayPassthruHeaders(req),
         )
         return
       }
diff --git a/packages/pds/src/api/com/atproto/server/deleteAccount.ts b/packages/pds/src/api/com/atproto/server/deleteAccount.ts
index 6d7b8222e80..c7aa20da9f4 100644
--- a/packages/pds/src/api/com/atproto/server/deleteAccount.ts
+++ b/packages/pds/src/api/com/atproto/server/deleteAccount.ts
@@ -3,7 +3,6 @@ import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
 import { AccountStatus } from '../../../../account-manager'
 import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import { authPassthru } from '../../../proxy'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.server.deleteAccount({
@@ -25,7 +24,7 @@ export default function (server: Server, ctx: AppContext) {
       if (ctx.entrywayAgent) {
         await ctx.entrywayAgent.com.atproto.server.deleteAccount(
           input.body,
-          authPassthru(req, true),
+          ctx.entrywayPassthruHeaders(req),
         )
         return
       }
diff --git a/packages/pds/src/api/com/atproto/server/deleteSession.ts b/packages/pds/src/api/com/atproto/server/deleteSession.ts
index de1811a06a0..a6701f40f66 100644
--- a/packages/pds/src/api/com/atproto/server/deleteSession.ts
+++ b/packages/pds/src/api/com/atproto/server/deleteSession.ts
@@ -1,14 +1,13 @@
 import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import { authPassthru } from '../../../proxy'
 
 export default function (server: Server, ctx: AppContext) {
   const { entrywayAgent } = ctx
   if (entrywayAgent) {
-    server.com.atproto.server.deleteSession(async (reqCtx) => {
+    server.com.atproto.server.deleteSession(async ({ req }) => {
       await entrywayAgent.com.atproto.server.deleteSession(
         undefined,
-        authPassthru(reqCtx.req),
+        ctx.entrywayPassthruHeaders(req),
       )
     })
   } else {
diff --git a/packages/pds/src/api/com/atproto/server/getAccountInviteCodes.ts b/packages/pds/src/api/com/atproto/server/getAccountInviteCodes.ts
index a1b38115d98..fb126edb8fb 100644
--- a/packages/pds/src/api/com/atproto/server/getAccountInviteCodes.ts
+++ b/packages/pds/src/api/com/atproto/server/getAccountInviteCodes.ts
@@ -1,4 +1,3 @@
-import assert from 'node:assert'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { CodeDetail } from '../../../../account-manager/helpers/invite'
 import { AppContext } from '../../../../context'
@@ -10,15 +9,14 @@ import { genInvCodes } from './util'
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.server.getAccountInviteCodes({
     auth: ctx.authVerifier.accessFull({ checkTakedown: true }),
-    handler: async ({ params, auth }) => {
+    handler: async ({ params, auth, req }) => {
       if (ctx.entrywayAgent) {
-        assert(ctx.cfg.entryway)
         return resultPassthru(
           await ctx.entrywayAgent.com.atproto.server.getAccountInviteCodes(
             params,
-            await ctx.serviceAuthHeaders(
+            await ctx.entrywayAuthHeaders(
+              req,
               auth.credentials.did,
-              ctx.cfg.entryway.did,
               ids.ComAtprotoServerGetAccountInviteCodes,
             ),
           ),
diff --git a/packages/pds/src/api/com/atproto/server/getSession.ts b/packages/pds/src/api/com/atproto/server/getSession.ts
index c210cd72948..b1fde56962a 100644
--- a/packages/pds/src/api/com/atproto/server/getSession.ts
+++ b/packages/pds/src/api/com/atproto/server/getSession.ts
@@ -4,7 +4,7 @@ import { formatAccountStatus } from '../../../../account-manager'
 import { AuthScope } from '../../../../auth-verifier'
 import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import { authPassthru, resultPassthru } from '../../../proxy'
+import { resultPassthru } from '../../../proxy'
 import { didDocForSession } from './util'
 
 export default function (server: Server, ctx: AppContext) {
@@ -17,7 +17,7 @@ export default function (server: Server, ctx: AppContext) {
         return resultPassthru(
           await ctx.entrywayAgent.com.atproto.server.getSession(
             undefined,
-            authPassthru(req),
+            ctx.entrywayPassthruHeaders(req),
           ),
         )
       }
diff --git a/packages/pds/src/api/com/atproto/server/listAppPasswords.ts b/packages/pds/src/api/com/atproto/server/listAppPasswords.ts
index abb78c74e4c..ca76fd672d2 100644
--- a/packages/pds/src/api/com/atproto/server/listAppPasswords.ts
+++ b/packages/pds/src/api/com/atproto/server/listAppPasswords.ts
@@ -1,4 +1,3 @@
-import assert from 'node:assert'
 import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import { ids } from '../../../../lexicon/lexicons'
@@ -7,15 +6,14 @@ import { resultPassthru } from '../../../proxy'
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.server.listAppPasswords({
     auth: ctx.authVerifier.accessStandard(),
-    handler: async ({ auth }) => {
+    handler: async ({ auth, req }) => {
       if (ctx.entrywayAgent) {
-        assert(ctx.cfg.entryway)
         return resultPassthru(
           await ctx.entrywayAgent.com.atproto.server.listAppPasswords(
             undefined,
-            await ctx.serviceAuthHeaders(
+            await ctx.entrywayAuthHeaders(
+              req,
               auth.credentials.did,
-              ctx.cfg.entryway.did,
               ids.ComAtprotoServerListAppPasswords,
             ),
           ),
diff --git a/packages/pds/src/api/com/atproto/server/refreshSession.ts b/packages/pds/src/api/com/atproto/server/refreshSession.ts
index d653c3a6c01..e81ae05dc16 100644
--- a/packages/pds/src/api/com/atproto/server/refreshSession.ts
+++ b/packages/pds/src/api/com/atproto/server/refreshSession.ts
@@ -4,7 +4,7 @@ import { formatAccountStatus } from '../../../../account-manager'
 import { AppContext } from '../../../../context'
 import { softDeleted } from '../../../../db/util'
 import { Server } from '../../../../lexicon'
-import { authPassthru, resultPassthru } from '../../../proxy'
+import { resultPassthru } from '../../../proxy'
 import { didDocForSession } from './util'
 
 export default function (server: Server, ctx: AppContext) {
@@ -32,7 +32,7 @@ export default function (server: Server, ctx: AppContext) {
         return resultPassthru(
           await ctx.entrywayAgent.com.atproto.server.refreshSession(
             undefined,
-            authPassthru(req),
+            ctx.entrywayPassthruHeaders(req),
           ),
         )
       }
diff --git a/packages/pds/src/api/com/atproto/server/requestAccountDelete.ts b/packages/pds/src/api/com/atproto/server/requestAccountDelete.ts
index 35ec2ae5840..050d665723d 100644
--- a/packages/pds/src/api/com/atproto/server/requestAccountDelete.ts
+++ b/packages/pds/src/api/com/atproto/server/requestAccountDelete.ts
@@ -1,4 +1,3 @@
-import assert from 'node:assert'
 import { DAY, HOUR } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
@@ -20,7 +19,7 @@ export default function (server: Server, ctx: AppContext) {
       },
     ],
     auth: ctx.authVerifier.accessFull({ checkTakedown: true }),
-    handler: async ({ auth }) => {
+    handler: async ({ auth, req }) => {
       const did = auth.credentials.did
       const account = await ctx.accountManager.getAccount(did, {
         includeDeactivated: true,
@@ -31,12 +30,11 @@ export default function (server: Server, ctx: AppContext) {
       }
 
       if (ctx.entrywayAgent) {
-        assert(ctx.cfg.entryway)
         await ctx.entrywayAgent.com.atproto.server.requestAccountDelete(
           undefined,
-          await ctx.serviceAuthHeaders(
+          await ctx.entrywayAuthHeaders(
+            req,
             auth.credentials.did,
-            ctx.cfg.entryway.did,
             ids.ComAtprotoServerRequestAccountDelete,
           ),
         )
diff --git a/packages/pds/src/api/com/atproto/server/requestEmailConfirmation.ts b/packages/pds/src/api/com/atproto/server/requestEmailConfirmation.ts
index 411a2653665..9cdfa4a77d9 100644
--- a/packages/pds/src/api/com/atproto/server/requestEmailConfirmation.ts
+++ b/packages/pds/src/api/com/atproto/server/requestEmailConfirmation.ts
@@ -1,4 +1,3 @@
-import assert from 'node:assert'
 import { DAY, HOUR } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
@@ -20,7 +19,7 @@ export default function (server: Server, ctx: AppContext) {
       },
     ],
     auth: ctx.authVerifier.accessStandard({ checkTakedown: true }),
-    handler: async ({ auth }) => {
+    handler: async ({ auth, req }) => {
       const did = auth.credentials.did
       const account = await ctx.accountManager.getAccount(did, {
         includeDeactivated: true,
@@ -31,12 +30,11 @@ export default function (server: Server, ctx: AppContext) {
       }
 
       if (ctx.entrywayAgent) {
-        assert(ctx.cfg.entryway)
         await ctx.entrywayAgent.com.atproto.server.requestEmailConfirmation(
           undefined,
-          await ctx.serviceAuthHeaders(
+          await ctx.entrywayAuthHeaders(
+            req,
             auth.credentials.did,
-            ctx.cfg.entryway.did,
             ids.ComAtprotoServerRequestEmailConfirmation,
           ),
         )
diff --git a/packages/pds/src/api/com/atproto/server/requestEmailUpdate.ts b/packages/pds/src/api/com/atproto/server/requestEmailUpdate.ts
index a7b9bcfe470..8b2cfcaef07 100644
--- a/packages/pds/src/api/com/atproto/server/requestEmailUpdate.ts
+++ b/packages/pds/src/api/com/atproto/server/requestEmailUpdate.ts
@@ -1,4 +1,3 @@
-import assert from 'node:assert'
 import { DAY, HOUR } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
@@ -21,7 +20,7 @@ export default function (server: Server, ctx: AppContext) {
       },
     ],
     auth: ctx.authVerifier.accessStandard({ checkTakedown: true }),
-    handler: async ({ auth }) => {
+    handler: async ({ auth, req }) => {
       const did = auth.credentials.did
       const account = await ctx.accountManager.getAccount(did, {
         includeDeactivated: true,
@@ -32,13 +31,12 @@ export default function (server: Server, ctx: AppContext) {
       }
 
       if (ctx.entrywayAgent) {
-        assert(ctx.cfg.entryway)
         return resultPassthru(
           await ctx.entrywayAgent.com.atproto.server.requestEmailUpdate(
             undefined,
-            await ctx.serviceAuthHeaders(
+            await ctx.entrywayAuthHeaders(
+              req,
               auth.credentials.did,
-              ctx.cfg.entryway.did,
               ids.ComAtprotoServerRequestEmailUpdate,
             ),
           ),
diff --git a/packages/pds/src/api/com/atproto/server/requestPasswordReset.ts b/packages/pds/src/api/com/atproto/server/requestPasswordReset.ts
index 15f0bcd7c75..b384bbdfc8a 100644
--- a/packages/pds/src/api/com/atproto/server/requestPasswordReset.ts
+++ b/packages/pds/src/api/com/atproto/server/requestPasswordReset.ts
@@ -2,7 +2,6 @@ import { DAY, HOUR } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import { authPassthru } from '../../../proxy'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.server.requestPasswordReset({
@@ -28,7 +27,7 @@ export default function (server: Server, ctx: AppContext) {
         if (ctx.entrywayAgent) {
           await ctx.entrywayAgent.com.atproto.server.requestPasswordReset(
             input.body,
-            authPassthru(req, true),
+            ctx.entrywayPassthruHeaders(req),
           )
           return
         }
diff --git a/packages/pds/src/api/com/atproto/server/resetPassword.ts b/packages/pds/src/api/com/atproto/server/resetPassword.ts
index dc6ef8cb445..2e6e47da40b 100644
--- a/packages/pds/src/api/com/atproto/server/resetPassword.ts
+++ b/packages/pds/src/api/com/atproto/server/resetPassword.ts
@@ -1,7 +1,6 @@
 import { MINUTE } from '@atproto/common'
 import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import { authPassthru } from '../../../proxy'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.server.resetPassword({
@@ -15,7 +14,7 @@ export default function (server: Server, ctx: AppContext) {
       if (ctx.entrywayAgent) {
         await ctx.entrywayAgent.com.atproto.server.resetPassword(
           input.body,
-          authPassthru(req, true),
+          ctx.entrywayPassthruHeaders(req),
         )
         return
       }
diff --git a/packages/pds/src/api/com/atproto/server/revokeAppPassword.ts b/packages/pds/src/api/com/atproto/server/revokeAppPassword.ts
index c4bca296784..a599add76bb 100644
--- a/packages/pds/src/api/com/atproto/server/revokeAppPassword.ts
+++ b/packages/pds/src/api/com/atproto/server/revokeAppPassword.ts
@@ -1,4 +1,3 @@
-import assert from 'node:assert'
 import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import { ids } from '../../../../lexicon/lexicons'
@@ -6,14 +5,13 @@ import { ids } from '../../../../lexicon/lexicons'
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.server.revokeAppPassword({
     auth: ctx.authVerifier.accessStandard(),
-    handler: async ({ auth, input }) => {
+    handler: async ({ auth, input, req }) => {
       if (ctx.entrywayAgent) {
-        assert(ctx.cfg.entryway)
         await ctx.entrywayAgent.com.atproto.server.revokeAppPassword(
           input.body,
-          await ctx.serviceAuthHeaders(
+          await ctx.entrywayAuthHeaders(
+            req,
             auth.credentials.did,
-            ctx.cfg.entryway.did,
             ids.ComAtprotoServerRevokeAppPassword,
           ),
         )
diff --git a/packages/pds/src/api/com/atproto/server/updateEmail.ts b/packages/pds/src/api/com/atproto/server/updateEmail.ts
index b7e2ab2cb45..d1ed10c2918 100644
--- a/packages/pds/src/api/com/atproto/server/updateEmail.ts
+++ b/packages/pds/src/api/com/atproto/server/updateEmail.ts
@@ -1,4 +1,3 @@
-import assert from 'node:assert'
 import { isEmailValid } from '@hapi/address'
 import { isDisposableEmail } from 'disposable-email-domains-js'
 import { InvalidRequestError } from '@atproto/xrpc-server'
@@ -10,7 +9,7 @@ import { ids } from '../../../../lexicon/lexicons'
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.server.updateEmail({
     auth: ctx.authVerifier.accessFull({ checkTakedown: true }),
-    handler: async ({ auth, input }) => {
+    handler: async ({ auth, input, req }) => {
       const did = auth.credentials.did
       const { token, email } = input.body
       if (!isEmailValid(email) || isDisposableEmail(email)) {
@@ -26,12 +25,11 @@ export default function (server: Server, ctx: AppContext) {
       }
 
       if (ctx.entrywayAgent) {
-        assert(ctx.cfg.entryway)
         await ctx.entrywayAgent.com.atproto.server.updateEmail(
           input.body,
-          await ctx.serviceAuthHeaders(
+          await ctx.entrywayAuthHeaders(
+            req,
             auth.credentials.did,
-            ctx.cfg.entryway.did,
             ids.ComAtprotoServerUpdateEmail,
           ),
         )
diff --git a/packages/pds/src/api/com/atproto/temp/checkSignupQueue.ts b/packages/pds/src/api/com/atproto/temp/checkSignupQueue.ts
index d7384a38ea2..86be3a27061 100644
--- a/packages/pds/src/api/com/atproto/temp/checkSignupQueue.ts
+++ b/packages/pds/src/api/com/atproto/temp/checkSignupQueue.ts
@@ -1,7 +1,7 @@
 import { AuthScope } from '../../../../auth-verifier'
 import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import { authPassthru, resultPassthru } from '../../../proxy'
+import { resultPassthru } from '../../../proxy'
 
 // THIS IS A TEMPORARY UNSPECCED ROUTE
 export default function (server: Server, ctx: AppContext) {
@@ -21,7 +21,7 @@ export default function (server: Server, ctx: AppContext) {
       return resultPassthru(
         await ctx.entrywayAgent.com.atproto.temp.checkSignupQueue(
           undefined,
-          authPassthru(req),
+          ctx.entrywayPassthruHeaders(req),
         ),
       )
     },
diff --git a/packages/pds/src/api/proxy.ts b/packages/pds/src/api/proxy.ts
index 1813eff06fa..238f48cfff3 100644
--- a/packages/pds/src/api/proxy.ts
+++ b/packages/pds/src/api/proxy.ts
@@ -1,4 +1,5 @@
 import { IncomingMessage } from 'node:http'
+import express from 'express'
 import { Headers } from '@atproto/xrpc'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 
@@ -10,21 +11,7 @@ export const resultPassthru = <T>(result: { headers: Headers; data: T }) => {
   }
 }
 
-// Output designed to passed as second arg to AtpAgent methods.
-// The encoding field here is a quirk of the AtpAgent.
-export function authPassthru(
-  req: IncomingMessage,
-  withEncoding?: false,
-): { headers: { authorization: string }; encoding: undefined } | undefined
-
-export function authPassthru(
-  req: IncomingMessage,
-  withEncoding: true,
-):
-  | { headers: { authorization: string }; encoding: 'application/json' }
-  | undefined
-
-export function authPassthru(req: IncomingMessage, withEncoding?: boolean) {
+export function authPassthru(req: IncomingMessage) {
   const { authorization } = req.headers
 
   if (authorization) {
@@ -45,9 +32,22 @@ export function authPassthru(req: IncomingMessage, withEncoding?: boolean) {
       throw new InvalidRequestError('DPoP requests cannot be proxied')
     }
 
-    return {
-      headers: { authorization },
-      encoding: withEncoding ? 'application/json' : undefined,
-    }
+    return { headers: { authorization } }
   }
 }
+
+// @NOTE this function may mutate its params input
+// future improvement here would be to forward along all untrusted ips rather than just the first (req.ip)
+export const forwardedFor = (
+  req: express.Request,
+  params: HeadersParam | undefined,
+) => {
+  const result: HeadersParam = params ?? { headers: {} }
+  const ip = req.ip
+  if (ip) {
+    result.headers['x-forwarded-for'] = ip
+  }
+  return result
+}
+
+type HeadersParam = { headers: Record<string, string> }
diff --git a/packages/pds/src/context.ts b/packages/pds/src/context.ts
index e816bac343a..a8e7150af4d 100644
--- a/packages/pds/src/context.ts
+++ b/packages/pds/src/context.ts
@@ -1,5 +1,6 @@
 import assert from 'node:assert'
 import * as plc from '@did-plc/lib'
+import express from 'express'
 import { Redis } from 'ioredis'
 import * as nodemailer from 'nodemailer'
 import * as undici from 'undici'
@@ -25,6 +26,7 @@ import {
 } from '@atproto-labs/fetch-node'
 import { AccountManager } from './account-manager'
 import { ActorStore } from './actor-store/actor-store'
+import { authPassthru, forwardedFor } from './api/proxy'
 import {
   AuthVerifier,
   createPublicKeyObject,
@@ -398,6 +400,20 @@ export class AppContext {
     return this.serviceAuthHeaders(did, this.bskyAppView.did, lxm)
   }
 
+  async entrywayAuthHeaders(req: express.Request, did: string, lxm: string) {
+    assert(this.cfg.entryway)
+    const headers = await this.serviceAuthHeaders(
+      did,
+      this.cfg.entryway.did,
+      lxm,
+    )
+    return forwardedFor(req, headers)
+  }
+
+  entrywayPassthruHeaders(req: express.Request) {
+    return forwardedFor(req, authPassthru(req))
+  }
+
   async serviceAuthHeaders(did: string, aud: string, lxm: string) {
     const keypair = await this.actorStore.keypair(did)
     return createServiceAuthHeaders({
diff --git a/packages/pds/src/index.ts b/packages/pds/src/index.ts
index d26509b1a9f..3d38e28ab37 100644
--- a/packages/pds/src/index.ts
+++ b/packages/pds/src/index.ts
@@ -122,7 +122,7 @@ export class PDS {
     server = API(server, ctx)
 
     const app = express()
-    app.set('trust proxy', true)
+    app.set('trust proxy', ['loopback', 'linklocal', 'uniquelocal'])
     app.use(loggerMiddleware)
     app.use(compression())
     app.use(authRoutes.createRouter(ctx)) // Before CORS

From d4e14b7bdc7752476757ecfe96343d146411b784 Mon Sep 17 00:00:00 2001
From: Daniel Holmgren <dtholmgren@gmail.com>
Date: Tue, 25 Feb 2025 11:07:49 -0600
Subject: [PATCH 096/101] Move sequenceCommit into actor store transaction
 (#3580)

* serialize sequencing by moving sequenceCommit into actor store transaction

* do not throw on updateRepoRoot failure

* build branch

* changset

* dont build branch
---
 .changeset/good-dryers-poke.md                |  5 +++
 .../src/api/com/atproto/repo/applyWrites.ts   | 32 ++++++++++-----
 .../src/api/com/atproto/repo/createRecord.ts  | 33 ++++++++-------
 .../src/api/com/atproto/repo/deleteRecord.ts  | 40 ++++++++++++-------
 .../pds/src/api/com/atproto/repo/putRecord.ts | 40 +++++++++++--------
 5 files changed, 95 insertions(+), 55 deletions(-)
 create mode 100644 .changeset/good-dryers-poke.md

diff --git a/.changeset/good-dryers-poke.md b/.changeset/good-dryers-poke.md
new file mode 100644
index 00000000000..fa8f45e9cbf
--- /dev/null
+++ b/.changeset/good-dryers-poke.md
@@ -0,0 +1,5 @@
+---
+"@atproto/pds": patch
+---
+
+Fix bug where racing writes to the same repository can get sequenced out-of-order.
diff --git a/packages/pds/src/api/com/atproto/repo/applyWrites.ts b/packages/pds/src/api/com/atproto/repo/applyWrites.ts
index 235254bbde5..7a1bc21038f 100644
--- a/packages/pds/src/api/com/atproto/repo/applyWrites.ts
+++ b/packages/pds/src/api/com/atproto/repo/applyWrites.ts
@@ -12,6 +12,7 @@ import {
   isDelete,
   isUpdate,
 } from '../../../../lexicon/types/com/atproto/repo/applyWrites'
+import { dbLogger } from '../../../../logger'
 import {
   BadCommitSwapError,
   InvalidRecordError,
@@ -119,19 +120,28 @@ export default function (server: Server, ctx: AppContext) {
       const swapCommitCid = swapCommit ? CID.parse(swapCommit) : undefined
 
       const commit = await ctx.actorStore.transact(did, async (actorTxn) => {
-        try {
-          return await actorTxn.repo.processWrites(writes, swapCommitCid)
-        } catch (err) {
-          if (err instanceof BadCommitSwapError) {
-            throw new InvalidRequestError(err.message, 'InvalidSwap')
-          } else {
-            throw err
-          }
-        }
+        const commit = await actorTxn.repo
+          .processWrites(writes, swapCommitCid)
+          .catch((err) => {
+            if (err instanceof BadCommitSwapError) {
+              throw new InvalidRequestError(err.message, 'InvalidSwap')
+            } else {
+              throw err
+            }
+          })
+
+        await ctx.sequencer.sequenceCommit(did, commit)
+        return commit
       })
 
-      await ctx.sequencer.sequenceCommit(did, commit)
-      await ctx.accountManager.updateRepoRoot(did, commit.cid, commit.rev)
+      await ctx.accountManager
+        .updateRepoRoot(did, commit.cid, commit.rev)
+        .catch((err) => {
+          dbLogger.error(
+            { err, did, cid: commit.cid, rev: commit.rev },
+            'failed to update account root',
+          )
+        })
 
       return {
         encoding: 'application/json',
diff --git a/packages/pds/src/api/com/atproto/repo/createRecord.ts b/packages/pds/src/api/com/atproto/repo/createRecord.ts
index 39aaecbf7c9..1f37e87029e 100644
--- a/packages/pds/src/api/com/atproto/repo/createRecord.ts
+++ b/packages/pds/src/api/com/atproto/repo/createRecord.ts
@@ -3,6 +3,7 @@ import { InvalidRecordKeyError } from '@atproto/syntax'
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
+import { dbLogger } from '../../../../logger'
 import {
   BadCommitSwapError,
   InvalidRecordError,
@@ -82,22 +83,26 @@ export default function (server: Server, ctx: AppContext) {
           }),
         )
         const writes = [...backlinkDeletions, write]
-        try {
-          const commit = await actorTxn.repo.processWrites(
-            writes,
-            swapCommitCid,
-          )
-          return commit
-        } catch (err) {
-          if (err instanceof BadCommitSwapError) {
-            throw new InvalidRequestError(err.message, 'InvalidSwap')
-          }
-          throw err
-        }
+        const commit = await actorTxn.repo
+          .processWrites(writes, swapCommitCid)
+          .catch((err) => {
+            if (err instanceof BadCommitSwapError) {
+              throw new InvalidRequestError(err.message, 'InvalidSwap')
+            }
+            throw err
+          })
+        await ctx.sequencer.sequenceCommit(did, commit)
+        return commit
       })
 
-      await ctx.sequencer.sequenceCommit(did, commit)
-      await ctx.accountManager.updateRepoRoot(did, commit.cid, commit.rev)
+      await ctx.accountManager
+        .updateRepoRoot(did, commit.cid, commit.rev)
+        .catch((err) => {
+          dbLogger.error(
+            { err, did, cid: commit.cid, rev: commit.rev },
+            'failed to update account root',
+          )
+        })
 
       return {
         encoding: 'application/json',
diff --git a/packages/pds/src/api/com/atproto/repo/deleteRecord.ts b/packages/pds/src/api/com/atproto/repo/deleteRecord.ts
index 4977668462d..2ed4b0df508 100644
--- a/packages/pds/src/api/com/atproto/repo/deleteRecord.ts
+++ b/packages/pds/src/api/com/atproto/repo/deleteRecord.ts
@@ -2,6 +2,7 @@ import { CID } from 'multiformats/cid'
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
+import { dbLogger } from '../../../../logger'
 import {
   BadCommitSwapError,
   BadRecordSwapError,
@@ -56,24 +57,35 @@ export default function (server: Server, ctx: AppContext) {
         if (!record) {
           return null // No-op if record already doesn't exist
         }
-        try {
-          return await actorTxn.repo.processWrites([write], swapCommitCid)
-        } catch (err) {
-          if (
-            err instanceof BadCommitSwapError ||
-            err instanceof BadRecordSwapError
-          ) {
-            throw new InvalidRequestError(err.message, 'InvalidSwap')
-          } else {
-            throw err
-          }
-        }
+
+        const commit = await actorTxn.repo
+          .processWrites([write], swapCommitCid)
+          .catch((err) => {
+            if (
+              err instanceof BadCommitSwapError ||
+              err instanceof BadRecordSwapError
+            ) {
+              throw new InvalidRequestError(err.message, 'InvalidSwap')
+            } else {
+              throw err
+            }
+          })
+
+        await ctx.sequencer.sequenceCommit(did, commit)
+        return commit
       })
 
       if (commit !== null) {
-        await ctx.sequencer.sequenceCommit(did, commit)
-        await ctx.accountManager.updateRepoRoot(did, commit.cid, commit.rev)
+        await ctx.accountManager
+          .updateRepoRoot(did, commit.cid, commit.rev)
+          .catch((err) => {
+            dbLogger.error(
+              { err, did, cid: commit.cid, rev: commit.rev },
+              'failed to update account root',
+            )
+          })
       }
+
       return {
         encoding: 'application/json',
         body: {
diff --git a/packages/pds/src/api/com/atproto/repo/putRecord.ts b/packages/pds/src/api/com/atproto/repo/putRecord.ts
index 82e3063c31d..79ebbc51ef4 100644
--- a/packages/pds/src/api/com/atproto/repo/putRecord.ts
+++ b/packages/pds/src/api/com/atproto/repo/putRecord.ts
@@ -7,10 +7,10 @@ import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import { ids } from '../../../../lexicon/lexicons'
 import { Record as ProfileRecord } from '../../../../lexicon/types/app/bsky/actor/profile'
+import { dbLogger } from '../../../../logger'
 import {
   BadCommitSwapError,
   BadRecordSwapError,
-  CommitDataWithOps,
   InvalidRecordError,
   PreparedCreate,
   PreparedUpdate,
@@ -104,26 +104,34 @@ export default function (server: Server, ctx: AppContext) {
             }
           }
 
-          let commit: CommitDataWithOps
-          try {
-            commit = await actorTxn.repo.processWrites([write], swapCommitCid)
-          } catch (err) {
-            if (
-              err instanceof BadCommitSwapError ||
-              err instanceof BadRecordSwapError
-            ) {
-              throw new InvalidRequestError(err.message, 'InvalidSwap')
-            } else {
-              throw err
-            }
-          }
+          const commit = await actorTxn.repo
+            .processWrites([write], swapCommitCid)
+            .catch((err) => {
+              if (
+                err instanceof BadCommitSwapError ||
+                err instanceof BadRecordSwapError
+              ) {
+                throw new InvalidRequestError(err.message, 'InvalidSwap')
+              } else {
+                throw err
+              }
+            })
+
+          await ctx.sequencer.sequenceCommit(did, commit)
+
           return { commit, write }
         },
       )
 
       if (commit !== null) {
-        await ctx.sequencer.sequenceCommit(did, commit)
-        await ctx.accountManager.updateRepoRoot(did, commit.cid, commit.rev)
+        await ctx.accountManager
+          .updateRepoRoot(did, commit.cid, commit.rev)
+          .catch((err) => {
+            dbLogger.error(
+              { err, did, cid: commit.cid, rev: commit.rev },
+              'failed to update account root',
+            )
+          })
       }
 
       return {

From 27b0a7be1ed1b6e098114791d84ec9dc844db552 Mon Sep 17 00:00:00 2001
From: bnewbold <bnewbold@robocracy.org>
Date: Tue, 25 Feb 2025 10:32:22 -0800
Subject: [PATCH 097/101] remove deprecated sync fields (#2506)

* lex: remove deprecated sync fields

* codegen field removals

* remove deprecated fields from code

* changeset
---
 .changeset/orange-chairs-act.md                  |  6 ++++++
 lexicons/com/atproto/repo/listRecords.json       |  8 --------
 lexicons/com/atproto/sync/getRecord.json         |  5 -----
 packages/api/src/client/lexicons.ts              | 16 ----------------
 .../client/types/com/atproto/repo/listRecords.ts |  4 ----
 .../client/types/com/atproto/sync/getRecord.ts   |  2 --
 packages/ozone/src/lexicon/lexicons.ts           | 16 ----------------
 .../types/com/atproto/repo/listRecords.ts        |  4 ----
 .../lexicon/types/com/atproto/sync/getRecord.ts  |  2 --
 .../pds/src/api/com/atproto/repo/listRecords.ts  | 12 +-----------
 .../pds/src/api/com/atproto/sync/getRecord.ts    |  4 +---
 packages/pds/src/lexicon/lexicons.ts             | 16 ----------------
 .../types/com/atproto/repo/listRecords.ts        |  4 ----
 .../lexicon/types/com/atproto/sync/getRecord.ts  |  2 --
 14 files changed, 8 insertions(+), 93 deletions(-)
 create mode 100644 .changeset/orange-chairs-act.md

diff --git a/.changeset/orange-chairs-act.md b/.changeset/orange-chairs-act.md
new file mode 100644
index 00000000000..33c7115c6db
--- /dev/null
+++ b/.changeset/orange-chairs-act.md
@@ -0,0 +1,6 @@
+---
+"@atproto/api": patch
+"@atproto/pds": patch
+---
+
+remove some deprecated fields from com.atproto Lexicons
diff --git a/lexicons/com/atproto/repo/listRecords.json b/lexicons/com/atproto/repo/listRecords.json
index bc91c952bb1..3d43ff40b8e 100644
--- a/lexicons/com/atproto/repo/listRecords.json
+++ b/lexicons/com/atproto/repo/listRecords.json
@@ -27,14 +27,6 @@
             "description": "The number of records to return."
           },
           "cursor": { "type": "string" },
-          "rkeyStart": {
-            "type": "string",
-            "description": "DEPRECATED: The lowest sort-ordered rkey to start from (exclusive)"
-          },
-          "rkeyEnd": {
-            "type": "string",
-            "description": "DEPRECATED: The highest sort-ordered rkey to stop at (exclusive)"
-          },
           "reverse": {
             "type": "boolean",
             "description": "Flag to reverse the order of the returned records."
diff --git a/lexicons/com/atproto/sync/getRecord.json b/lexicons/com/atproto/sync/getRecord.json
index cd69e231954..ecfc5acc4da 100644
--- a/lexicons/com/atproto/sync/getRecord.json
+++ b/lexicons/com/atproto/sync/getRecord.json
@@ -19,11 +19,6 @@
             "type": "string",
             "description": "Record Key",
             "format": "record-key"
-          },
-          "commit": {
-            "type": "string",
-            "format": "cid",
-            "description": "DEPRECATED: referenced a repo commit by CID, and retrieved record as of that commit"
           }
         }
       },
diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
index 56c910fe698..31f9cc6bf1c 100644
--- a/packages/api/src/client/lexicons.ts
+++ b/packages/api/src/client/lexicons.ts
@@ -1860,16 +1860,6 @@ export const schemaDict = {
             cursor: {
               type: 'string',
             },
-            rkeyStart: {
-              type: 'string',
-              description:
-                'DEPRECATED: The lowest sort-ordered rkey to start from (exclusive)',
-            },
-            rkeyEnd: {
-              type: 'string',
-              description:
-                'DEPRECATED: The highest sort-ordered rkey to stop at (exclusive)',
-            },
             reverse: {
               type: 'boolean',
               description: 'Flag to reverse the order of the returned records.',
@@ -3410,12 +3400,6 @@ export const schemaDict = {
               description: 'Record Key',
               format: 'record-key',
             },
-            commit: {
-              type: 'string',
-              format: 'cid',
-              description:
-                'DEPRECATED: referenced a repo commit by CID, and retrieved record as of that commit',
-            },
           },
         },
         output: {
diff --git a/packages/api/src/client/types/com/atproto/repo/listRecords.ts b/packages/api/src/client/types/com/atproto/repo/listRecords.ts
index 5efd63c11de..c956420604c 100644
--- a/packages/api/src/client/types/com/atproto/repo/listRecords.ts
+++ b/packages/api/src/client/types/com/atproto/repo/listRecords.ts
@@ -19,10 +19,6 @@ export interface QueryParams {
   /** The number of records to return. */
   limit?: number
   cursor?: string
-  /** DEPRECATED: The lowest sort-ordered rkey to start from (exclusive) */
-  rkeyStart?: string
-  /** DEPRECATED: The highest sort-ordered rkey to stop at (exclusive) */
-  rkeyEnd?: string
   /** Flag to reverse the order of the returned records. */
   reverse?: boolean
 }
diff --git a/packages/api/src/client/types/com/atproto/sync/getRecord.ts b/packages/api/src/client/types/com/atproto/sync/getRecord.ts
index 09d772cf2cc..43e325825ae 100644
--- a/packages/api/src/client/types/com/atproto/sync/getRecord.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getRecord.ts
@@ -17,8 +17,6 @@ export interface QueryParams {
   collection: string
   /** Record Key */
   rkey: string
-  /** DEPRECATED: referenced a repo commit by CID, and retrieved record as of that commit */
-  commit?: string
 }
 
 export type InputSchema = undefined
diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
index 56c910fe698..31f9cc6bf1c 100644
--- a/packages/ozone/src/lexicon/lexicons.ts
+++ b/packages/ozone/src/lexicon/lexicons.ts
@@ -1860,16 +1860,6 @@ export const schemaDict = {
             cursor: {
               type: 'string',
             },
-            rkeyStart: {
-              type: 'string',
-              description:
-                'DEPRECATED: The lowest sort-ordered rkey to start from (exclusive)',
-            },
-            rkeyEnd: {
-              type: 'string',
-              description:
-                'DEPRECATED: The highest sort-ordered rkey to stop at (exclusive)',
-            },
             reverse: {
               type: 'boolean',
               description: 'Flag to reverse the order of the returned records.',
@@ -3410,12 +3400,6 @@ export const schemaDict = {
               description: 'Record Key',
               format: 'record-key',
             },
-            commit: {
-              type: 'string',
-              format: 'cid',
-              description:
-                'DEPRECATED: referenced a repo commit by CID, and retrieved record as of that commit',
-            },
           },
         },
         output: {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/listRecords.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/listRecords.ts
index 573d34d70a8..df001bdb54f 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/listRecords.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/listRecords.ts
@@ -20,10 +20,6 @@ export interface QueryParams {
   /** The number of records to return. */
   limit: number
   cursor?: string
-  /** DEPRECATED: The lowest sort-ordered rkey to start from (exclusive) */
-  rkeyStart?: string
-  /** DEPRECATED: The highest sort-ordered rkey to stop at (exclusive) */
-  rkeyEnd?: string
   /** Flag to reverse the order of the returned records. */
   reverse?: boolean
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getRecord.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getRecord.ts
index 1c7a509b1b4..89051c859fa 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getRecord.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getRecord.ts
@@ -19,8 +19,6 @@ export interface QueryParams {
   collection: string
   /** Record Key */
   rkey: string
-  /** DEPRECATED: referenced a repo commit by CID, and retrieved record as of that commit */
-  commit?: string
 }
 
 export type InputSchema = undefined
diff --git a/packages/pds/src/api/com/atproto/repo/listRecords.ts b/packages/pds/src/api/com/atproto/repo/listRecords.ts
index 673049b8616..7384c8ee72f 100644
--- a/packages/pds/src/api/com/atproto/repo/listRecords.ts
+++ b/packages/pds/src/api/com/atproto/repo/listRecords.ts
@@ -5,15 +5,7 @@ import { Server } from '../../../../lexicon'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.repo.listRecords(async ({ params }) => {
-    const {
-      repo,
-      collection,
-      limit = 50,
-      cursor,
-      rkeyStart,
-      rkeyEnd,
-      reverse = false,
-    } = params
+    const { repo, collection, limit = 50, cursor, reverse = false } = params
 
     const did = await ctx.accountManager.getDidForActor(repo)
     if (!did) {
@@ -26,8 +18,6 @@ export default function (server: Server, ctx: AppContext) {
         limit,
         reverse,
         cursor,
-        rkeyStart,
-        rkeyEnd,
       }),
     )
 
diff --git a/packages/pds/src/api/com/atproto/sync/getRecord.ts b/packages/pds/src/api/com/atproto/sync/getRecord.ts
index 3952ea3ff17..23c9a1ac453 100644
--- a/packages/pds/src/api/com/atproto/sync/getRecord.ts
+++ b/packages/pds/src/api/com/atproto/sync/getRecord.ts
@@ -25,9 +25,7 @@ export default function (server: Server, ctx: AppContext) {
       let carStream: stream.Readable
       try {
         const storage = new SqlRepoReader(actorDb)
-        const commit = params.commit
-          ? CID.parse(params.commit)
-          : await storage.getRoot()
+        const commit = await storage.getRoot()
 
         if (!commit) {
           throw new InvalidRequestError(`Could not find repo for DID: ${did}`)
diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
index 56c910fe698..31f9cc6bf1c 100644
--- a/packages/pds/src/lexicon/lexicons.ts
+++ b/packages/pds/src/lexicon/lexicons.ts
@@ -1860,16 +1860,6 @@ export const schemaDict = {
             cursor: {
               type: 'string',
             },
-            rkeyStart: {
-              type: 'string',
-              description:
-                'DEPRECATED: The lowest sort-ordered rkey to start from (exclusive)',
-            },
-            rkeyEnd: {
-              type: 'string',
-              description:
-                'DEPRECATED: The highest sort-ordered rkey to stop at (exclusive)',
-            },
             reverse: {
               type: 'boolean',
               description: 'Flag to reverse the order of the returned records.',
@@ -3410,12 +3400,6 @@ export const schemaDict = {
               description: 'Record Key',
               format: 'record-key',
             },
-            commit: {
-              type: 'string',
-              format: 'cid',
-              description:
-                'DEPRECATED: referenced a repo commit by CID, and retrieved record as of that commit',
-            },
           },
         },
         output: {
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/listRecords.ts b/packages/pds/src/lexicon/types/com/atproto/repo/listRecords.ts
index 573d34d70a8..df001bdb54f 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/listRecords.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/listRecords.ts
@@ -20,10 +20,6 @@ export interface QueryParams {
   /** The number of records to return. */
   limit: number
   cursor?: string
-  /** DEPRECATED: The lowest sort-ordered rkey to start from (exclusive) */
-  rkeyStart?: string
-  /** DEPRECATED: The highest sort-ordered rkey to stop at (exclusive) */
-  rkeyEnd?: string
   /** Flag to reverse the order of the returned records. */
   reverse?: boolean
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getRecord.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getRecord.ts
index 1c7a509b1b4..89051c859fa 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getRecord.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getRecord.ts
@@ -19,8 +19,6 @@ export interface QueryParams {
   collection: string
   /** Record Key */
   rkey: string
-  /** DEPRECATED: referenced a repo commit by CID, and retrieved record as of that commit */
-  commit?: string
 }
 
 export type InputSchema = undefined

From 11d8d21beac4b79ac44b930197761f9d08dbb492 Mon Sep 17 00:00:00 2001
From: Eric Bailey <git@esb.lol>
Date: Wed, 26 Feb 2025 09:00:57 -0600
Subject: [PATCH 098/101] [APP-1072] Support labeler declaration fields on app
 view responses (#3579)

* Mirror new fields on labelerViewDetailed

(cherry picked from commit 33fdceec26c189995936129355135fdb1480a738)
(cherry picked from commit fe5626639e2d9d03448d8a7e829ad4d8b5e54ec3)

* Mirror new labeler service record properties on labelerViewDetailed lexicons

(cherry picked from commit 6a490f83232c258ac4cc2cd46379048195c4710f)

* Include new labeler service record properties on the labelerViewDetailed reponse from the app view.

(cherry picked from commit 279ed6472d370a61bf669656fda2fddaf2f88621)

* Format

(cherry picked from commit 620346d1e15d130e11fea45cf05d12d246b8e605)

* Fix up bad conflict resolution in test suite

(cherry picked from commit efa04cf592088be0bb8c7c96eb2d45ecbc1a2ea4)

* Import order

(cherry picked from commit 82567caaf53daa09951f71704827ff8d48f1bcc3)
---
 .changeset/lovely-files-cross.md              |  5 ++
 .changeset/six-fireants-hammer.md             |  5 ++
 lexicons/app/bsky/labeler/defs.json           | 21 ++++++++
 packages/api/src/client/lexicons.ts           | 27 ++++++++++
 .../src/client/types/app/bsky/labeler/defs.ts |  7 +++
 packages/bsky/src/lexicon/lexicons.ts         | 27 ++++++++++
 .../lexicon/types/app/bsky/labeler/defs.ts    |  7 +++
 packages/bsky/src/views/index.ts              |  9 ++--
 .../labeler-service.test.ts.snap              | 46 +++++++++++++++++
 .../bsky/tests/views/labeler-service.test.ts  | 51 ++++++++++++++++++-
 packages/ozone/src/lexicon/lexicons.ts        | 27 ++++++++++
 .../lexicon/types/app/bsky/labeler/defs.ts    |  7 +++
 packages/pds/src/lexicon/lexicons.ts          | 27 ++++++++++
 .../lexicon/types/app/bsky/labeler/defs.ts    |  7 +++
 14 files changed, 269 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/lovely-files-cross.md
 create mode 100644 .changeset/six-fireants-hammer.md

diff --git a/.changeset/lovely-files-cross.md b/.changeset/lovely-files-cross.md
new file mode 100644
index 00000000000..ff26c7dc699
--- /dev/null
+++ b/.changeset/lovely-files-cross.md
@@ -0,0 +1,5 @@
+---
+"@atproto/bsky": patch
+---
+
+Include new labeler service record properties on the `labelerViewDetailed` reponse from the app view.
diff --git a/.changeset/six-fireants-hammer.md b/.changeset/six-fireants-hammer.md
new file mode 100644
index 00000000000..bc7f0ca6909
--- /dev/null
+++ b/.changeset/six-fireants-hammer.md
@@ -0,0 +1,5 @@
+---
+"@atproto/api": patch
+---
+
+Mirror new labeler service record properties on `labelerViewDetailed`.
diff --git a/lexicons/app/bsky/labeler/defs.json b/lexicons/app/bsky/labeler/defs.json
index e122ef55f1d..b9ef3608052 100644
--- a/lexicons/app/bsky/labeler/defs.json
+++ b/lexicons/app/bsky/labeler/defs.json
@@ -35,6 +35,27 @@
         "labels": {
           "type": "array",
           "items": { "type": "ref", "ref": "com.atproto.label.defs#label" }
+        },
+        "reasonTypes": {
+          "description": "The set of report reason 'codes' which are in-scope for this service to review and action. These usually align to policy categories. If not defined (distinct from empty array), all reason types are allowed.",
+          "type": "array",
+          "items": {
+            "type": "ref",
+            "ref": "com.atproto.moderation.defs#reasonType"
+          }
+        },
+        "subjectTypes": {
+          "description": "The set of subject types (account, record, etc) this service accepts reports on.",
+          "type": "array",
+          "items": {
+            "type": "ref",
+            "ref": "com.atproto.moderation.defs#subjectType"
+          }
+        },
+        "subjectCollections": {
+          "type": "array",
+          "description": "Set of record types (collection NSIDs) which can be reported to this service. If not defined (distinct from empty array), default is any record type.",
+          "items": { "type": "string", "format": "nsid" }
         }
       }
     },
diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
index 31f9cc6bf1c..23b00b79fb5 100644
--- a/packages/api/src/client/lexicons.ts
+++ b/packages/api/src/client/lexicons.ts
@@ -9044,6 +9044,33 @@ export const schemaDict = {
               ref: 'lex:com.atproto.label.defs#label',
             },
           },
+          reasonTypes: {
+            description:
+              "The set of report reason 'codes' which are in-scope for this service to review and action. These usually align to policy categories. If not defined (distinct from empty array), all reason types are allowed.",
+            type: 'array',
+            items: {
+              type: 'ref',
+              ref: 'lex:com.atproto.moderation.defs#reasonType',
+            },
+          },
+          subjectTypes: {
+            description:
+              'The set of subject types (account, record, etc) this service accepts reports on.',
+            type: 'array',
+            items: {
+              type: 'ref',
+              ref: 'lex:com.atproto.moderation.defs#subjectType',
+            },
+          },
+          subjectCollections: {
+            type: 'array',
+            description:
+              'Set of record types (collection NSIDs) which can be reported to this service. If not defined (distinct from empty array), default is any record type.',
+            items: {
+              type: 'string',
+              format: 'nsid',
+            },
+          },
         },
       },
       labelerViewerState: {
diff --git a/packages/api/src/client/types/app/bsky/labeler/defs.ts b/packages/api/src/client/types/app/bsky/labeler/defs.ts
index 453b010db5e..16ec81a3e90 100644
--- a/packages/api/src/client/types/app/bsky/labeler/defs.ts
+++ b/packages/api/src/client/types/app/bsky/labeler/defs.ts
@@ -7,6 +7,7 @@ import { validate as _validate } from '../../../../lexicons'
 import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import type * as AppBskyActorDefs from '../actor/defs.js'
 import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as ComAtprotoModerationDefs from '../../../com/atproto/moderation/defs.js'
 
 const is$typed = _is$typed,
   validate = _validate
@@ -43,6 +44,12 @@ export interface LabelerViewDetailed {
   viewer?: LabelerViewerState
   indexedAt: string
   labels?: ComAtprotoLabelDefs.Label[]
+  /** The set of report reason 'codes' which are in-scope for this service to review and action. These usually align to policy categories. If not defined (distinct from empty array), all reason types are allowed. */
+  reasonTypes?: ComAtprotoModerationDefs.ReasonType[]
+  /** The set of subject types (account, record, etc) this service accepts reports on. */
+  subjectTypes?: ComAtprotoModerationDefs.SubjectType[]
+  /** Set of record types (collection NSIDs) which can be reported to this service. If not defined (distinct from empty array), default is any record type. */
+  subjectCollections?: string[]
 }
 
 const hashLabelerViewDetailed = 'labelerViewDetailed'
diff --git a/packages/bsky/src/lexicon/lexicons.ts b/packages/bsky/src/lexicon/lexicons.ts
index df6a95efd66..dd2ab9fe455 100644
--- a/packages/bsky/src/lexicon/lexicons.ts
+++ b/packages/bsky/src/lexicon/lexicons.ts
@@ -9060,6 +9060,33 @@ export const schemaDict = {
               ref: 'lex:com.atproto.label.defs#label',
             },
           },
+          reasonTypes: {
+            description:
+              "The set of report reason 'codes' which are in-scope for this service to review and action. These usually align to policy categories. If not defined (distinct from empty array), all reason types are allowed.",
+            type: 'array',
+            items: {
+              type: 'ref',
+              ref: 'lex:com.atproto.moderation.defs#reasonType',
+            },
+          },
+          subjectTypes: {
+            description:
+              'The set of subject types (account, record, etc) this service accepts reports on.',
+            type: 'array',
+            items: {
+              type: 'ref',
+              ref: 'lex:com.atproto.moderation.defs#subjectType',
+            },
+          },
+          subjectCollections: {
+            type: 'array',
+            description:
+              'Set of record types (collection NSIDs) which can be reported to this service. If not defined (distinct from empty array), default is any record type.',
+            items: {
+              type: 'string',
+              format: 'nsid',
+            },
+          },
         },
       },
       labelerViewerState: {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/labeler/defs.ts b/packages/bsky/src/lexicon/types/app/bsky/labeler/defs.ts
index 453b010db5e..16ec81a3e90 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/labeler/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/labeler/defs.ts
@@ -7,6 +7,7 @@ import { validate as _validate } from '../../../../lexicons'
 import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import type * as AppBskyActorDefs from '../actor/defs.js'
 import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as ComAtprotoModerationDefs from '../../../com/atproto/moderation/defs.js'
 
 const is$typed = _is$typed,
   validate = _validate
@@ -43,6 +44,12 @@ export interface LabelerViewDetailed {
   viewer?: LabelerViewerState
   indexedAt: string
   labels?: ComAtprotoLabelDefs.Label[]
+  /** The set of report reason 'codes' which are in-scope for this service to review and action. These usually align to policy categories. If not defined (distinct from empty array), all reason types are allowed. */
+  reasonTypes?: ComAtprotoModerationDefs.ReasonType[]
+  /** The set of subject types (account, record, etc) this service accepts reports on. */
+  subjectTypes?: ComAtprotoModerationDefs.SubjectType[]
+  /** Set of record types (collection NSIDs) which can be reported to this service. If not defined (distinct from empty array), default is any record type. */
+  subjectCollections?: string[]
 }
 
 const hashLabelerViewDetailed = 'labelerViewDetailed'
diff --git a/packages/bsky/src/views/index.ts b/packages/bsky/src/views/index.ts
index 3dd6d17446f..9c884727f78 100644
--- a/packages/bsky/src/views/index.ts
+++ b/packages/bsky/src/views/index.ts
@@ -592,12 +592,15 @@ export class Views {
   ): Un$Typed<LabelerViewDetailed> | undefined {
     const baseView = this.labeler(did, state)
     if (!baseView) return
-    const record = state.labelers?.get(did)
-    if (!record) return
+    const labeler = state.labelers?.get(did)
+    if (!labeler) return
 
     return {
       ...baseView,
-      policies: record.record.policies,
+      policies: labeler.record.policies,
+      reasonTypes: labeler.record.reasonTypes,
+      subjectTypes: labeler.record.subjectTypes,
+      subjectCollections: labeler.record.subjectCollections,
     }
   }
 
diff --git a/packages/bsky/tests/views/__snapshots__/labeler-service.test.ts.snap b/packages/bsky/tests/views/__snapshots__/labeler-service.test.ts.snap
index d5be53c4cbd..c5d40cef02d 100644
--- a/packages/bsky/tests/views/__snapshots__/labeler-service.test.ts.snap
+++ b/packages/bsky/tests/views/__snapshots__/labeler-service.test.ts.snap
@@ -170,3 +170,49 @@ Object {
   ],
 }
 `;
+
+exports[`labeler service views returns additional labeler data 1`] = `
+Object {
+  "views": Array [
+    Object {
+      "$type": "app.bsky.labeler.defs#labelerViewDetailed",
+      "cid": "cids(0)",
+      "creator": Object {
+        "associated": Object {
+          "labeler": true,
+        },
+        "did": "user(0)",
+        "handle": "carol.test",
+        "labels": Array [],
+        "viewer": Object {
+          "blockedBy": false,
+          "following": "record(1)",
+          "muted": false,
+        },
+      },
+      "indexedAt": "1970-01-01T00:00:00.000Z",
+      "labels": Array [],
+      "likeCount": 0,
+      "policies": Object {
+        "labelValues": Array [
+          "spam",
+          "!hide",
+          "scam",
+          "impersonation",
+        ],
+      },
+      "reasonTypes": Array [
+        "com.atproto.moderation.defs#reasonOther",
+      ],
+      "subjectCollections": Array [
+        "app.bsky.feed.post",
+      ],
+      "subjectTypes": Array [
+        "record",
+      ],
+      "uri": "record(0)",
+      "viewer": Object {},
+    },
+  ],
+}
+`;
diff --git a/packages/bsky/tests/views/labeler-service.test.ts b/packages/bsky/tests/views/labeler-service.test.ts
index d3a03be3dc3..b497a2b99ba 100644
--- a/packages/bsky/tests/views/labeler-service.test.ts
+++ b/packages/bsky/tests/views/labeler-service.test.ts
@@ -1,5 +1,9 @@
 import assert from 'node:assert'
-import { AtpAgent } from '@atproto/api'
+import {
+  AppBskyLabelerDefs,
+  AtpAgent,
+  ComAtprotoModerationDefs,
+} from '@atproto/api'
 import { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
 import { isView as isRecordEmbedView } from '../../src/lexicon/types/app/bsky/embed/record'
@@ -14,6 +18,7 @@ describe('labeler service views', () => {
   // account dids, for convenience
   let alice: string
   let bob: string
+  let carol: string
 
   let aliceService: RecordRef
 
@@ -27,6 +32,7 @@ describe('labeler service views', () => {
     await basicSeed(sc)
     alice = sc.dids.alice
     bob = sc.dids.bob
+    carol = sc.dids.carol
 
     const aliceRes = await pdsAgent.api.com.atproto.repo.createRecord(
       {
@@ -190,4 +196,47 @@ describe('labeler service views', () => {
     // Cleanup
     await network.bsky.ctx.dataplane.untakedownActor({ did: alice })
   })
+
+  it(`returns additional labeler data`, async () => {
+    await pdsAgent.api.com.atproto.repo.createRecord(
+      {
+        repo: carol,
+        collection: ids.AppBskyLabelerService,
+        rkey: 'self',
+        record: {
+          policies: {
+            labelValues: ['spam', '!hide', 'scam', 'impersonation'],
+          },
+          createdAt: new Date().toISOString(),
+          reasonTypes: [ComAtprotoModerationDefs.REASONOTHER],
+          subjectTypes: ['record'],
+          subjectCollections: ['app.bsky.feed.post'],
+        },
+      },
+      { headers: sc.getHeaders(carol), encoding: 'application/json' },
+    )
+    await network.processAll()
+
+    const view = await agent.api.app.bsky.labeler.getServices(
+      { dids: [carol], detailed: true },
+      {
+        headers: await network.serviceHeaders(
+          bob,
+          ids.AppBskyLabelerGetServices,
+        ),
+      },
+    )
+
+    const labelerView = view.data.views[0]
+    expect(AppBskyLabelerDefs.isLabelerViewDetailed(labelerView)).toBe(true)
+    // for TS only
+    if (!AppBskyLabelerDefs.isLabelerViewDetailed(labelerView)) return
+    expect(labelerView).toBeTruthy()
+    expect(labelerView.reasonTypes).toEqual([
+      ComAtprotoModerationDefs.REASONOTHER,
+    ])
+    expect(labelerView.subjectTypes).toEqual(['record'])
+    expect(labelerView.subjectCollections).toEqual(['app.bsky.feed.post'])
+    expect(forSnapshot(view.data)).toMatchSnapshot()
+  })
 })
diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
index 31f9cc6bf1c..23b00b79fb5 100644
--- a/packages/ozone/src/lexicon/lexicons.ts
+++ b/packages/ozone/src/lexicon/lexicons.ts
@@ -9044,6 +9044,33 @@ export const schemaDict = {
               ref: 'lex:com.atproto.label.defs#label',
             },
           },
+          reasonTypes: {
+            description:
+              "The set of report reason 'codes' which are in-scope for this service to review and action. These usually align to policy categories. If not defined (distinct from empty array), all reason types are allowed.",
+            type: 'array',
+            items: {
+              type: 'ref',
+              ref: 'lex:com.atproto.moderation.defs#reasonType',
+            },
+          },
+          subjectTypes: {
+            description:
+              'The set of subject types (account, record, etc) this service accepts reports on.',
+            type: 'array',
+            items: {
+              type: 'ref',
+              ref: 'lex:com.atproto.moderation.defs#subjectType',
+            },
+          },
+          subjectCollections: {
+            type: 'array',
+            description:
+              'Set of record types (collection NSIDs) which can be reported to this service. If not defined (distinct from empty array), default is any record type.',
+            items: {
+              type: 'string',
+              format: 'nsid',
+            },
+          },
         },
       },
       labelerViewerState: {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/labeler/defs.ts b/packages/ozone/src/lexicon/types/app/bsky/labeler/defs.ts
index 453b010db5e..16ec81a3e90 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/labeler/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/labeler/defs.ts
@@ -7,6 +7,7 @@ import { validate as _validate } from '../../../../lexicons'
 import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import type * as AppBskyActorDefs from '../actor/defs.js'
 import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as ComAtprotoModerationDefs from '../../../com/atproto/moderation/defs.js'
 
 const is$typed = _is$typed,
   validate = _validate
@@ -43,6 +44,12 @@ export interface LabelerViewDetailed {
   viewer?: LabelerViewerState
   indexedAt: string
   labels?: ComAtprotoLabelDefs.Label[]
+  /** The set of report reason 'codes' which are in-scope for this service to review and action. These usually align to policy categories. If not defined (distinct from empty array), all reason types are allowed. */
+  reasonTypes?: ComAtprotoModerationDefs.ReasonType[]
+  /** The set of subject types (account, record, etc) this service accepts reports on. */
+  subjectTypes?: ComAtprotoModerationDefs.SubjectType[]
+  /** Set of record types (collection NSIDs) which can be reported to this service. If not defined (distinct from empty array), default is any record type. */
+  subjectCollections?: string[]
 }
 
 const hashLabelerViewDetailed = 'labelerViewDetailed'
diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
index 31f9cc6bf1c..23b00b79fb5 100644
--- a/packages/pds/src/lexicon/lexicons.ts
+++ b/packages/pds/src/lexicon/lexicons.ts
@@ -9044,6 +9044,33 @@ export const schemaDict = {
               ref: 'lex:com.atproto.label.defs#label',
             },
           },
+          reasonTypes: {
+            description:
+              "The set of report reason 'codes' which are in-scope for this service to review and action. These usually align to policy categories. If not defined (distinct from empty array), all reason types are allowed.",
+            type: 'array',
+            items: {
+              type: 'ref',
+              ref: 'lex:com.atproto.moderation.defs#reasonType',
+            },
+          },
+          subjectTypes: {
+            description:
+              'The set of subject types (account, record, etc) this service accepts reports on.',
+            type: 'array',
+            items: {
+              type: 'ref',
+              ref: 'lex:com.atproto.moderation.defs#subjectType',
+            },
+          },
+          subjectCollections: {
+            type: 'array',
+            description:
+              'Set of record types (collection NSIDs) which can be reported to this service. If not defined (distinct from empty array), default is any record type.',
+            items: {
+              type: 'string',
+              format: 'nsid',
+            },
+          },
         },
       },
       labelerViewerState: {
diff --git a/packages/pds/src/lexicon/types/app/bsky/labeler/defs.ts b/packages/pds/src/lexicon/types/app/bsky/labeler/defs.ts
index 453b010db5e..16ec81a3e90 100644
--- a/packages/pds/src/lexicon/types/app/bsky/labeler/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/labeler/defs.ts
@@ -7,6 +7,7 @@ import { validate as _validate } from '../../../../lexicons'
 import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
 import type * as AppBskyActorDefs from '../actor/defs.js'
 import type * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs.js'
+import type * as ComAtprotoModerationDefs from '../../../com/atproto/moderation/defs.js'
 
 const is$typed = _is$typed,
   validate = _validate
@@ -43,6 +44,12 @@ export interface LabelerViewDetailed {
   viewer?: LabelerViewerState
   indexedAt: string
   labels?: ComAtprotoLabelDefs.Label[]
+  /** The set of report reason 'codes' which are in-scope for this service to review and action. These usually align to policy categories. If not defined (distinct from empty array), all reason types are allowed. */
+  reasonTypes?: ComAtprotoModerationDefs.ReasonType[]
+  /** The set of subject types (account, record, etc) this service accepts reports on. */
+  subjectTypes?: ComAtprotoModerationDefs.SubjectType[]
+  /** Set of record types (collection NSIDs) which can be reported to this service. If not defined (distinct from empty array), default is any record type. */
+  subjectCollections?: string[]
 }
 
 const hashLabelerViewDetailed = 'labelerViewDetailed'

From e5d72e8d1ce01d515829fecabadd4e1cfb1c72f9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 26 Feb 2025 10:12:09 -0600
Subject: [PATCH 099/101] Version packages (#3584)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/good-dryers-poke.md    |  5 -----
 .changeset/long-garlics-refuse.md |  5 -----
 .changeset/lovely-files-cross.md  |  5 -----
 .changeset/orange-chairs-act.md   |  6 ------
 .changeset/six-fireants-hammer.md |  5 -----
 .changeset/small-chicken-smell.md |  5 -----
 packages/api/CHANGELOG.md         | 10 ++++++++++
 packages/api/package.json         |  2 +-
 packages/bsky/CHANGELOG.md        |  9 +++++++++
 packages/bsky/package.json        |  2 +-
 packages/dev-env/CHANGELOG.md     | 10 ++++++++++
 packages/dev-env/package.json     |  2 +-
 packages/ozone/CHANGELOG.md       |  7 +++++++
 packages/ozone/package.json       |  2 +-
 packages/pds/CHANGELOG.md         | 13 +++++++++++++
 packages/pds/package.json         |  2 +-
 16 files changed, 54 insertions(+), 36 deletions(-)
 delete mode 100644 .changeset/good-dryers-poke.md
 delete mode 100644 .changeset/long-garlics-refuse.md
 delete mode 100644 .changeset/lovely-files-cross.md
 delete mode 100644 .changeset/orange-chairs-act.md
 delete mode 100644 .changeset/six-fireants-hammer.md
 delete mode 100644 .changeset/small-chicken-smell.md

diff --git a/.changeset/good-dryers-poke.md b/.changeset/good-dryers-poke.md
deleted file mode 100644
index fa8f45e9cbf..00000000000
--- a/.changeset/good-dryers-poke.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/pds": patch
----
-
-Fix bug where racing writes to the same repository can get sequenced out-of-order.
diff --git a/.changeset/long-garlics-refuse.md b/.changeset/long-garlics-refuse.md
deleted file mode 100644
index 7060d438e63..00000000000
--- a/.changeset/long-garlics-refuse.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/api": patch
----
-
-Add `reasonTypes`, `subjectTypes`, and `subjectCollections` properties to labeler service records.
diff --git a/.changeset/lovely-files-cross.md b/.changeset/lovely-files-cross.md
deleted file mode 100644
index ff26c7dc699..00000000000
--- a/.changeset/lovely-files-cross.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/bsky": patch
----
-
-Include new labeler service record properties on the `labelerViewDetailed` reponse from the app view.
diff --git a/.changeset/orange-chairs-act.md b/.changeset/orange-chairs-act.md
deleted file mode 100644
index 33c7115c6db..00000000000
--- a/.changeset/orange-chairs-act.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"@atproto/api": patch
-"@atproto/pds": patch
----
-
-remove some deprecated fields from com.atproto Lexicons
diff --git a/.changeset/six-fireants-hammer.md b/.changeset/six-fireants-hammer.md
deleted file mode 100644
index bc7f0ca6909..00000000000
--- a/.changeset/six-fireants-hammer.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/api": patch
----
-
-Mirror new labeler service record properties on `labelerViewDetailed`.
diff --git a/.changeset/small-chicken-smell.md b/.changeset/small-chicken-smell.md
deleted file mode 100644
index 418c8170f1c..00000000000
--- a/.changeset/small-chicken-smell.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@atproto/pds": patch
----
-
-Add x-forwarded-for to PDS-proxied requests to entryway
diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md
index 1f217f82dcb..6e77407b00d 100644
--- a/packages/api/CHANGELOG.md
+++ b/packages/api/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @atproto/api
 
+## 0.14.7
+
+### Patch Changes
+
+- [#3521](https://github.com/bluesky-social/atproto/pull/3521) [`99e2809ca`](https://github.com/bluesky-social/atproto/commit/99e2809ca2ebf70acaa10254f140a8dd0fad4305) Thanks [@bnewbold](https://github.com/bnewbold)! - Add `reasonTypes`, `subjectTypes`, and `subjectCollections` properties to labeler service records.
+
+- [#2506](https://github.com/bluesky-social/atproto/pull/2506) [`27b0a7be1`](https://github.com/bluesky-social/atproto/commit/27b0a7be1ed1b6e098114791d84ec9dc844db552) Thanks [@bnewbold](https://github.com/bnewbold)! - remove some deprecated fields from com.atproto Lexicons
+
+- [#3579](https://github.com/bluesky-social/atproto/pull/3579) [`11d8d21be`](https://github.com/bluesky-social/atproto/commit/11d8d21beac4b79ac44b930197761f9d08dbb492) Thanks [@estrattonbailey](https://github.com/estrattonbailey)! - Mirror new labeler service record properties on `labelerViewDetailed`.
+
 ## 0.14.6
 
 ### Patch Changes
diff --git a/packages/api/package.json b/packages/api/package.json
index e3ff1adfb86..8b97fc50645 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/api",
-  "version": "0.14.6",
+  "version": "0.14.7",
   "license": "MIT",
   "description": "Client library for atproto and Bluesky",
   "keywords": [
diff --git a/packages/bsky/CHANGELOG.md b/packages/bsky/CHANGELOG.md
index ec0926540d1..af43944c091 100644
--- a/packages/bsky/CHANGELOG.md
+++ b/packages/bsky/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @atproto/bsky
 
+## 0.0.124
+
+### Patch Changes
+
+- [#3579](https://github.com/bluesky-social/atproto/pull/3579) [`11d8d21be`](https://github.com/bluesky-social/atproto/commit/11d8d21beac4b79ac44b930197761f9d08dbb492) Thanks [@estrattonbailey](https://github.com/estrattonbailey)! - Include new labeler service record properties on the `labelerViewDetailed` reponse from the app view.
+
+- Updated dependencies [[`99e2809ca`](https://github.com/bluesky-social/atproto/commit/99e2809ca2ebf70acaa10254f140a8dd0fad4305), [`27b0a7be1`](https://github.com/bluesky-social/atproto/commit/27b0a7be1ed1b6e098114791d84ec9dc844db552), [`11d8d21be`](https://github.com/bluesky-social/atproto/commit/11d8d21beac4b79ac44b930197761f9d08dbb492)]:
+  - @atproto/api@0.14.7
+
 ## 0.0.123
 
 ### Patch Changes
diff --git a/packages/bsky/package.json b/packages/bsky/package.json
index 30408df9928..b9653cc612f 100644
--- a/packages/bsky/package.json
+++ b/packages/bsky/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.123",
+  "version": "0.0.124",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
diff --git a/packages/dev-env/CHANGELOG.md b/packages/dev-env/CHANGELOG.md
index 114ec3d4f43..f50ca104365 100644
--- a/packages/dev-env/CHANGELOG.md
+++ b/packages/dev-env/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @atproto/dev-env
 
+## 0.3.97
+
+### Patch Changes
+
+- Updated dependencies [[`d4e14b7bd`](https://github.com/bluesky-social/atproto/commit/d4e14b7bdc7752476757ecfe96343d146411b784), [`99e2809ca`](https://github.com/bluesky-social/atproto/commit/99e2809ca2ebf70acaa10254f140a8dd0fad4305), [`11d8d21be`](https://github.com/bluesky-social/atproto/commit/11d8d21beac4b79ac44b930197761f9d08dbb492), [`27b0a7be1`](https://github.com/bluesky-social/atproto/commit/27b0a7be1ed1b6e098114791d84ec9dc844db552), [`11d8d21be`](https://github.com/bluesky-social/atproto/commit/11d8d21beac4b79ac44b930197761f9d08dbb492), [`5cce76670`](https://github.com/bluesky-social/atproto/commit/5cce7667058981561340107e0124093203e796e3)]:
+  - @atproto/pds@0.4.104
+  - @atproto/api@0.14.7
+  - @atproto/bsky@0.0.124
+  - @atproto/ozone@0.1.86
+
 ## 0.3.96
 
 ### Patch Changes
diff --git a/packages/dev-env/package.json b/packages/dev-env/package.json
index 377d5d2fbd7..435a3fc8408 100644
--- a/packages/dev-env/package.json
+++ b/packages/dev-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/dev-env",
-  "version": "0.3.96",
+  "version": "0.3.97",
   "license": "MIT",
   "description": "Local development environment helper for atproto development",
   "keywords": [
diff --git a/packages/ozone/CHANGELOG.md b/packages/ozone/CHANGELOG.md
index 567c8c02824..87376c7b447 100644
--- a/packages/ozone/CHANGELOG.md
+++ b/packages/ozone/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @atproto/ozone
 
+## 0.1.86
+
+### Patch Changes
+
+- Updated dependencies [[`99e2809ca`](https://github.com/bluesky-social/atproto/commit/99e2809ca2ebf70acaa10254f140a8dd0fad4305), [`27b0a7be1`](https://github.com/bluesky-social/atproto/commit/27b0a7be1ed1b6e098114791d84ec9dc844db552), [`11d8d21be`](https://github.com/bluesky-social/atproto/commit/11d8d21beac4b79ac44b930197761f9d08dbb492)]:
+  - @atproto/api@0.14.7
+
 ## 0.1.85
 
 ### Patch Changes
diff --git a/packages/ozone/package.json b/packages/ozone/package.json
index a8d83a1deec..ec72162106a 100644
--- a/packages/ozone/package.json
+++ b/packages/ozone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.1.85",
+  "version": "0.1.86",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
diff --git a/packages/pds/CHANGELOG.md b/packages/pds/CHANGELOG.md
index ceaf64c522e..c88ebe78c6c 100644
--- a/packages/pds/CHANGELOG.md
+++ b/packages/pds/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @atproto/pds
 
+## 0.4.104
+
+### Patch Changes
+
+- [#3580](https://github.com/bluesky-social/atproto/pull/3580) [`d4e14b7bd`](https://github.com/bluesky-social/atproto/commit/d4e14b7bdc7752476757ecfe96343d146411b784) Thanks [@dholms](https://github.com/dholms)! - Fix bug where racing writes to the same repository can get sequenced out-of-order.
+
+- [#2506](https://github.com/bluesky-social/atproto/pull/2506) [`27b0a7be1`](https://github.com/bluesky-social/atproto/commit/27b0a7be1ed1b6e098114791d84ec9dc844db552) Thanks [@bnewbold](https://github.com/bnewbold)! - remove some deprecated fields from com.atproto Lexicons
+
+- [#3553](https://github.com/bluesky-social/atproto/pull/3553) [`5cce76670`](https://github.com/bluesky-social/atproto/commit/5cce7667058981561340107e0124093203e796e3) Thanks [@devinivy](https://github.com/devinivy)! - Add x-forwarded-for to PDS-proxied requests to entryway
+
+- Updated dependencies [[`99e2809ca`](https://github.com/bluesky-social/atproto/commit/99e2809ca2ebf70acaa10254f140a8dd0fad4305), [`27b0a7be1`](https://github.com/bluesky-social/atproto/commit/27b0a7be1ed1b6e098114791d84ec9dc844db552), [`11d8d21be`](https://github.com/bluesky-social/atproto/commit/11d8d21beac4b79ac44b930197761f9d08dbb492)]:
+  - @atproto/api@0.14.7
+
 ## 0.4.103
 
 ### Patch Changes
diff --git a/packages/pds/package.json b/packages/pds/package.json
index 434342644ba..f601c292dc1 100644
--- a/packages/pds/package.json
+++ b/packages/pds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/pds",
-  "version": "0.4.103",
+  "version": "0.4.104",
   "license": "MIT",
   "description": "Reference implementation of atproto Personal Data Server (PDS)",
   "keywords": [

From 48b0a6f7b9f717fadb16b5dade92ae9bdc19eda6 Mon Sep 17 00:00:00 2001
From: devin ivy <devinivy@gmail.com>
Date: Wed, 26 Feb 2025 11:20:07 -0500
Subject: [PATCH 100/101] Appview: etcd-backed dataplane host list (#3586)

* appview: setup etcd-based dataplane host list

* appview: remove old file

* appview: tidy etcd host list functionality and add tests

* appview: add config and lifecycle for etcd-based dataplane host list

* tidy

* tidy

* appview: tidy config and dataplane client types

* build
---
 .../workflows/build-and-push-bsky-ghcr.yaml   |   1 +
 packages/bsky/package.json                    |   1 +
 packages/bsky/src/config.ts                   |  49 ++-
 packages/bsky/src/context.ts                  |  13 +-
 packages/bsky/src/data-plane/client.ts        | 154 ---------
 packages/bsky/src/data-plane/client/hosts.ts  | 103 ++++++
 packages/bsky/src/data-plane/client/index.ts  | 123 +++++++
 packages/bsky/src/data-plane/client/util.ts   |  66 ++++
 packages/bsky/src/etcd.ts                     |  90 ++++++
 packages/bsky/src/index.ts                    |  28 +-
 packages/bsky/src/logger.ts                   |   2 +
 packages/bsky/tests/etcd.test.ts              | 301 ++++++++++++++++++
 packages/dev-env/src/bsky.ts                  |   1 +
 pnpm-lock.yaml                                |  52 ++-
 14 files changed, 805 insertions(+), 179 deletions(-)
 delete mode 100644 packages/bsky/src/data-plane/client.ts
 create mode 100644 packages/bsky/src/data-plane/client/hosts.ts
 create mode 100644 packages/bsky/src/data-plane/client/index.ts
 create mode 100644 packages/bsky/src/data-plane/client/util.ts
 create mode 100644 packages/bsky/src/etcd.ts
 create mode 100644 packages/bsky/tests/etcd.test.ts

diff --git a/.github/workflows/build-and-push-bsky-ghcr.yaml b/.github/workflows/build-and-push-bsky-ghcr.yaml
index facdd3a8d24..709759757a7 100644
--- a/.github/workflows/build-and-push-bsky-ghcr.yaml
+++ b/.github/workflows/build-and-push-bsky-ghcr.yaml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - divy/etcd-dp-host-list
 env:
   REGISTRY: ghcr.io
   USERNAME: ${{ github.actor }}
diff --git a/packages/bsky/package.json b/packages/bsky/package.json
index b9653cc612f..3d2ed1269c2 100644
--- a/packages/bsky/package.json
+++ b/packages/bsky/package.json
@@ -50,6 +50,7 @@
     "@types/http-errors": "^2.0.1",
     "compression": "^1.7.4",
     "cors": "^2.8.5",
+    "etcd3": "^1.1.2",
     "express": "^4.17.2",
     "http-errors": "^2.0.0",
     "http-terminator": "^3.2.0",
diff --git a/packages/bsky/src/config.ts b/packages/bsky/src/config.ts
index 944166e8f72..a94dde58bc3 100644
--- a/packages/bsky/src/config.ts
+++ b/packages/bsky/src/config.ts
@@ -10,7 +10,9 @@ export interface ServerConfigValues {
   alternateAudienceDids: string[]
   entrywayJwtPublicKeyHex?: string
   // external services
+  etcdHosts: string[]
   dataplaneUrls: string[]
+  dataplaneUrlsEtcdKeyPrefix?: string
   dataplaneHttpVersion?: '1.1' | '2'
   dataplaneIgnoreBadTls?: boolean
   bsyncUrl: string
@@ -74,15 +76,15 @@ export class ServerConfig {
     const envPort = parseInt(process.env.BSKY_PORT || '', 10)
     const port = isNaN(envPort) ? 2584 : envPort
     const didPlcUrl = process.env.BSKY_DID_PLC_URL || 'http://localhost:2582'
-    const alternateAudienceDids = process.env.BSKY_ALT_AUDIENCE_DIDS
-      ? process.env.BSKY_ALT_AUDIENCE_DIDS.split(',')
-      : []
+    const alternateAudienceDids = envList(process.env.BSKY_ALT_AUDIENCE_DIDS)
     const entrywayJwtPublicKeyHex =
       process.env.BSKY_ENTRYWAY_JWT_PUBLIC_KEY_HEX || undefined
-    const handleResolveNameservers = process.env.BSKY_HANDLE_RESOLVE_NAMESERVERS
-      ? process.env.BSKY_HANDLE_RESOLVE_NAMESERVERS.split(',')
-      : []
+    const handleResolveNameservers = envList(
+      process.env.BSKY_HANDLE_RESOLVE_NAMESERVERS,
+    )
     const cdnUrl = process.env.BSKY_CDN_URL || process.env.BSKY_IMG_URI_ENDPOINT
+    const etcdHosts =
+      overrides?.etcdHosts ?? envList(process.env.BSKY_ETCD_HOSTS)
     // e.g. https://video.invalid/watch/%s/%s/playlist.m3u8
     const videoPlaylistUrlPattern = process.env.BSKY_VIDEO_PLAYLIST_URL_PATTERN
     // e.g. https://video.invalid/watch/%s/%s/thumbnail.jpg
@@ -97,16 +99,25 @@ export class ServerConfig {
     const suggestionsApiKey = process.env.BSKY_SUGGESTIONS_API_KEY || undefined
     const topicsUrl = process.env.BSKY_TOPICS_URL || undefined
     const topicsApiKey = process.env.BSKY_TOPICS_API_KEY
-    let dataplaneUrls = overrides?.dataplaneUrls
-    dataplaneUrls ??= process.env.BSKY_DATAPLANE_URLS
-      ? process.env.BSKY_DATAPLANE_URLS.split(',')
-      : []
+    const dataplaneUrls =
+      overrides?.dataplaneUrls ?? envList(process.env.BSKY_DATAPLANE_URLS)
+    const dataplaneUrlsEtcdKeyPrefix =
+      process.env.BSKY_DATAPLANE_URLS_ETCD_KEY_PREFIX || undefined
     const dataplaneHttpVersion = process.env.BSKY_DATAPLANE_HTTP_VERSION || '2'
     const dataplaneIgnoreBadTls =
       process.env.BSKY_DATAPLANE_IGNORE_BAD_TLS === 'true'
-    const labelsFromIssuerDids = process.env.BSKY_LABELS_FROM_ISSUER_DIDS
-      ? process.env.BSKY_LABELS_FROM_ISSUER_DIDS.split(',')
-      : []
+    assert(
+      !dataplaneUrlsEtcdKeyPrefix || etcdHosts.length,
+      'etcd prefix for dataplane urls may only be configured when there are etcd hosts',
+    )
+    assert(
+      dataplaneUrls.length || dataplaneUrlsEtcdKeyPrefix,
+      'dataplane urls are not configured directly nor with etcd',
+    )
+    assert(dataplaneHttpVersion === '1.1' || dataplaneHttpVersion === '2')
+    const labelsFromIssuerDids = envList(
+      process.env.BSKY_LABELS_FROM_ISSUER_DIDS,
+    )
     const bsyncUrl = process.env.BSKY_BSYNC_URL || undefined
     assert(bsyncUrl)
     const bsyncApiKey = process.env.BSKY_BSYNC_API_KEY || undefined
@@ -133,8 +144,6 @@ export class ServerConfig {
     )
     const modServiceDid = process.env.MOD_SERVICE_DID
     assert(modServiceDid)
-    assert(dataplaneUrls.length)
-    assert(dataplaneHttpVersion === '1.1' || dataplaneHttpVersion === '2')
     const statsigKey =
       process.env.NODE_ENV === 'test'
         ? 'secret-key'
@@ -185,7 +194,9 @@ export class ServerConfig {
       serverDid,
       alternateAudienceDids,
       entrywayJwtPublicKeyHex,
+      etcdHosts,
       dataplaneUrls,
+      dataplaneUrlsEtcdKeyPrefix,
       dataplaneHttpVersion,
       dataplaneIgnoreBadTls,
       searchUrl,
@@ -267,6 +278,14 @@ export class ServerConfig {
     return this.cfg.entrywayJwtPublicKeyHex
   }
 
+  get etcdHosts() {
+    return this.cfg.etcdHosts
+  }
+
+  get dataplaneUrlsEtcdKeyPrefix() {
+    return this.cfg.dataplaneUrlsEtcdKeyPrefix
+  }
+
   get dataplaneUrls() {
     return this.cfg.dataplaneUrls
   }
diff --git a/packages/bsky/src/context.ts b/packages/bsky/src/context.ts
index 55c66599947..453a8da53e8 100644
--- a/packages/bsky/src/context.ts
+++ b/packages/bsky/src/context.ts
@@ -1,4 +1,5 @@
 import * as plc from '@did-plc/lib'
+import { Etcd3 } from 'etcd3'
 import express from 'express'
 import { Dispatcher } from 'undici'
 import { AtpAgent } from '@atproto/api'
@@ -8,7 +9,7 @@ import { AuthVerifier } from './auth-verifier'
 import { BsyncClient } from './bsync'
 import { ServerConfig } from './config'
 import { CourierClient } from './courier'
-import { DataPlaneClient } from './data-plane/client'
+import { DataPlaneClient, HostList } from './data-plane/client'
 import { FeatureGates } from './feature-gates'
 import { Hydrator } from './hydration/hydrator'
 import { httpLogger as log } from './logger'
@@ -23,7 +24,9 @@ export class AppContext {
   constructor(
     private opts: {
       cfg: ServerConfig
+      etcd: Etcd3 | undefined
       dataplane: DataPlaneClient
+      dataplaneHostList: HostList
       searchAgent: AtpAgent | undefined
       suggestionsAgent: AtpAgent | undefined
       topicsAgent: AtpAgent | undefined
@@ -43,10 +46,18 @@ export class AppContext {
     return this.opts.cfg
   }
 
+  get etcd() {
+    return this.opts.etcd
+  }
+
   get dataplane(): DataPlaneClient {
     return this.opts.dataplane
   }
 
+  get dataplaneHostList(): HostList {
+    return this.opts.dataplaneHostList
+  }
+
   get searchAgent(): AtpAgent | undefined {
     return this.opts.searchAgent
   }
diff --git a/packages/bsky/src/data-plane/client.ts b/packages/bsky/src/data-plane/client.ts
deleted file mode 100644
index 0b12db4c670..00000000000
--- a/packages/bsky/src/data-plane/client.ts
+++ /dev/null
@@ -1,154 +0,0 @@
-import assert from 'node:assert'
-import { randomInt } from 'node:crypto'
-import {
-  Code,
-  ConnectError,
-  PromiseClient,
-  createPromiseClient,
-  makeAnyClient,
-} from '@connectrpc/connect'
-import { createGrpcTransport } from '@connectrpc/connect-node'
-import * as ui8 from 'uint8arrays'
-import { getDidKeyFromMultibase } from '@atproto/identity'
-import { Service } from '../proto/bsky_connect'
-
-export type DataPlaneClient = PromiseClient<typeof Service>
-type BaseClient = { lib: DataPlaneClient; url: URL }
-type HttpVersion = '1.1' | '2'
-const MAX_RETRIES = 3
-
-export const createDataPlaneClient = (
-  baseUrls: string[],
-  opts: { httpVersion?: HttpVersion; rejectUnauthorized?: boolean },
-) => {
-  const clients = baseUrls.map((baseUrl) => createBaseClient(baseUrl, opts))
-  assert(clients.length > 0, 'no clients available')
-  return makeAnyClient(Service, (method) => {
-    return async (...args) => {
-      let tries = 0
-      let error: unknown
-      let remainingClients = clients
-      while (tries < MAX_RETRIES) {
-        const client = randomElement(remainingClients)
-        assert(client, 'no clients available')
-        try {
-          return await client.lib[method.localName](...args)
-        } catch (err) {
-          if (
-            err instanceof ConnectError &&
-            (err.code === Code.Unavailable || err.code === Code.Aborted)
-          ) {
-            tries++
-            error = err
-            remainingClients = getRemainingClients(remainingClients, client)
-          } else {
-            throw err
-          }
-        }
-      }
-      assert(error)
-      throw error
-    }
-  }) as DataPlaneClient
-}
-
-export { Code }
-
-export const isDataplaneError = (
-  err: unknown,
-  code?: Code,
-): err is ConnectError => {
-  if (err instanceof ConnectError) {
-    return !code || err.code === code
-  }
-  return false
-}
-
-const createBaseClient = (
-  baseUrl: string,
-  opts: { httpVersion?: HttpVersion; rejectUnauthorized?: boolean },
-): BaseClient => {
-  const { httpVersion = '2', rejectUnauthorized = true } = opts
-  const transport = createGrpcTransport({
-    baseUrl,
-    httpVersion,
-    acceptCompression: [],
-    nodeOptions: { rejectUnauthorized },
-  })
-  return {
-    lib: createPromiseClient(Service, transport),
-    url: new URL(baseUrl),
-  }
-}
-
-const getRemainingClients = (clients: BaseClient[], lastClient: BaseClient) => {
-  if (clients.length < 2) return clients // no clients to choose from
-  if (lastClient.url.port) {
-    // if the last client had a port, we attempt to exclude its whole host.
-    const maybeRemaining = clients.filter(
-      (c) => c.url.hostname !== lastClient.url.hostname,
-    )
-    if (maybeRemaining.length) {
-      return maybeRemaining
-    }
-  }
-  return clients.filter((c) => c !== lastClient)
-}
-
-const randomElement = <T>(arr: T[]): T | undefined => {
-  if (arr.length === 0) return
-  return arr[randomInt(arr.length)]
-}
-
-export const unpackIdentityServices = (servicesBytes: Uint8Array) => {
-  const servicesStr = ui8.toString(servicesBytes, 'utf8')
-  if (!servicesStr) return {}
-  return JSON.parse(servicesStr) as UnpackedServices
-}
-
-export const unpackIdentityKeys = (keysBytes: Uint8Array) => {
-  const keysStr = ui8.toString(keysBytes, 'utf8')
-  if (!keysStr) return {}
-  return JSON.parse(keysStr) as UnpackedKeys
-}
-
-export const getServiceEndpoint = (
-  services: UnpackedServices,
-  opts: { id: string; type: string },
-) => {
-  const endpoint =
-    services[opts.id] &&
-    services[opts.id].Type === opts.type &&
-    validateUrl(services[opts.id].URL)
-  return endpoint || undefined
-}
-
-export const getKeyAsDidKey = (keys: UnpackedKeys, opts: { id: string }) => {
-  const key =
-    keys[opts.id] &&
-    getDidKeyFromMultibase({
-      type: keys[opts.id].Type,
-      publicKeyMultibase: keys[opts.id].PublicKeyMultibase,
-    })
-  return key || undefined
-}
-
-type UnpackedServices = Record<string, { Type: string; URL: string }>
-
-type UnpackedKeys = Record<string, { Type: string; PublicKeyMultibase: string }>
-
-const validateUrl = (urlStr: string): string | undefined => {
-  let url
-  try {
-    url = new URL(urlStr)
-  } catch {
-    return undefined
-  }
-  if (!['http:', 'https:'].includes(url.protocol)) {
-    return undefined
-  } else if (!url.hostname) {
-    return undefined
-  } else {
-    return urlStr
-  }
-}
diff --git a/packages/bsky/src/data-plane/client/hosts.ts b/packages/bsky/src/data-plane/client/hosts.ts
new file mode 100644
index 00000000000..065df51e1f6
--- /dev/null
+++ b/packages/bsky/src/data-plane/client/hosts.ts
@@ -0,0 +1,103 @@
+import { Etcd3 } from 'etcd3'
+import { EtcdMap } from '../../etcd'
+import { dataplaneLogger as logger } from '../../logger'
+
+/**
+ * Interface for a reactive list of hosts, i.e. for use with the dataplane client.
+ */
+export interface HostList {
+  get: () => Iterable<string>
+  onUpdate(handler: HostListHandler): void
+}
+
+type HostListHandler = (hosts: Iterable<string>) => void
+
+/**
+ * Maintains a reactive HostList based on a simple setter.
+ */
+export class BasicHostList implements HostList {
+  private hosts: Iterable<string>
+  private handlers: HostListHandler[] = []
+
+  constructor(hosts: Iterable<string>) {
+    this.hosts = hosts
+  }
+
+  get() {
+    return this.hosts
+  }
+
+  set(hosts: Iterable<string>) {
+    this.hosts = hosts
+    this.update()
+  }
+
+  private update() {
+    for (const handler of this.handlers) {
+      handler(this.hosts)
+    }
+  }
+
+  onUpdate(handler: HostListHandler) {
+    this.handlers.push(handler)
+  }
+}
+
+/**
+ * Maintains a reactive HostList based on etcd key values under a given key prefix.
+ * When fallback is provided, ensures that this fallback is used whenever no hosts are available.
+ */
+export class EtcdHostList implements HostList {
+  private kv: EtcdMap
+  private inner = new BasicHostList(new Set())
+  private fallback: Set<string>
+
+  constructor(etcd: Etcd3, prefix: string, fallback?: string[]) {
+    this.fallback = new Set(fallback)
+    this.kv = new EtcdMap(etcd, prefix)
+    this.update() // init fallback if necessary
+    this.kv.watcher.on('connected', (res) => {
+      logger.warn(
+        { watcherId: this.kv.watcher.id, header: res.header },
+        'EtcdHostList connected',
+      )
+    })
+    this.kv.watcher.on('disconnected', (err) => {
+      logger.warn(
+        { watcherId: this.kv.watcher.id, err },
+        'EtcdHostList disconnected',
+      )
+    })
+    this.kv.watcher.on('error', (err) => {
+      logger.error({ watcherId: this.kv.watcher.id, err }, 'EtcdHostList error')
+    })
+  }
+
+  async connect() {
+    await this.kv.connect()
+    this.update()
+    this.kv.onUpdate(() => this.update())
+  }
+
+  get() {
+    return this.inner.get()
+  }
+
+  private update() {
+    const hosts = new Set<string>()
+    for (const host of this.kv.values()) {
+      if (URL.canParse(host)) {
+        hosts.add(host)
+      }
+    }
+    if (hosts.size) {
+      this.inner.set(hosts)
+    } else if (this.fallback.size) {
+      this.inner.set(this.fallback)
+    }
+  }
+
+  onUpdate(handler: HostListHandler) {
+    this.inner.onUpdate(handler)
+  }
+}
diff --git a/packages/bsky/src/data-plane/client/index.ts b/packages/bsky/src/data-plane/client/index.ts
new file mode 100644
index 00000000000..a3adea18aea
--- /dev/null
+++ b/packages/bsky/src/data-plane/client/index.ts
@@ -0,0 +1,123 @@
+import assert from 'node:assert'
+import { randomInt } from 'node:crypto'
+import {
+  Code,
+  ConnectError,
+  PromiseClient,
+  createPromiseClient,
+  makeAnyClient,
+} from '@connectrpc/connect'
+import { createGrpcTransport } from '@connectrpc/connect-node'
+import { Service } from '../../proto/bsky_connect'
+import { HostList } from './hosts'
+
+export * from './hosts'
+export * from './util'
+
+export type DataPlaneClient = PromiseClient<typeof Service>
+type HttpVersion = '1.1' | '2'
+const MAX_RETRIES = 3
+
+export const createDataPlaneClient = (
+  hostList: HostList,
+  opts: { httpVersion?: HttpVersion; rejectUnauthorized?: boolean },
+) => {
+  const clients = new DataPlaneClients(hostList, opts)
+  return makeAnyClient(Service, (method) => {
+    return async (...args) => {
+      let tries = 0
+      let error: unknown
+      let remainingClients = clients.get()
+      while (tries < MAX_RETRIES) {
+        const client = randomElement(remainingClients)
+        assert(client, 'no clients available')
+        try {
+          return await client[method.localName](...args)
+        } catch (err) {
+          if (
+            err instanceof ConnectError &&
+            (err.code === Code.Unavailable || err.code === Code.Aborted)
+          ) {
+            tries++
+            error = err
+            remainingClients = getRemainingClients(remainingClients, client)
+          } else {
+            throw err
+          }
+        }
+      }
+      assert(error)
+      throw error
+    }
+  }) as DataPlaneClient
+}
+
+export { Code }
+
+/**
+ * Uses a reactive HostList in order to maintain a pool of DataPlaneClients.
+ * Each DataPlaneClient is cached per host so that it maintains connections
+ * and other internal state when the underlying HostList is updated.
+ */
+class DataPlaneClients {
+  private clients: DataPlaneClient[] = []
+  private clientsByHost = new Map<string, DataPlaneClient>()
+
+  constructor(
+    private hostList: HostList,
+    private clientOpts: {
+      httpVersion?: HttpVersion
+      rejectUnauthorized?: boolean
+    },
+  ) {
+    this.refresh()
+    this.hostList.onUpdate(() => this.refresh())
+  }
+
+  get(): readonly DataPlaneClient[] {
+    return this.clients
+  }
+
+  private refresh() {
+    this.clients = []
+    for (const host of this.hostList.get()) {
+      let client = this.clientsByHost.get(host)
+      if (!client) {
+        client = this.createClient(host)
+        this.clientsByHost.set(host, client)
+      }
+      this.clients.push(client)
+    }
+  }
+
+  private createClient(host: string) {
+    return createBaseClient(host, this.clientOpts)
+  }
+}
+
+const createBaseClient = (
+  baseUrl: string,
+  opts: { httpVersion?: HttpVersion; rejectUnauthorized?: boolean },
+): DataPlaneClient => {
+  const { httpVersion = '2', rejectUnauthorized = true } = opts
+  const transport = createGrpcTransport({
+    baseUrl,
+    httpVersion,
+    acceptCompression: [],
+    nodeOptions: { rejectUnauthorized },
+  })
+  return createPromiseClient(Service, transport)
+}
+
+const getRemainingClients = (
+  clients: readonly DataPlaneClient[],
+  lastClient: DataPlaneClient,
+) => {
+  if (clients.length < 2) return clients // no clients to choose from
+  return clients.filter((c) => c !== lastClient)
+}
+
+const randomElement = <T>(arr: readonly T[]): T | undefined => {
+  if (arr.length === 0) return
+  return arr[randomInt(arr.length)]
+}
diff --git a/packages/bsky/src/data-plane/client/util.ts b/packages/bsky/src/data-plane/client/util.ts
new file mode 100644
index 00000000000..e8bf33312fc
--- /dev/null
+++ b/packages/bsky/src/data-plane/client/util.ts
@@ -0,0 +1,66 @@
+import { Code, ConnectError } from '@connectrpc/connect'
+import * as ui8 from 'uint8arrays'
+import { getDidKeyFromMultibase } from '@atproto/identity'
+
+export const isDataplaneError = (
+  err: unknown,
+  code?: Code,
+): err is ConnectError => {
+  if (err instanceof ConnectError) {
+    return !code || err.code === code
+  }
+  return false
+}
+
+export const unpackIdentityServices = (servicesBytes: Uint8Array) => {
+  const servicesStr = ui8.toString(servicesBytes, 'utf8')
+  if (!servicesStr) return {}
+  return JSON.parse(servicesStr) as UnpackedServices
+}
+
+export const unpackIdentityKeys = (keysBytes: Uint8Array) => {
+  const keysStr = ui8.toString(keysBytes, 'utf8')
+  if (!keysStr) return {}
+  return JSON.parse(keysStr) as UnpackedKeys
+}
+
+export const getServiceEndpoint = (
+  services: UnpackedServices,
+  opts: { id: string; type: string },
+) => {
+  const endpoint =
+    services[opts.id] &&
+    services[opts.id].Type === opts.type &&
+    validateUrl(services[opts.id].URL)
+  return endpoint || undefined
+}
+
+export const getKeyAsDidKey = (keys: UnpackedKeys, opts: { id: string }) => {
+  const key =
+    keys[opts.id] &&
+    getDidKeyFromMultibase({
+      type: keys[opts.id].Type,
+      publicKeyMultibase: keys[opts.id].PublicKeyMultibase,
+    })
+  return key || undefined
+}
+
+type UnpackedServices = Record<string, { Type: string; URL: string }>
+
+type UnpackedKeys = Record<string, { Type: string; PublicKeyMultibase: string }>
+
+const validateUrl = (urlStr: string): string | undefined => {
+  let url
+  try {
+    url = new URL(urlStr)
+  } catch {
+    return undefined
+  }
+  if (!['http:', 'https:'].includes(url.protocol)) {
+    return undefined
+  } else if (!url.hostname) {
+    return undefined
+  } else {
+    return urlStr
+  }
+}
diff --git a/packages/bsky/src/etcd.ts b/packages/bsky/src/etcd.ts
new file mode 100644
index 00000000000..3a5f093167d
--- /dev/null
+++ b/packages/bsky/src/etcd.ts
@@ -0,0 +1,90 @@
+import { once } from 'node:events'
+import { Etcd3, Watcher } from 'etcd3'
+
+/**
+ * A reactive map based on the keys and values stored within etcd under a given prefix.
+ */
+export class EtcdMap {
+  inner = new Map<string, VersionedValue>()
+  watcher: Watcher
+  connecting: Promise<void> | undefined
+  handlers: ((self: EtcdMap) => void)[] = []
+
+  constructor(
+    private etcd: Etcd3,
+    private prefix = '',
+  ) {
+    this.watcher = etcd.watch().prefix(prefix).watcher()
+    this.connecting = connectWatcher(this.watcher)
+  }
+
+  async connect() {
+    this.watcher.on('put', (kv) => {
+      const key = kv.key.toString()
+      const value = kv.value.toString()
+      const rev = revToInt(kv.mod_revision)
+      this.apply(key, { value, rev })
+    })
+    this.watcher.on('delete', (kv) => {
+      const key = kv.key.toString()
+      const value = null
+      const rev = revToInt(kv.mod_revision)
+      this.apply(key, { value, rev })
+    })
+    await this.connecting?.finally(() => {
+      this.connecting = undefined
+    })
+    const { kvs } = await this.etcd.getAll().prefix(this.prefix).exec()
+    for (const kv of kvs) {
+      const key = kv.key.toString()
+      const value = kv.value.toString()
+      const rev = revToInt(kv.mod_revision)
+      this.apply(key, { value, rev })
+    }
+  }
+
+  get(key: string) {
+    return this.inner.get(key)?.value ?? null
+  }
+
+  *values() {
+    for (const { value } of this.inner.values()) {
+      if (value !== null) {
+        yield value
+      }
+    }
+  }
+
+  onUpdate(handler: (self: EtcdMap) => void) {
+    this.handlers.push(handler)
+  }
+
+  private update() {
+    for (const handler of this.handlers) {
+      handler(this)
+    }
+  }
+
+  private apply(key, vv: VersionedValue) {
+    const curr = this.inner.get(key)
+    if (curr && curr.rev > vv.rev) return
+    this.inner.set(key, vv)
+    this.update()
+  }
+}
+
+function revToInt(rev: string) {
+  return parseInt(rev, 10)
+}
+
+async function connectWatcher(watcher: Watcher) {
+  await Promise.race([
+    once(watcher, 'connected'),
+    once(watcher, 'error').then((err) => Promise.reject(err)),
+  ])
+}
+
+type VersionedValue = {
+  rev: number
+  value: string | null
+}
diff --git a/packages/bsky/src/index.ts b/packages/bsky/src/index.ts
index 68462f9c39d..def083288da 100644
--- a/packages/bsky/src/index.ts
+++ b/packages/bsky/src/index.ts
@@ -3,6 +3,7 @@ import http from 'node:http'
 import { AddressInfo } from 'node:net'
 import compression from 'compression'
 import cors from 'cors'
+import { Etcd3 } from 'etcd3'
 import express from 'express'
 import { HttpTerminator, createHttpTerminator } from 'http-terminator'
 import { AtpAgent } from '@atproto/api'
@@ -16,7 +17,11 @@ import { authWithApiKey as bsyncAuth, createBsyncClient } from './bsync'
 import { ServerConfig } from './config'
 import { AppContext } from './context'
 import { authWithApiKey as courierAuth, createCourierClient } from './courier'
-import { createDataPlaneClient } from './data-plane/client'
+import {
+  BasicHostList,
+  EtcdHostList,
+  createDataPlaneClient,
+} from './data-plane/client'
 import * as error from './error'
 import { FeatureGates } from './feature-gates'
 import { Hydrator } from './hydration/hydrator'
@@ -98,7 +103,20 @@ export class BskyAppView {
       )
     }
 
-    const dataplane = createDataPlaneClient(config.dataplaneUrls, {
+    const etcd = config.etcdHosts.length
+      ? new Etcd3({ hosts: config.etcdHosts })
+      : undefined
+
+    const dataplaneHostList =
+      etcd && config.dataplaneUrlsEtcdKeyPrefix
+        ? new EtcdHostList(
+            etcd,
+            config.dataplaneUrlsEtcdKeyPrefix,
+            config.dataplaneUrls,
+          )
+        : new BasicHostList(config.dataplaneUrls)
+
+    const dataplane = createDataPlaneClient(dataplaneHostList, {
       httpVersion: config.dataplaneHttpVersion,
       rejectUnauthorized: !config.dataplaneIgnoreBadTls,
     })
@@ -147,7 +165,9 @@ export class BskyAppView {
 
     const ctx = new AppContext({
       cfg: config,
+      etcd,
       dataplane,
+      dataplaneHostList,
       searchAgent,
       suggestionsAgent,
       topicsAgent,
@@ -184,6 +204,9 @@ export class BskyAppView {
   }
 
   async start(): Promise<http.Server> {
+    if (this.ctx.dataplaneHostList instanceof EtcdHostList) {
+      await this.ctx.dataplaneHostList.connect()
+    }
     await this.ctx.featureGates.start()
     const server = this.app.listen(this.ctx.cfg.port)
     this.server = server
@@ -198,6 +221,7 @@ export class BskyAppView {
   async destroy(): Promise<void> {
     await this.terminator?.terminate()
     this.ctx.featureGates.destroy()
+    await this.ctx.etcd?.close()
   }
 }
 
diff --git a/packages/bsky/src/logger.ts b/packages/bsky/src/logger.ts
index 81530b2f648..11362405b09 100644
--- a/packages/bsky/src/logger.ts
+++ b/packages/bsky/src/logger.ts
@@ -15,6 +15,8 @@ export const hydrationLogger: ReturnType<typeof subsystemLogger> =
   subsystemLogger('bsky:hydration')
 export const featureGatesLogger: ReturnType<typeof subsystemLogger> =
   subsystemLogger('bsky:featuregates')
+export const dataplaneLogger: ReturnType<typeof subsystemLogger> =
+  subsystemLogger('bsky:dp')
 export const httpLogger: ReturnType<typeof subsystemLogger> =
   subsystemLogger('bsky')
 
diff --git a/packages/bsky/tests/etcd.test.ts b/packages/bsky/tests/etcd.test.ts
new file mode 100644
index 00000000000..1288c83aca5
--- /dev/null
+++ b/packages/bsky/tests/etcd.test.ts
@@ -0,0 +1,301 @@
+import EventEmitter from 'node:events'
+import { Etcd3, IKeyValue } from 'etcd3'
+import { EtcdHostList } from '../src'
+import { EtcdMap } from '../src/etcd'
+
+describe('etcd', () => {
+  describe('EtcdMap', () => {
+    it('initializes values based on current keys', async () => {
+      const etcd = new MockEtcd()
+      etcd.watcher.set('service/a', { value: '1' })
+      etcd.watcher.set('service/b', { value: '2' })
+      etcd.watcher.set('service/c', { value: '3' })
+      const map = new EtcdMap(etcd as unknown as Etcd3)
+      await map.connect()
+      expect(map.get('service/a')).toBe('1')
+      expect(map.get('service/b')).toBe('2')
+      expect(map.get('service/c')).toBe('3')
+      expect([...map.values()]).toEqual(['1', '2', '3'])
+    })
+
+    it('maintains key updates', async () => {
+      const etcd = new MockEtcd()
+      etcd.watcher.set('service/a', { value: '1' })
+      etcd.watcher.set('service/b', { value: '2' })
+      etcd.watcher.set('service/c', { value: '3' })
+      const map = new EtcdMap(etcd as unknown as Etcd3)
+      await map.connect()
+      etcd.watcher.set('service/b', { value: '4' })
+      expect(map.get('service/a')).toBe('1')
+      expect(map.get('service/b')).toBe('4')
+      expect(map.get('service/c')).toBe('3')
+      expect([...map.values()]).toEqual(['1', '4', '3'])
+    })
+
+    it('maintains key creates', async () => {
+      const etcd = new MockEtcd()
+      etcd.watcher.set('service/a', { value: '1' })
+      const map = new EtcdMap(etcd as unknown as Etcd3)
+      await map.connect()
+      etcd.watcher.set('service/b', { value: '2' })
+      expect(map.get('service/a')).toBe('1')
+      expect(map.get('service/b')).toBe('2')
+      expect([...map.values()]).toEqual(['1', '2'])
+    })
+
+    it('maintains key deletions', async () => {
+      const etcd = new MockEtcd()
+      etcd.watcher.set('service/a', { value: '1' })
+      etcd.watcher.set('service/b', { value: '2' })
+      const map = new EtcdMap(etcd as unknown as Etcd3)
+      await map.connect()
+      etcd.watcher.del('service/b')
+      expect(map.get('service/a')).toBe('1')
+      expect(map.get('service/b')).toBe(null)
+      expect([...map.values()]).toEqual(['1'])
+    })
+
+    it('notifies of updates', async () => {
+      const etcd = new MockEtcd()
+      etcd.watcher.set('service/a', { value: '1' })
+      etcd.watcher.set('service/b', { value: '2' })
+      const map = new EtcdMap(etcd as unknown as Etcd3)
+      await map.connect()
+      const states: string[][] = [[...map.values()]]
+      map.onUpdate((update) => {
+        states.push([...update.values()])
+      })
+      etcd.watcher.set('service/c', { value: '3' })
+      etcd.watcher.del('service/b')
+      etcd.watcher.set('service/a', { value: '4' })
+      expect(states).toEqual([
+        ['1', '2'],
+        ['1', '2', '3'],
+        ['1', '3'],
+        ['4', '3'],
+      ])
+    })
+
+    it('ignores out-of-order updates', async () => {
+      const etcd = new MockEtcd()
+      etcd.watcher.set('service/a', { value: '1' })
+      const map = new EtcdMap(etcd as unknown as Etcd3)
+      await map.connect()
+      const states: string[][] = [[...map.values()]]
+      map.onUpdate((update) => {
+        states.push([...update.values()])
+      })
+      etcd.watcher.set('service/a', { value: '2' })
+      etcd.watcher.set('service/a', { value: '3', overrideRev: 1 }) // old rev
+      etcd.watcher.set('service/a', { value: '4' })
+      expect(map.get('service/a')).toBe('4')
+      expect(states).toEqual([['1'], ['2'], ['4']]) // never witnessed 3
+    })
+  })
+
+  describe('EtcdHostList', () => {
+    it('initializes values based on current keys', async () => {
+      const etcd = new MockEtcd()
+      etcd.watcher.set('service/a', { value: 'http://192.168.1.1' })
+      etcd.watcher.set('service/b', { value: 'http://192.168.1.2' })
+      etcd.watcher.set('service/c', { value: 'http://192.168.1.3' })
+      const hostList = new EtcdHostList(etcd as unknown as Etcd3, '')
+      await hostList.connect()
+      expect([...hostList.get()]).toEqual([
+        'http://192.168.1.1',
+        'http://192.168.1.2',
+        'http://192.168.1.3',
+      ])
+    })
+
+    it('maintains key updates', async () => {
+      const etcd = new MockEtcd()
+      etcd.watcher.set('service/a', { value: 'http://192.168.1.1' })
+      etcd.watcher.set('service/b', { value: 'http://192.168.1.2' })
+      etcd.watcher.set('service/c', { value: 'http://192.168.1.3' })
+      const hostList = new EtcdHostList(etcd as unknown as Etcd3, '')
+      await hostList.connect()
+      etcd.watcher.set('service/b', { value: 'http://192.168.1.4' })
+      expect([...hostList.get()]).toEqual([
+        'http://192.168.1.1',
+        'http://192.168.1.4',
+        'http://192.168.1.3',
+      ])
+    })
+
+    it('maintains key creates', async () => {
+      const etcd = new MockEtcd()
+      etcd.watcher.set('service/a', { value: 'http://192.168.1.1' })
+      const hostList = new EtcdHostList(etcd as unknown as Etcd3, '')
+      await hostList.connect()
+      etcd.watcher.set('service/b', { value: 'http://192.168.1.2' })
+      expect([...hostList.get()]).toEqual([
+        'http://192.168.1.1',
+        'http://192.168.1.2',
+      ])
+    })
+
+    it('maintains key deletions', async () => {
+      const etcd = new MockEtcd()
+      etcd.watcher.set('service/a', { value: 'http://192.168.1.1' })
+      etcd.watcher.set('service/b', { value: 'http://192.168.1.2' })
+      const hostList = new EtcdHostList(etcd as unknown as Etcd3, '')
+      await hostList.connect()
+      etcd.watcher.del('service/b')
+      expect([...hostList.get()]).toEqual(['http://192.168.1.1'])
+    })
+
+    it('notifies of updates', async () => {
+      const etcd = new MockEtcd()
+      etcd.watcher.set('service/a', { value: 'http://192.168.1.1' })
+      etcd.watcher.set('service/b', { value: 'http://192.168.1.2' })
+      const hostList = new EtcdHostList(etcd as unknown as Etcd3, '')
+      await hostList.connect()
+      const states: string[][] = [[...hostList.get()]]
+      hostList.onUpdate((updated) => {
+        expect([...updated]).toEqual([...hostList.get()])
+        states.push([...updated])
+      })
+      etcd.watcher.set('service/c', { value: 'http://192.168.1.3' })
+      etcd.watcher.del('service/b')
+      etcd.watcher.set('service/a', { value: 'http://192.168.1.4' })
+      expect(states).toEqual([
+        ['http://192.168.1.1', 'http://192.168.1.2'],
+        ['http://192.168.1.1', 'http://192.168.1.2', 'http://192.168.1.3'],
+        ['http://192.168.1.1', 'http://192.168.1.3'],
+        ['http://192.168.1.4', 'http://192.168.1.3'],
+      ])
+    })
+
+    it('ignores bad host values', async () => {
+      const etcd = new MockEtcd()
+      etcd.watcher.set('service/a', { value: 'not-a-host' })
+      etcd.watcher.set('service/b', { value: 'http://192.168.1.2' })
+      const hostList = new EtcdHostList(etcd as unknown as Etcd3, '')
+      await hostList.connect()
+      expect([...hostList.get()]).toEqual(['http://192.168.1.2'])
+      etcd.watcher.set('service/a', { value: 'http://192.168.1.1' })
+      etcd.watcher.set('service/c', { value: 'not-a-host' })
+      expect([...hostList.get()]).toEqual([
+        'http://192.168.1.1',
+        'http://192.168.1.2',
+      ])
+      etcd.watcher.set('service/c', { value: 'http://192.168.1.3' })
+      expect([...hostList.get()]).toEqual([
+        'http://192.168.1.1',
+        'http://192.168.1.2',
+        'http://192.168.1.3',
+      ])
+    })
+
+    it('falls back to static host list when uninitialized or no keys available', async () => {
+      const etcd = new MockEtcd()
+      const hostList = new EtcdHostList(etcd as unknown as Etcd3, '', [
+        'http://10.0.0.1',
+        'http://10.0.0.2',
+      ])
+      etcd.watcher.set('service/a', { value: 'http://192.168.1.1' })
+      expect([...hostList.get()]).toEqual([
+        'http://10.0.0.1',
+        'http://10.0.0.2',
+      ])
+      await hostList.connect()
+      const states: string[][] = [[...hostList.get()]]
+      hostList.onUpdate((updated) => {
+        states.push([...updated])
+      })
+      etcd.watcher.del('service/a')
+      etcd.watcher.set('service/b', { value: 'http://192.168.1.2' })
+      expect(states).toEqual([
+        ['http://192.168.1.1'],
+        ['http://10.0.0.1', 'http://10.0.0.2'],
+        ['http://192.168.1.2'],
+      ])
+    })
+  })
+})
+
+class MockEtcd {
+  public watcher = new MockWatcher()
+  watch() {
+    const watcher = this.watcher
+    return {
+      prefix() {
+        return {
+          watcher() {
+            return watcher
+          },
+        }
+      },
+    }
+  }
+  getAll() {
+    const watcher = this.watcher
+    return {
+      prefix() {
+        return {
+          async exec(): Promise<{ kvs: IKeyValue[] }> {
+            return { kvs: watcher.getAll() }
+          },
+        }
+      },
+    }
+  }
+}
+
+class MockWatcher extends EventEmitter {
+  rev = 1
+  kvs: IKeyValue[] = []
+  constructor() {
+    super()
+    process.nextTick(() => this.emit('connected', {}))
+  }
+  get(key: string): IKeyValue | null {
+    const found = this.kvs.find((kv) => kv.key.toString() === key)
+    return found ?? null
+  }
+  getAll(): IKeyValue[] {
+    return [...this.kvs]
+  }
+  set(
+    key: string,
+    { value, overrideRev }: { value: string; overrideRev?: number },
+  ) {
+    const found = this.kvs.find((kv) => kv.key.toString() === key)
+    const rev = overrideRev ?? ++this.rev
+    if (found) {
+      found.value = Buffer.from(value)
+      found.mod_revision = rev.toString()
+      found.version = (parseInt(found.version, 10) + 1).toString()
+      this.emit('put', found)
+    } else {
+      const created = {
+        key: Buffer.from(key),
+        value: Buffer.from(value),
+        create_revision: rev.toString(),
+        mod_revision: rev.toString(),
+        version: '1',
+        lease: '0',
+      }
+      this.kvs.push(created)
+      this.emit('put', created)
+    }
+  }
+  del(key: string) {
+    const foundIdx = this.kvs.findIndex((kv) => kv.key.toString() === key)
+    if (foundIdx === -1) return
+    const [deleted] = this.kvs.splice(foundIdx, 1)
+    const rev = ++this.rev
+    deleted.value = Buffer.from('')
+    deleted.mod_revision = rev.toString()
+    deleted.create_revision = '0'
+    deleted.version = '0'
+    this.emit('delete', deleted)
+  }
+  on(evt: 'connected', listener: (res: unknown) => void): any
+  on(evt: 'put', listener: (kv: IKeyValue) => void): any
+  on(evt: 'delete', listener: (kv: IKeyValue) => void): any
+  on(evt: string, listener: (...args: any[]) => void) {
+    super.on(evt, listener)
+  }
+}
diff --git a/packages/dev-env/src/bsky.ts b/packages/dev-env/src/bsky.ts
index 416ad88ec6c..8be18e4cdf6 100644
--- a/packages/dev-env/src/bsky.ts
+++ b/packages/dev-env/src/bsky.ts
@@ -82,6 +82,7 @@ export class TestBsky {
       disableSsrfProtection: true,
       ...cfg,
       adminPasswords: [ADMIN_PASSWORD],
+      etcdHosts: [],
     })
 
     // Separate migration db in case migration changes some connection state that we need in the tests, e.g. "alter database ... set ..."
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1566e8cf639..287e527df21 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -217,6 +217,9 @@ importers:
       cors:
         specifier: ^2.8.5
         version: 2.8.5
+      etcd3:
+        specifier: ^1.1.2
+        version: 1.1.2
       express:
         specifier: ^4.17.2
         version: 4.18.2
@@ -5017,6 +5020,25 @@ packages:
     resolution: {integrity: sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==}
     dev: true
 
+  /@grpc/grpc-js@1.12.5:
+    resolution: {integrity: sha512-d3iiHxdpg5+ZcJ6jnDSOT8Z0O0VMVGy34jAnYLUX8yd36b1qn8f1TwOA/Lc7TsOh03IkPJ38eGI5qD2EjNkoEA==}
+    engines: {node: '>=12.10.0'}
+    dependencies:
+      '@grpc/proto-loader': 0.7.13
+      '@js-sdsl/ordered-map': 4.4.2
+    dev: false
+
+  /@grpc/proto-loader@0.7.13:
+    resolution: {integrity: sha512-AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw==}
+    engines: {node: '>=6'}
+    hasBin: true
+    dependencies:
+      lodash.camelcase: 4.3.0
+      long: 5.2.3
+      protobufjs: 7.2.5
+      yargs: 17.7.2
+    dev: false
+
   /@hapi/accept@6.0.3:
     resolution: {integrity: sha512-p72f9k56EuF0n3MwlBNThyVE5PXX40g+aQh+C/xbKrfzahM2Oispv3AXmOIU51t3j77zay1qrX7IIziZXspMlw==}
     dependencies:
@@ -5592,6 +5614,10 @@ packages:
       '@jridgewell/sourcemap-codec': 1.4.15
     dev: true
 
+  /@js-sdsl/ordered-map@4.4.2:
+    resolution: {integrity: sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==}
+    dev: false
+
   /@manypkg/find-root@1.1.0:
     resolution: {integrity: sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==}
     dependencies:
@@ -7210,6 +7236,10 @@ packages:
     resolution: {integrity: sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==}
     engines: {node: '>=0.6'}
 
+  /bignumber.js@9.1.2:
+    resolution: {integrity: sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==}
+    dev: false
+
   /binary-extensions@2.3.0:
     resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==}
     engines: {node: '>=8'}
@@ -7572,7 +7602,6 @@ packages:
       string-width: 4.2.3
       strip-ansi: 6.0.1
       wrap-ansi: 7.0.0
-    dev: true
 
   /clone@1.0.4:
     resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==}
@@ -7588,6 +7617,11 @@ packages:
     engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'}
     dev: true
 
+  /cockatiel@3.2.1:
+    resolution: {integrity: sha512-gfrHV6ZPkquExvMh9IOkKsBzNDk6sDuZ6DdBGUBkvFnTCqCxzpuq48RySgP0AnaqQkw2zynOFj9yly6T1Q2G5Q==}
+    engines: {node: '>=16'}
+    dev: false
+
   /code-block-writer@11.0.3:
     resolution: {integrity: sha512-NiujjUFB4SwScJq2bwbYUtXbZhBSlY6vYzm++3Q6oC+U+injTqfPYFK8wS9COOmb2lueqp0ZRB4nK1VYeHgNyw==}
     dev: false
@@ -8746,7 +8780,6 @@ packages:
   /escalade@3.1.2:
     resolution: {integrity: sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==}
     engines: {node: '>=6'}
-    dev: true
 
   /escape-html@1.0.3:
     resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==}
@@ -9062,6 +9095,16 @@ packages:
     resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==}
     engines: {node: '>= 0.6'}
 
+  /etcd3@1.1.2:
+    resolution: {integrity: sha512-YIampCz1/OmrVo/tR3QltAVUtYCQQOSFoqmHKKeoHbalm+WdXe3l4rhLIylklu8EzR/I3PBiOF4dC847dDskKg==}
+    engines: {node: '>=16'}
+    dependencies:
+      '@grpc/grpc-js': 1.12.5
+      '@grpc/proto-loader': 0.7.13
+      bignumber.js: 9.1.2
+      cockatiel: 3.2.1
+    dev: false
+
   /event-lite@0.1.3:
     resolution: {integrity: sha512-8qz9nOz5VeD2z96elrEKD2U433+L3DWdUdDkOINLGOJvx1GsMBbMn0aCeu28y8/e85A6mCigBiFlYMnTBEGlSw==}
     dev: false
@@ -11101,7 +11144,6 @@ packages:
 
   /lodash.camelcase@4.3.0:
     resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
-    dev: true
 
   /lodash.defaults@4.2.0:
     resolution: {integrity: sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==}
@@ -12991,7 +13033,6 @@ packages:
   /require-directory@2.1.1:
     resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
     engines: {node: '>=0.10.0'}
-    dev: true
 
   /require-from-string@2.0.2:
     resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
@@ -14690,7 +14731,6 @@ packages:
   /y18n@5.0.8:
     resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
     engines: {node: '>=10'}
-    dev: true
 
   /yallist@2.1.2:
     resolution: {integrity: sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==}
@@ -14725,7 +14765,6 @@ packages:
   /yargs-parser@21.1.1:
     resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
     engines: {node: '>=12'}
-    dev: true
 
   /yargs@15.4.1:
     resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==}
@@ -14755,7 +14794,6 @@ packages:
       string-width: 4.2.3
       y18n: 5.0.8
       yargs-parser: 21.1.1
-    dev: true
 
   /yauzl@2.10.0:
     resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==}

From dc6e4ecb0e09bbf4bc7a79c6ac43fb6da4166200 Mon Sep 17 00:00:00 2001
From: bnewbold <bnewbold@robocracy.org>
Date: Wed, 26 Feb 2025 14:36:58 -0800
Subject: [PATCH 101/101] lex: add more identity helpers (#2264)

* lex: add more identity helpers

* lex: update identity helpers

* make fmt

* fix typo in 'id'

* add errors; add resolveDid; more descriptions

* lint

* fix 'identifier' field names

* identity: rename def; DID deactivation as error, not flag; require handle+doc

* update again, to 'identityInfo'

* codegen

* changeset
---
 .changeset/stale-waves-protect.md             |   5 +
 lexicons/com/atproto/identity/defs.json       |  22 +++
 .../com/atproto/identity/refreshIdentity.json |  44 +++++
 lexicons/com/atproto/identity/resolveDid.json |  44 +++++
 .../com/atproto/identity/resolveHandle.json   |  10 +-
 .../com/atproto/identity/resolveIdentity.json |  42 ++++
 packages/api/src/client/index.ts              |  52 ++++-
 packages/api/src/client/lexicons.ts           | 181 +++++++++++++++++-
 .../client/types/com/atproto/identity/defs.ts |  30 +++
 .../com/atproto/identity/refreshIdentity.ts   |  62 ++++++
 .../types/com/atproto/identity/resolveDid.ts  |  56 ++++++
 .../com/atproto/identity/resolveHandle.ts     |  10 +
 .../com/atproto/identity/resolveIdentity.ts   |  60 ++++++
 packages/bsky/src/lexicon/index.ts            |  36 ++++
 packages/bsky/src/lexicon/lexicons.ts         | 181 +++++++++++++++++-
 .../types/com/atproto/identity/defs.ts        |  30 +++
 .../com/atproto/identity/refreshIdentity.ts   |  52 +++++
 .../types/com/atproto/identity/resolveDid.ts  |  52 +++++
 .../com/atproto/identity/resolveHandle.ts     |   1 +
 .../com/atproto/identity/resolveIdentity.ts   |  48 +++++
 packages/ozone/src/lexicon/index.ts           |  36 ++++
 packages/ozone/src/lexicon/lexicons.ts        | 181 +++++++++++++++++-
 .../types/com/atproto/identity/defs.ts        |  30 +++
 .../com/atproto/identity/refreshIdentity.ts   |  52 +++++
 .../types/com/atproto/identity/resolveDid.ts  |  52 +++++
 .../com/atproto/identity/resolveHandle.ts     |   1 +
 .../com/atproto/identity/resolveIdentity.ts   |  48 +++++
 packages/pds/src/lexicon/index.ts             |  36 ++++
 packages/pds/src/lexicon/lexicons.ts          | 181 +++++++++++++++++-
 .../types/com/atproto/identity/defs.ts        |  30 +++
 .../com/atproto/identity/refreshIdentity.ts   |  52 +++++
 .../types/com/atproto/identity/resolveDid.ts  |  52 +++++
 .../com/atproto/identity/resolveHandle.ts     |   1 +
 .../com/atproto/identity/resolveIdentity.ts   |  48 +++++
 34 files changed, 1806 insertions(+), 12 deletions(-)
 create mode 100644 .changeset/stale-waves-protect.md
 create mode 100644 lexicons/com/atproto/identity/defs.json
 create mode 100644 lexicons/com/atproto/identity/refreshIdentity.json
 create mode 100644 lexicons/com/atproto/identity/resolveDid.json
 create mode 100644 lexicons/com/atproto/identity/resolveIdentity.json
 create mode 100644 packages/api/src/client/types/com/atproto/identity/defs.ts
 create mode 100644 packages/api/src/client/types/com/atproto/identity/refreshIdentity.ts
 create mode 100644 packages/api/src/client/types/com/atproto/identity/resolveDid.ts
 create mode 100644 packages/api/src/client/types/com/atproto/identity/resolveIdentity.ts
 create mode 100644 packages/bsky/src/lexicon/types/com/atproto/identity/defs.ts
 create mode 100644 packages/bsky/src/lexicon/types/com/atproto/identity/refreshIdentity.ts
 create mode 100644 packages/bsky/src/lexicon/types/com/atproto/identity/resolveDid.ts
 create mode 100644 packages/bsky/src/lexicon/types/com/atproto/identity/resolveIdentity.ts
 create mode 100644 packages/ozone/src/lexicon/types/com/atproto/identity/defs.ts
 create mode 100644 packages/ozone/src/lexicon/types/com/atproto/identity/refreshIdentity.ts
 create mode 100644 packages/ozone/src/lexicon/types/com/atproto/identity/resolveDid.ts
 create mode 100644 packages/ozone/src/lexicon/types/com/atproto/identity/resolveIdentity.ts
 create mode 100644 packages/pds/src/lexicon/types/com/atproto/identity/defs.ts
 create mode 100644 packages/pds/src/lexicon/types/com/atproto/identity/refreshIdentity.ts
 create mode 100644 packages/pds/src/lexicon/types/com/atproto/identity/resolveDid.ts
 create mode 100644 packages/pds/src/lexicon/types/com/atproto/identity/resolveIdentity.ts

diff --git a/.changeset/stale-waves-protect.md b/.changeset/stale-waves-protect.md
new file mode 100644
index 00000000000..f118b29413a
--- /dev/null
+++ b/.changeset/stale-waves-protect.md
@@ -0,0 +1,5 @@
+---
+"@atproto/api": patch
+---
+
+new com.atproto.identity endpoints: resolveDid, resolveIdentity, refreshIdentity
diff --git a/lexicons/com/atproto/identity/defs.json b/lexicons/com/atproto/identity/defs.json
new file mode 100644
index 00000000000..9449cdd9a1c
--- /dev/null
+++ b/lexicons/com/atproto/identity/defs.json
@@ -0,0 +1,22 @@
+{
+  "lexicon": 1,
+  "id": "com.atproto.identity.defs",
+  "defs": {
+    "identityInfo": {
+      "type": "object",
+      "required": ["did", "handle", "didDoc"],
+      "properties": {
+        "did": { "type": "string", "format": "did" },
+        "handle": {
+          "type": "string",
+          "format": "handle",
+          "description": "The validated handle of the account; or 'handle.invalid' if the handle did not bi-directionally match the DID document."
+        },
+        "didDoc": {
+          "type": "unknown",
+          "description": "The complete DID document for the identity."
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/com/atproto/identity/refreshIdentity.json b/lexicons/com/atproto/identity/refreshIdentity.json
new file mode 100644
index 00000000000..4c56084b9e7
--- /dev/null
+++ b/lexicons/com/atproto/identity/refreshIdentity.json
@@ -0,0 +1,44 @@
+{
+  "lexicon": 1,
+  "id": "com.atproto.identity.refreshIdentity",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "description": "Request that the server re-resolve an identity (DID and handle). The server may ignore this request, or require authentication, depending on the role, implementation, and policy of the server.",
+      "input": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["identifier"],
+          "properties": {
+            "identifier": {
+              "type": "string",
+              "format": "at-identifier"
+            }
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "ref",
+          "ref": "com.atproto.identity.defs#identityInfo"
+        }
+      },
+      "errors": [
+        {
+          "name": "HandleNotFound",
+          "description": "The resolution process confirmed that the handle does not resolve to any DID."
+        },
+        {
+          "name": "DidNotFound",
+          "description": "The DID resolution process confirmed that there is no current DID."
+        },
+        {
+          "name": "DidDeactivated",
+          "description": "The DID previously existed, but has been deactivated."
+        }
+      ]
+    }
+  }
+}
diff --git a/lexicons/com/atproto/identity/resolveDid.json b/lexicons/com/atproto/identity/resolveDid.json
new file mode 100644
index 00000000000..24c129a3335
--- /dev/null
+++ b/lexicons/com/atproto/identity/resolveDid.json
@@ -0,0 +1,44 @@
+{
+  "lexicon": 1,
+  "id": "com.atproto.identity.resolveDid",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Resolves DID to DID document. Does not bi-directionally verify handle.",
+      "parameters": {
+        "type": "params",
+        "required": ["did"],
+        "properties": {
+          "did": {
+            "type": "string",
+            "format": "did",
+            "description": "DID to resolve."
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["didDoc"],
+          "properties": {
+            "didDoc": {
+              "type": "unknown",
+              "description": "The complete DID document for the identity."
+            }
+          }
+        }
+      },
+      "errors": [
+        {
+          "name": "DidNotFound",
+          "description": "The DID resolution process confirmed that there is no current DID."
+        },
+        {
+          "name": "DidDeactivated",
+          "description": "The DID previously existed, but has been deactivated."
+        }
+      ]
+    }
+  }
+}
diff --git a/lexicons/com/atproto/identity/resolveHandle.json b/lexicons/com/atproto/identity/resolveHandle.json
index 95885088a7b..69751a529ca 100644
--- a/lexicons/com/atproto/identity/resolveHandle.json
+++ b/lexicons/com/atproto/identity/resolveHandle.json
@@ -4,7 +4,7 @@
   "defs": {
     "main": {
       "type": "query",
-      "description": "Resolves a handle (domain name) to a DID.",
+      "description": "Resolves an atproto handle (hostname) to a DID. Does not necessarily bi-directionally verify against the the DID document.",
       "parameters": {
         "type": "params",
         "required": ["handle"],
@@ -25,7 +25,13 @@
             "did": { "type": "string", "format": "did" }
           }
         }
-      }
+      },
+      "errors": [
+        {
+          "name": "HandleNotFound",
+          "description": "The resolution process confirmed that the handle does not resolve to any DID."
+        }
+      ]
     }
   }
 }
diff --git a/lexicons/com/atproto/identity/resolveIdentity.json b/lexicons/com/atproto/identity/resolveIdentity.json
new file mode 100644
index 00000000000..fe33441c4eb
--- /dev/null
+++ b/lexicons/com/atproto/identity/resolveIdentity.json
@@ -0,0 +1,42 @@
+{
+  "lexicon": 1,
+  "id": "com.atproto.identity.resolveIdentity",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Resolves an identity (DID or Handle) to a full identity (DID document and verified handle).",
+      "parameters": {
+        "type": "params",
+        "required": ["identifier"],
+        "properties": {
+          "identifier": {
+            "type": "string",
+            "format": "at-identifier",
+            "description": "Handle or DID to resolve."
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "ref",
+          "ref": "com.atproto.identity.defs#identityInfo"
+        }
+      },
+      "errors": [
+        {
+          "name": "HandleNotFound",
+          "description": "The resolution process confirmed that the handle does not resolve to any DID."
+        },
+        {
+          "name": "DidNotFound",
+          "description": "The DID resolution process confirmed that there is no current DID."
+        },
+        {
+          "name": "DidDeactivated",
+          "description": "The DID previously existed, but has been deactivated."
+        }
+      ]
+    }
+  }
+}
diff --git a/packages/api/src/client/index.ts b/packages/api/src/client/index.ts
index ed749b3d3d5..55dececc9a5 100644
--- a/packages/api/src/client/index.ts
+++ b/packages/api/src/client/index.ts
@@ -20,9 +20,13 @@ import * as ComAtprotoAdminUpdateAccountEmail from './types/com/atproto/admin/up
 import * as ComAtprotoAdminUpdateAccountHandle from './types/com/atproto/admin/updateAccountHandle.js'
 import * as ComAtprotoAdminUpdateAccountPassword from './types/com/atproto/admin/updateAccountPassword.js'
 import * as ComAtprotoAdminUpdateSubjectStatus from './types/com/atproto/admin/updateSubjectStatus.js'
+import * as ComAtprotoIdentityDefs from './types/com/atproto/identity/defs.js'
 import * as ComAtprotoIdentityGetRecommendedDidCredentials from './types/com/atproto/identity/getRecommendedDidCredentials.js'
+import * as ComAtprotoIdentityRefreshIdentity from './types/com/atproto/identity/refreshIdentity.js'
 import * as ComAtprotoIdentityRequestPlcOperationSignature from './types/com/atproto/identity/requestPlcOperationSignature.js'
+import * as ComAtprotoIdentityResolveDid from './types/com/atproto/identity/resolveDid.js'
 import * as ComAtprotoIdentityResolveHandle from './types/com/atproto/identity/resolveHandle.js'
+import * as ComAtprotoIdentityResolveIdentity from './types/com/atproto/identity/resolveIdentity.js'
 import * as ComAtprotoIdentitySignPlcOperation from './types/com/atproto/identity/signPlcOperation.js'
 import * as ComAtprotoIdentitySubmitPlcOperation from './types/com/atproto/identity/submitPlcOperation.js'
 import * as ComAtprotoIdentityUpdateHandle from './types/com/atproto/identity/updateHandle.js'
@@ -254,9 +258,13 @@ export * as ComAtprotoAdminUpdateAccountEmail from './types/com/atproto/admin/up
 export * as ComAtprotoAdminUpdateAccountHandle from './types/com/atproto/admin/updateAccountHandle.js'
 export * as ComAtprotoAdminUpdateAccountPassword from './types/com/atproto/admin/updateAccountPassword.js'
 export * as ComAtprotoAdminUpdateSubjectStatus from './types/com/atproto/admin/updateSubjectStatus.js'
+export * as ComAtprotoIdentityDefs from './types/com/atproto/identity/defs.js'
 export * as ComAtprotoIdentityGetRecommendedDidCredentials from './types/com/atproto/identity/getRecommendedDidCredentials.js'
+export * as ComAtprotoIdentityRefreshIdentity from './types/com/atproto/identity/refreshIdentity.js'
 export * as ComAtprotoIdentityRequestPlcOperationSignature from './types/com/atproto/identity/requestPlcOperationSignature.js'
+export * as ComAtprotoIdentityResolveDid from './types/com/atproto/identity/resolveDid.js'
 export * as ComAtprotoIdentityResolveHandle from './types/com/atproto/identity/resolveHandle.js'
+export * as ComAtprotoIdentityResolveIdentity from './types/com/atproto/identity/resolveIdentity.js'
 export * as ComAtprotoIdentitySignPlcOperation from './types/com/atproto/identity/signPlcOperation.js'
 export * as ComAtprotoIdentitySubmitPlcOperation from './types/com/atproto/identity/submitPlcOperation.js'
 export * as ComAtprotoIdentityUpdateHandle from './types/com/atproto/identity/updateHandle.js'
@@ -766,6 +774,17 @@ export class ComAtprotoIdentityNS {
     )
   }
 
+  refreshIdentity(
+    data?: ComAtprotoIdentityRefreshIdentity.InputSchema,
+    opts?: ComAtprotoIdentityRefreshIdentity.CallOptions,
+  ): Promise<ComAtprotoIdentityRefreshIdentity.Response> {
+    return this._client
+      .call('com.atproto.identity.refreshIdentity', opts?.qp, data, opts)
+      .catch((e) => {
+        throw ComAtprotoIdentityRefreshIdentity.toKnownErr(e)
+      })
+  }
+
   requestPlcOperationSignature(
     data?: ComAtprotoIdentityRequestPlcOperationSignature.InputSchema,
     opts?: ComAtprotoIdentityRequestPlcOperationSignature.CallOptions,
@@ -778,16 +797,37 @@ export class ComAtprotoIdentityNS {
     )
   }
 
+  resolveDid(
+    params?: ComAtprotoIdentityResolveDid.QueryParams,
+    opts?: ComAtprotoIdentityResolveDid.CallOptions,
+  ): Promise<ComAtprotoIdentityResolveDid.Response> {
+    return this._client
+      .call('com.atproto.identity.resolveDid', params, undefined, opts)
+      .catch((e) => {
+        throw ComAtprotoIdentityResolveDid.toKnownErr(e)
+      })
+  }
+
   resolveHandle(
     params?: ComAtprotoIdentityResolveHandle.QueryParams,
     opts?: ComAtprotoIdentityResolveHandle.CallOptions,
   ): Promise<ComAtprotoIdentityResolveHandle.Response> {
-    return this._client.call(
-      'com.atproto.identity.resolveHandle',
-      params,
-      undefined,
-      opts,
-    )
+    return this._client
+      .call('com.atproto.identity.resolveHandle', params, undefined, opts)
+      .catch((e) => {
+        throw ComAtprotoIdentityResolveHandle.toKnownErr(e)
+      })
+  }
+
+  resolveIdentity(
+    params?: ComAtprotoIdentityResolveIdentity.QueryParams,
+    opts?: ComAtprotoIdentityResolveIdentity.CallOptions,
+  ): Promise<ComAtprotoIdentityResolveIdentity.Response> {
+    return this._client
+      .call('com.atproto.identity.resolveIdentity', params, undefined, opts)
+      .catch((e) => {
+        throw ComAtprotoIdentityResolveIdentity.toKnownErr(e)
+      })
   }
 
   signPlcOperation(
diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
index 23b00b79fb5..6463e7c6ec3 100644
--- a/packages/api/src/client/lexicons.ts
+++ b/packages/api/src/client/lexicons.ts
@@ -637,6 +637,32 @@ export const schemaDict = {
       },
     },
   },
+  ComAtprotoIdentityDefs: {
+    lexicon: 1,
+    id: 'com.atproto.identity.defs',
+    defs: {
+      identityInfo: {
+        type: 'object',
+        required: ['did', 'handle', 'didDoc'],
+        properties: {
+          did: {
+            type: 'string',
+            format: 'did',
+          },
+          handle: {
+            type: 'string',
+            format: 'handle',
+            description:
+              "The validated handle of the account; or 'handle.invalid' if the handle did not bi-directionally match the DID document.",
+          },
+          didDoc: {
+            type: 'unknown',
+            description: 'The complete DID document for the identity.',
+          },
+        },
+      },
+    },
+  },
   ComAtprotoIdentityGetRecommendedDidCredentials: {
     lexicon: 1,
     id: 'com.atproto.identity.getRecommendedDidCredentials',
@@ -676,6 +702,54 @@ export const schemaDict = {
       },
     },
   },
+  ComAtprotoIdentityRefreshIdentity: {
+    lexicon: 1,
+    id: 'com.atproto.identity.refreshIdentity',
+    defs: {
+      main: {
+        type: 'procedure',
+        description:
+          'Request that the server re-resolve an identity (DID and handle). The server may ignore this request, or require authentication, depending on the role, implementation, and policy of the server.',
+        input: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['identifier'],
+            properties: {
+              identifier: {
+                type: 'string',
+                format: 'at-identifier',
+              },
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'ref',
+            ref: 'lex:com.atproto.identity.defs#identityInfo',
+          },
+        },
+        errors: [
+          {
+            name: 'HandleNotFound',
+            description:
+              'The resolution process confirmed that the handle does not resolve to any DID.',
+          },
+          {
+            name: 'DidNotFound',
+            description:
+              'The DID resolution process confirmed that there is no current DID.',
+          },
+          {
+            name: 'DidDeactivated',
+            description:
+              'The DID previously existed, but has been deactivated.',
+          },
+        ],
+      },
+    },
+  },
   ComAtprotoIdentityRequestPlcOperationSignature: {
     lexicon: 1,
     id: 'com.atproto.identity.requestPlcOperationSignature',
@@ -687,13 +761,61 @@ export const schemaDict = {
       },
     },
   },
+  ComAtprotoIdentityResolveDid: {
+    lexicon: 1,
+    id: 'com.atproto.identity.resolveDid',
+    defs: {
+      main: {
+        type: 'query',
+        description:
+          'Resolves DID to DID document. Does not bi-directionally verify handle.',
+        parameters: {
+          type: 'params',
+          required: ['did'],
+          properties: {
+            did: {
+              type: 'string',
+              format: 'did',
+              description: 'DID to resolve.',
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['didDoc'],
+            properties: {
+              didDoc: {
+                type: 'unknown',
+                description: 'The complete DID document for the identity.',
+              },
+            },
+          },
+        },
+        errors: [
+          {
+            name: 'DidNotFound',
+            description:
+              'The DID resolution process confirmed that there is no current DID.',
+          },
+          {
+            name: 'DidDeactivated',
+            description:
+              'The DID previously existed, but has been deactivated.',
+          },
+        ],
+      },
+    },
+  },
   ComAtprotoIdentityResolveHandle: {
     lexicon: 1,
     id: 'com.atproto.identity.resolveHandle',
     defs: {
       main: {
         type: 'query',
-        description: 'Resolves a handle (domain name) to a DID.',
+        description:
+          'Resolves an atproto handle (hostname) to a DID. Does not necessarily bi-directionally verify against the the DID document.',
         parameters: {
           type: 'params',
           required: ['handle'],
@@ -718,6 +840,59 @@ export const schemaDict = {
             },
           },
         },
+        errors: [
+          {
+            name: 'HandleNotFound',
+            description:
+              'The resolution process confirmed that the handle does not resolve to any DID.',
+          },
+        ],
+      },
+    },
+  },
+  ComAtprotoIdentityResolveIdentity: {
+    lexicon: 1,
+    id: 'com.atproto.identity.resolveIdentity',
+    defs: {
+      main: {
+        type: 'query',
+        description:
+          'Resolves an identity (DID or Handle) to a full identity (DID document and verified handle).',
+        parameters: {
+          type: 'params',
+          required: ['identifier'],
+          properties: {
+            identifier: {
+              type: 'string',
+              format: 'at-identifier',
+              description: 'Handle or DID to resolve.',
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'ref',
+            ref: 'lex:com.atproto.identity.defs#identityInfo',
+          },
+        },
+        errors: [
+          {
+            name: 'HandleNotFound',
+            description:
+              'The resolution process confirmed that the handle does not resolve to any DID.',
+          },
+          {
+            name: 'DidNotFound',
+            description:
+              'The DID resolution process confirmed that there is no current DID.',
+          },
+          {
+            name: 'DidDeactivated',
+            description:
+              'The DID previously existed, but has been deactivated.',
+          },
+        ],
       },
     },
   },
@@ -14394,11 +14569,15 @@ export const ids = {
   ComAtprotoAdminUpdateAccountPassword:
     'com.atproto.admin.updateAccountPassword',
   ComAtprotoAdminUpdateSubjectStatus: 'com.atproto.admin.updateSubjectStatus',
+  ComAtprotoIdentityDefs: 'com.atproto.identity.defs',
   ComAtprotoIdentityGetRecommendedDidCredentials:
     'com.atproto.identity.getRecommendedDidCredentials',
+  ComAtprotoIdentityRefreshIdentity: 'com.atproto.identity.refreshIdentity',
   ComAtprotoIdentityRequestPlcOperationSignature:
     'com.atproto.identity.requestPlcOperationSignature',
+  ComAtprotoIdentityResolveDid: 'com.atproto.identity.resolveDid',
   ComAtprotoIdentityResolveHandle: 'com.atproto.identity.resolveHandle',
+  ComAtprotoIdentityResolveIdentity: 'com.atproto.identity.resolveIdentity',
   ComAtprotoIdentitySignPlcOperation: 'com.atproto.identity.signPlcOperation',
   ComAtprotoIdentitySubmitPlcOperation:
     'com.atproto.identity.submitPlcOperation',
diff --git a/packages/api/src/client/types/com/atproto/identity/defs.ts b/packages/api/src/client/types/com/atproto/identity/defs.ts
new file mode 100644
index 00000000000..30b400f4fd3
--- /dev/null
+++ b/packages/api/src/client/types/com/atproto/identity/defs.ts
@@ -0,0 +1,30 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.defs'
+
+export interface IdentityInfo {
+  $type?: 'com.atproto.identity.defs#identityInfo'
+  did: string
+  /** The validated handle of the account; or 'handle.invalid' if the handle did not bi-directionally match the DID document. */
+  handle: string
+  /** The complete DID document for the identity. */
+  didDoc: { [_ in string]: unknown }
+}
+
+const hashIdentityInfo = 'identityInfo'
+
+export function isIdentityInfo<V>(v: V) {
+  return is$typed(v, id, hashIdentityInfo)
+}
+
+export function validateIdentityInfo<V>(v: V) {
+  return validate<IdentityInfo & V>(v, id, hashIdentityInfo)
+}
diff --git a/packages/api/src/client/types/com/atproto/identity/refreshIdentity.ts b/packages/api/src/client/types/com/atproto/identity/refreshIdentity.ts
new file mode 100644
index 00000000000..43251787ec9
--- /dev/null
+++ b/packages/api/src/client/types/com/atproto/identity/refreshIdentity.ts
@@ -0,0 +1,62 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { HeadersMap, XRPCError } from '@atproto/xrpc'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoIdentityDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.refreshIdentity'
+
+export interface QueryParams {}
+
+export interface InputSchema {
+  identifier: string
+}
+
+export type OutputSchema = ComAtprotoIdentityDefs.IdentityInfo
+
+export interface CallOptions {
+  signal?: AbortSignal
+  headers?: HeadersMap
+  qp?: QueryParams
+  encoding?: 'application/json'
+}
+
+export interface Response {
+  success: boolean
+  headers: HeadersMap
+  data: OutputSchema
+}
+
+export class HandleNotFoundError extends XRPCError {
+  constructor(src: XRPCError) {
+    super(src.status, src.error, src.message, src.headers, { cause: src })
+  }
+}
+
+export class DidNotFoundError extends XRPCError {
+  constructor(src: XRPCError) {
+    super(src.status, src.error, src.message, src.headers, { cause: src })
+  }
+}
+
+export class DidDeactivatedError extends XRPCError {
+  constructor(src: XRPCError) {
+    super(src.status, src.error, src.message, src.headers, { cause: src })
+  }
+}
+
+export function toKnownErr(e: any) {
+  if (e instanceof XRPCError) {
+    if (e.error === 'HandleNotFound') return new HandleNotFoundError(e)
+    if (e.error === 'DidNotFound') return new DidNotFoundError(e)
+    if (e.error === 'DidDeactivated') return new DidDeactivatedError(e)
+  }
+
+  return e
+}
diff --git a/packages/api/src/client/types/com/atproto/identity/resolveDid.ts b/packages/api/src/client/types/com/atproto/identity/resolveDid.ts
new file mode 100644
index 00000000000..3896b7c4ac1
--- /dev/null
+++ b/packages/api/src/client/types/com/atproto/identity/resolveDid.ts
@@ -0,0 +1,56 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { HeadersMap, XRPCError } from '@atproto/xrpc'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.resolveDid'
+
+export interface QueryParams {
+  /** DID to resolve. */
+  did: string
+}
+
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  /** The complete DID document for the identity. */
+  didDoc: { [_ in string]: unknown }
+}
+
+export interface CallOptions {
+  signal?: AbortSignal
+  headers?: HeadersMap
+}
+
+export interface Response {
+  success: boolean
+  headers: HeadersMap
+  data: OutputSchema
+}
+
+export class DidNotFoundError extends XRPCError {
+  constructor(src: XRPCError) {
+    super(src.status, src.error, src.message, src.headers, { cause: src })
+  }
+}
+
+export class DidDeactivatedError extends XRPCError {
+  constructor(src: XRPCError) {
+    super(src.status, src.error, src.message, src.headers, { cause: src })
+  }
+}
+
+export function toKnownErr(e: any) {
+  if (e instanceof XRPCError) {
+    if (e.error === 'DidNotFound') return new DidNotFoundError(e)
+    if (e.error === 'DidDeactivated') return new DidDeactivatedError(e)
+  }
+
+  return e
+}
diff --git a/packages/api/src/client/types/com/atproto/identity/resolveHandle.ts b/packages/api/src/client/types/com/atproto/identity/resolveHandle.ts
index 3610d75c0a2..5609983fa68 100644
--- a/packages/api/src/client/types/com/atproto/identity/resolveHandle.ts
+++ b/packages/api/src/client/types/com/atproto/identity/resolveHandle.ts
@@ -33,6 +33,16 @@ export interface Response {
   data: OutputSchema
 }
 
+export class HandleNotFoundError extends XRPCError {
+  constructor(src: XRPCError) {
+    super(src.status, src.error, src.message, src.headers, { cause: src })
+  }
+}
+
 export function toKnownErr(e: any) {
+  if (e instanceof XRPCError) {
+    if (e.error === 'HandleNotFound') return new HandleNotFoundError(e)
+  }
+
   return e
 }
diff --git a/packages/api/src/client/types/com/atproto/identity/resolveIdentity.ts b/packages/api/src/client/types/com/atproto/identity/resolveIdentity.ts
new file mode 100644
index 00000000000..a88f62188ba
--- /dev/null
+++ b/packages/api/src/client/types/com/atproto/identity/resolveIdentity.ts
@@ -0,0 +1,60 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { HeadersMap, XRPCError } from '@atproto/xrpc'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import type * as ComAtprotoIdentityDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.resolveIdentity'
+
+export interface QueryParams {
+  /** Handle or DID to resolve. */
+  identifier: string
+}
+
+export type InputSchema = undefined
+export type OutputSchema = ComAtprotoIdentityDefs.IdentityInfo
+
+export interface CallOptions {
+  signal?: AbortSignal
+  headers?: HeadersMap
+}
+
+export interface Response {
+  success: boolean
+  headers: HeadersMap
+  data: OutputSchema
+}
+
+export class HandleNotFoundError extends XRPCError {
+  constructor(src: XRPCError) {
+    super(src.status, src.error, src.message, src.headers, { cause: src })
+  }
+}
+
+export class DidNotFoundError extends XRPCError {
+  constructor(src: XRPCError) {
+    super(src.status, src.error, src.message, src.headers, { cause: src })
+  }
+}
+
+export class DidDeactivatedError extends XRPCError {
+  constructor(src: XRPCError) {
+    super(src.status, src.error, src.message, src.headers, { cause: src })
+  }
+}
+
+export function toKnownErr(e: any) {
+  if (e instanceof XRPCError) {
+    if (e.error === 'HandleNotFound') return new HandleNotFoundError(e)
+    if (e.error === 'DidNotFound') return new DidNotFoundError(e)
+    if (e.error === 'DidDeactivated') return new DidDeactivatedError(e)
+  }
+
+  return e
+}
diff --git a/packages/bsky/src/lexicon/index.ts b/packages/bsky/src/lexicon/index.ts
index dc073de665a..a2ab37da2f3 100644
--- a/packages/bsky/src/lexicon/index.ts
+++ b/packages/bsky/src/lexicon/index.ts
@@ -24,8 +24,11 @@ import * as ComAtprotoAdminUpdateAccountHandle from './types/com/atproto/admin/u
 import * as ComAtprotoAdminUpdateAccountPassword from './types/com/atproto/admin/updateAccountPassword.js'
 import * as ComAtprotoAdminUpdateSubjectStatus from './types/com/atproto/admin/updateSubjectStatus.js'
 import * as ComAtprotoIdentityGetRecommendedDidCredentials from './types/com/atproto/identity/getRecommendedDidCredentials.js'
+import * as ComAtprotoIdentityRefreshIdentity from './types/com/atproto/identity/refreshIdentity.js'
 import * as ComAtprotoIdentityRequestPlcOperationSignature from './types/com/atproto/identity/requestPlcOperationSignature.js'
+import * as ComAtprotoIdentityResolveDid from './types/com/atproto/identity/resolveDid.js'
 import * as ComAtprotoIdentityResolveHandle from './types/com/atproto/identity/resolveHandle.js'
+import * as ComAtprotoIdentityResolveIdentity from './types/com/atproto/identity/resolveIdentity.js'
 import * as ComAtprotoIdentitySignPlcOperation from './types/com/atproto/identity/signPlcOperation.js'
 import * as ComAtprotoIdentitySubmitPlcOperation from './types/com/atproto/identity/submitPlcOperation.js'
 import * as ComAtprotoIdentityUpdateHandle from './types/com/atproto/identity/updateHandle.js'
@@ -436,6 +439,17 @@ export class ComAtprotoIdentityNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
+  refreshIdentity<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ComAtprotoIdentityRefreshIdentity.Handler<ExtractAuth<AV>>,
+      ComAtprotoIdentityRefreshIdentity.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'com.atproto.identity.refreshIdentity' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   requestPlcOperationSignature<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,
@@ -449,6 +463,17 @@ export class ComAtprotoIdentityNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
+  resolveDid<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ComAtprotoIdentityResolveDid.Handler<ExtractAuth<AV>>,
+      ComAtprotoIdentityResolveDid.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'com.atproto.identity.resolveDid' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   resolveHandle<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,
@@ -460,6 +485,17 @@ export class ComAtprotoIdentityNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
+  resolveIdentity<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ComAtprotoIdentityResolveIdentity.Handler<ExtractAuth<AV>>,
+      ComAtprotoIdentityResolveIdentity.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'com.atproto.identity.resolveIdentity' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   signPlcOperation<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,
diff --git a/packages/bsky/src/lexicon/lexicons.ts b/packages/bsky/src/lexicon/lexicons.ts
index dd2ab9fe455..2468340216a 100644
--- a/packages/bsky/src/lexicon/lexicons.ts
+++ b/packages/bsky/src/lexicon/lexicons.ts
@@ -637,6 +637,32 @@ export const schemaDict = {
       },
     },
   },
+  ComAtprotoIdentityDefs: {
+    lexicon: 1,
+    id: 'com.atproto.identity.defs',
+    defs: {
+      identityInfo: {
+        type: 'object',
+        required: ['did', 'handle', 'didDoc'],
+        properties: {
+          did: {
+            type: 'string',
+            format: 'did',
+          },
+          handle: {
+            type: 'string',
+            format: 'handle',
+            description:
+              "The validated handle of the account; or 'handle.invalid' if the handle did not bi-directionally match the DID document.",
+          },
+          didDoc: {
+            type: 'unknown',
+            description: 'The complete DID document for the identity.',
+          },
+        },
+      },
+    },
+  },
   ComAtprotoIdentityGetRecommendedDidCredentials: {
     lexicon: 1,
     id: 'com.atproto.identity.getRecommendedDidCredentials',
@@ -676,6 +702,54 @@ export const schemaDict = {
       },
     },
   },
+  ComAtprotoIdentityRefreshIdentity: {
+    lexicon: 1,
+    id: 'com.atproto.identity.refreshIdentity',
+    defs: {
+      main: {
+        type: 'procedure',
+        description:
+          'Request that the server re-resolve an identity (DID and handle). The server may ignore this request, or require authentication, depending on the role, implementation, and policy of the server.',
+        input: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['identifier'],
+            properties: {
+              identifier: {
+                type: 'string',
+                format: 'at-identifier',
+              },
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'ref',
+            ref: 'lex:com.atproto.identity.defs#identityInfo',
+          },
+        },
+        errors: [
+          {
+            name: 'HandleNotFound',
+            description:
+              'The resolution process confirmed that the handle does not resolve to any DID.',
+          },
+          {
+            name: 'DidNotFound',
+            description:
+              'The DID resolution process confirmed that there is no current DID.',
+          },
+          {
+            name: 'DidDeactivated',
+            description:
+              'The DID previously existed, but has been deactivated.',
+          },
+        ],
+      },
+    },
+  },
   ComAtprotoIdentityRequestPlcOperationSignature: {
     lexicon: 1,
     id: 'com.atproto.identity.requestPlcOperationSignature',
@@ -687,13 +761,61 @@ export const schemaDict = {
       },
     },
   },
+  ComAtprotoIdentityResolveDid: {
+    lexicon: 1,
+    id: 'com.atproto.identity.resolveDid',
+    defs: {
+      main: {
+        type: 'query',
+        description:
+          'Resolves DID to DID document. Does not bi-directionally verify handle.',
+        parameters: {
+          type: 'params',
+          required: ['did'],
+          properties: {
+            did: {
+              type: 'string',
+              format: 'did',
+              description: 'DID to resolve.',
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['didDoc'],
+            properties: {
+              didDoc: {
+                type: 'unknown',
+                description: 'The complete DID document for the identity.',
+              },
+            },
+          },
+        },
+        errors: [
+          {
+            name: 'DidNotFound',
+            description:
+              'The DID resolution process confirmed that there is no current DID.',
+          },
+          {
+            name: 'DidDeactivated',
+            description:
+              'The DID previously existed, but has been deactivated.',
+          },
+        ],
+      },
+    },
+  },
   ComAtprotoIdentityResolveHandle: {
     lexicon: 1,
     id: 'com.atproto.identity.resolveHandle',
     defs: {
       main: {
         type: 'query',
-        description: 'Resolves a handle (domain name) to a DID.',
+        description:
+          'Resolves an atproto handle (hostname) to a DID. Does not necessarily bi-directionally verify against the the DID document.',
         parameters: {
           type: 'params',
           required: ['handle'],
@@ -718,6 +840,59 @@ export const schemaDict = {
             },
           },
         },
+        errors: [
+          {
+            name: 'HandleNotFound',
+            description:
+              'The resolution process confirmed that the handle does not resolve to any DID.',
+          },
+        ],
+      },
+    },
+  },
+  ComAtprotoIdentityResolveIdentity: {
+    lexicon: 1,
+    id: 'com.atproto.identity.resolveIdentity',
+    defs: {
+      main: {
+        type: 'query',
+        description:
+          'Resolves an identity (DID or Handle) to a full identity (DID document and verified handle).',
+        parameters: {
+          type: 'params',
+          required: ['identifier'],
+          properties: {
+            identifier: {
+              type: 'string',
+              format: 'at-identifier',
+              description: 'Handle or DID to resolve.',
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'ref',
+            ref: 'lex:com.atproto.identity.defs#identityInfo',
+          },
+        },
+        errors: [
+          {
+            name: 'HandleNotFound',
+            description:
+              'The resolution process confirmed that the handle does not resolve to any DID.',
+          },
+          {
+            name: 'DidNotFound',
+            description:
+              'The DID resolution process confirmed that there is no current DID.',
+          },
+          {
+            name: 'DidDeactivated',
+            description:
+              'The DID previously existed, but has been deactivated.',
+          },
+        ],
       },
     },
   },
@@ -11364,11 +11539,15 @@ export const ids = {
   ComAtprotoAdminUpdateAccountPassword:
     'com.atproto.admin.updateAccountPassword',
   ComAtprotoAdminUpdateSubjectStatus: 'com.atproto.admin.updateSubjectStatus',
+  ComAtprotoIdentityDefs: 'com.atproto.identity.defs',
   ComAtprotoIdentityGetRecommendedDidCredentials:
     'com.atproto.identity.getRecommendedDidCredentials',
+  ComAtprotoIdentityRefreshIdentity: 'com.atproto.identity.refreshIdentity',
   ComAtprotoIdentityRequestPlcOperationSignature:
     'com.atproto.identity.requestPlcOperationSignature',
+  ComAtprotoIdentityResolveDid: 'com.atproto.identity.resolveDid',
   ComAtprotoIdentityResolveHandle: 'com.atproto.identity.resolveHandle',
+  ComAtprotoIdentityResolveIdentity: 'com.atproto.identity.resolveIdentity',
   ComAtprotoIdentitySignPlcOperation: 'com.atproto.identity.signPlcOperation',
   ComAtprotoIdentitySubmitPlcOperation:
     'com.atproto.identity.submitPlcOperation',
diff --git a/packages/bsky/src/lexicon/types/com/atproto/identity/defs.ts b/packages/bsky/src/lexicon/types/com/atproto/identity/defs.ts
new file mode 100644
index 00000000000..30b400f4fd3
--- /dev/null
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/defs.ts
@@ -0,0 +1,30 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.defs'
+
+export interface IdentityInfo {
+  $type?: 'com.atproto.identity.defs#identityInfo'
+  did: string
+  /** The validated handle of the account; or 'handle.invalid' if the handle did not bi-directionally match the DID document. */
+  handle: string
+  /** The complete DID document for the identity. */
+  didDoc: { [_ in string]: unknown }
+}
+
+const hashIdentityInfo = 'identityInfo'
+
+export function isIdentityInfo<V>(v: V) {
+  return is$typed(v, id, hashIdentityInfo)
+}
+
+export function validateIdentityInfo<V>(v: V) {
+  return validate<IdentityInfo & V>(v, id, hashIdentityInfo)
+}
diff --git a/packages/bsky/src/lexicon/types/com/atproto/identity/refreshIdentity.ts b/packages/bsky/src/lexicon/types/com/atproto/identity/refreshIdentity.ts
new file mode 100644
index 00000000000..8ee156bdbbd
--- /dev/null
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/refreshIdentity.ts
@@ -0,0 +1,52 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+import type * as ComAtprotoIdentityDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.refreshIdentity'
+
+export interface QueryParams {}
+
+export interface InputSchema {
+  identifier: string
+}
+
+export type OutputSchema = ComAtprotoIdentityDefs.IdentityInfo
+
+export interface HandlerInput {
+  encoding: 'application/json'
+  body: InputSchema
+}
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+  error?: 'HandleNotFound' | 'DidNotFound' | 'DidDeactivated'
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+  resetRouteRateLimits: () => Promise<void>
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput
diff --git a/packages/bsky/src/lexicon/types/com/atproto/identity/resolveDid.ts b/packages/bsky/src/lexicon/types/com/atproto/identity/resolveDid.ts
new file mode 100644
index 00000000000..78862549432
--- /dev/null
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/resolveDid.ts
@@ -0,0 +1,52 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.resolveDid'
+
+export interface QueryParams {
+  /** DID to resolve. */
+  did: string
+}
+
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  /** The complete DID document for the identity. */
+  didDoc: { [_ in string]: unknown }
+}
+
+export type HandlerInput = undefined
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+  error?: 'DidNotFound' | 'DidDeactivated'
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+  resetRouteRateLimits: () => Promise<void>
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput
diff --git a/packages/bsky/src/lexicon/types/com/atproto/identity/resolveHandle.ts b/packages/bsky/src/lexicon/types/com/atproto/identity/resolveHandle.ts
index 7c7fd5fe225..935094e5d25 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/identity/resolveHandle.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/resolveHandle.ts
@@ -34,6 +34,7 @@ export interface HandlerSuccess {
 export interface HandlerError {
   status: number
   message?: string
+  error?: 'HandleNotFound'
 }
 
 export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
diff --git a/packages/bsky/src/lexicon/types/com/atproto/identity/resolveIdentity.ts b/packages/bsky/src/lexicon/types/com/atproto/identity/resolveIdentity.ts
new file mode 100644
index 00000000000..2a6b3fbf400
--- /dev/null
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/resolveIdentity.ts
@@ -0,0 +1,48 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+import type * as ComAtprotoIdentityDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.resolveIdentity'
+
+export interface QueryParams {
+  /** Handle or DID to resolve. */
+  identifier: string
+}
+
+export type InputSchema = undefined
+export type OutputSchema = ComAtprotoIdentityDefs.IdentityInfo
+export type HandlerInput = undefined
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+  error?: 'HandleNotFound' | 'DidNotFound' | 'DidDeactivated'
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+  resetRouteRateLimits: () => Promise<void>
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput
diff --git a/packages/ozone/src/lexicon/index.ts b/packages/ozone/src/lexicon/index.ts
index 028452a5f1e..b9985b5f42e 100644
--- a/packages/ozone/src/lexicon/index.ts
+++ b/packages/ozone/src/lexicon/index.ts
@@ -24,8 +24,11 @@ import * as ComAtprotoAdminUpdateAccountHandle from './types/com/atproto/admin/u
 import * as ComAtprotoAdminUpdateAccountPassword from './types/com/atproto/admin/updateAccountPassword.js'
 import * as ComAtprotoAdminUpdateSubjectStatus from './types/com/atproto/admin/updateSubjectStatus.js'
 import * as ComAtprotoIdentityGetRecommendedDidCredentials from './types/com/atproto/identity/getRecommendedDidCredentials.js'
+import * as ComAtprotoIdentityRefreshIdentity from './types/com/atproto/identity/refreshIdentity.js'
 import * as ComAtprotoIdentityRequestPlcOperationSignature from './types/com/atproto/identity/requestPlcOperationSignature.js'
+import * as ComAtprotoIdentityResolveDid from './types/com/atproto/identity/resolveDid.js'
 import * as ComAtprotoIdentityResolveHandle from './types/com/atproto/identity/resolveHandle.js'
+import * as ComAtprotoIdentityResolveIdentity from './types/com/atproto/identity/resolveIdentity.js'
 import * as ComAtprotoIdentitySignPlcOperation from './types/com/atproto/identity/signPlcOperation.js'
 import * as ComAtprotoIdentitySubmitPlcOperation from './types/com/atproto/identity/submitPlcOperation.js'
 import * as ComAtprotoIdentityUpdateHandle from './types/com/atproto/identity/updateHandle.js'
@@ -480,6 +483,17 @@ export class ComAtprotoIdentityNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
+  refreshIdentity<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ComAtprotoIdentityRefreshIdentity.Handler<ExtractAuth<AV>>,
+      ComAtprotoIdentityRefreshIdentity.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'com.atproto.identity.refreshIdentity' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   requestPlcOperationSignature<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,
@@ -493,6 +507,17 @@ export class ComAtprotoIdentityNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
+  resolveDid<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ComAtprotoIdentityResolveDid.Handler<ExtractAuth<AV>>,
+      ComAtprotoIdentityResolveDid.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'com.atproto.identity.resolveDid' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   resolveHandle<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,
@@ -504,6 +529,17 @@ export class ComAtprotoIdentityNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
+  resolveIdentity<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ComAtprotoIdentityResolveIdentity.Handler<ExtractAuth<AV>>,
+      ComAtprotoIdentityResolveIdentity.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'com.atproto.identity.resolveIdentity' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   signPlcOperation<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,
diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
index 23b00b79fb5..6463e7c6ec3 100644
--- a/packages/ozone/src/lexicon/lexicons.ts
+++ b/packages/ozone/src/lexicon/lexicons.ts
@@ -637,6 +637,32 @@ export const schemaDict = {
       },
     },
   },
+  ComAtprotoIdentityDefs: {
+    lexicon: 1,
+    id: 'com.atproto.identity.defs',
+    defs: {
+      identityInfo: {
+        type: 'object',
+        required: ['did', 'handle', 'didDoc'],
+        properties: {
+          did: {
+            type: 'string',
+            format: 'did',
+          },
+          handle: {
+            type: 'string',
+            format: 'handle',
+            description:
+              "The validated handle of the account; or 'handle.invalid' if the handle did not bi-directionally match the DID document.",
+          },
+          didDoc: {
+            type: 'unknown',
+            description: 'The complete DID document for the identity.',
+          },
+        },
+      },
+    },
+  },
   ComAtprotoIdentityGetRecommendedDidCredentials: {
     lexicon: 1,
     id: 'com.atproto.identity.getRecommendedDidCredentials',
@@ -676,6 +702,54 @@ export const schemaDict = {
       },
     },
   },
+  ComAtprotoIdentityRefreshIdentity: {
+    lexicon: 1,
+    id: 'com.atproto.identity.refreshIdentity',
+    defs: {
+      main: {
+        type: 'procedure',
+        description:
+          'Request that the server re-resolve an identity (DID and handle). The server may ignore this request, or require authentication, depending on the role, implementation, and policy of the server.',
+        input: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['identifier'],
+            properties: {
+              identifier: {
+                type: 'string',
+                format: 'at-identifier',
+              },
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'ref',
+            ref: 'lex:com.atproto.identity.defs#identityInfo',
+          },
+        },
+        errors: [
+          {
+            name: 'HandleNotFound',
+            description:
+              'The resolution process confirmed that the handle does not resolve to any DID.',
+          },
+          {
+            name: 'DidNotFound',
+            description:
+              'The DID resolution process confirmed that there is no current DID.',
+          },
+          {
+            name: 'DidDeactivated',
+            description:
+              'The DID previously existed, but has been deactivated.',
+          },
+        ],
+      },
+    },
+  },
   ComAtprotoIdentityRequestPlcOperationSignature: {
     lexicon: 1,
     id: 'com.atproto.identity.requestPlcOperationSignature',
@@ -687,13 +761,61 @@ export const schemaDict = {
       },
     },
   },
+  ComAtprotoIdentityResolveDid: {
+    lexicon: 1,
+    id: 'com.atproto.identity.resolveDid',
+    defs: {
+      main: {
+        type: 'query',
+        description:
+          'Resolves DID to DID document. Does not bi-directionally verify handle.',
+        parameters: {
+          type: 'params',
+          required: ['did'],
+          properties: {
+            did: {
+              type: 'string',
+              format: 'did',
+              description: 'DID to resolve.',
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['didDoc'],
+            properties: {
+              didDoc: {
+                type: 'unknown',
+                description: 'The complete DID document for the identity.',
+              },
+            },
+          },
+        },
+        errors: [
+          {
+            name: 'DidNotFound',
+            description:
+              'The DID resolution process confirmed that there is no current DID.',
+          },
+          {
+            name: 'DidDeactivated',
+            description:
+              'The DID previously existed, but has been deactivated.',
+          },
+        ],
+      },
+    },
+  },
   ComAtprotoIdentityResolveHandle: {
     lexicon: 1,
     id: 'com.atproto.identity.resolveHandle',
     defs: {
       main: {
         type: 'query',
-        description: 'Resolves a handle (domain name) to a DID.',
+        description:
+          'Resolves an atproto handle (hostname) to a DID. Does not necessarily bi-directionally verify against the the DID document.',
         parameters: {
           type: 'params',
           required: ['handle'],
@@ -718,6 +840,59 @@ export const schemaDict = {
             },
           },
         },
+        errors: [
+          {
+            name: 'HandleNotFound',
+            description:
+              'The resolution process confirmed that the handle does not resolve to any DID.',
+          },
+        ],
+      },
+    },
+  },
+  ComAtprotoIdentityResolveIdentity: {
+    lexicon: 1,
+    id: 'com.atproto.identity.resolveIdentity',
+    defs: {
+      main: {
+        type: 'query',
+        description:
+          'Resolves an identity (DID or Handle) to a full identity (DID document and verified handle).',
+        parameters: {
+          type: 'params',
+          required: ['identifier'],
+          properties: {
+            identifier: {
+              type: 'string',
+              format: 'at-identifier',
+              description: 'Handle or DID to resolve.',
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'ref',
+            ref: 'lex:com.atproto.identity.defs#identityInfo',
+          },
+        },
+        errors: [
+          {
+            name: 'HandleNotFound',
+            description:
+              'The resolution process confirmed that the handle does not resolve to any DID.',
+          },
+          {
+            name: 'DidNotFound',
+            description:
+              'The DID resolution process confirmed that there is no current DID.',
+          },
+          {
+            name: 'DidDeactivated',
+            description:
+              'The DID previously existed, but has been deactivated.',
+          },
+        ],
       },
     },
   },
@@ -14394,11 +14569,15 @@ export const ids = {
   ComAtprotoAdminUpdateAccountPassword:
     'com.atproto.admin.updateAccountPassword',
   ComAtprotoAdminUpdateSubjectStatus: 'com.atproto.admin.updateSubjectStatus',
+  ComAtprotoIdentityDefs: 'com.atproto.identity.defs',
   ComAtprotoIdentityGetRecommendedDidCredentials:
     'com.atproto.identity.getRecommendedDidCredentials',
+  ComAtprotoIdentityRefreshIdentity: 'com.atproto.identity.refreshIdentity',
   ComAtprotoIdentityRequestPlcOperationSignature:
     'com.atproto.identity.requestPlcOperationSignature',
+  ComAtprotoIdentityResolveDid: 'com.atproto.identity.resolveDid',
   ComAtprotoIdentityResolveHandle: 'com.atproto.identity.resolveHandle',
+  ComAtprotoIdentityResolveIdentity: 'com.atproto.identity.resolveIdentity',
   ComAtprotoIdentitySignPlcOperation: 'com.atproto.identity.signPlcOperation',
   ComAtprotoIdentitySubmitPlcOperation:
     'com.atproto.identity.submitPlcOperation',
diff --git a/packages/ozone/src/lexicon/types/com/atproto/identity/defs.ts b/packages/ozone/src/lexicon/types/com/atproto/identity/defs.ts
new file mode 100644
index 00000000000..30b400f4fd3
--- /dev/null
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/defs.ts
@@ -0,0 +1,30 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.defs'
+
+export interface IdentityInfo {
+  $type?: 'com.atproto.identity.defs#identityInfo'
+  did: string
+  /** The validated handle of the account; or 'handle.invalid' if the handle did not bi-directionally match the DID document. */
+  handle: string
+  /** The complete DID document for the identity. */
+  didDoc: { [_ in string]: unknown }
+}
+
+const hashIdentityInfo = 'identityInfo'
+
+export function isIdentityInfo<V>(v: V) {
+  return is$typed(v, id, hashIdentityInfo)
+}
+
+export function validateIdentityInfo<V>(v: V) {
+  return validate<IdentityInfo & V>(v, id, hashIdentityInfo)
+}
diff --git a/packages/ozone/src/lexicon/types/com/atproto/identity/refreshIdentity.ts b/packages/ozone/src/lexicon/types/com/atproto/identity/refreshIdentity.ts
new file mode 100644
index 00000000000..8ee156bdbbd
--- /dev/null
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/refreshIdentity.ts
@@ -0,0 +1,52 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+import type * as ComAtprotoIdentityDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.refreshIdentity'
+
+export interface QueryParams {}
+
+export interface InputSchema {
+  identifier: string
+}
+
+export type OutputSchema = ComAtprotoIdentityDefs.IdentityInfo
+
+export interface HandlerInput {
+  encoding: 'application/json'
+  body: InputSchema
+}
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+  error?: 'HandleNotFound' | 'DidNotFound' | 'DidDeactivated'
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+  resetRouteRateLimits: () => Promise<void>
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput
diff --git a/packages/ozone/src/lexicon/types/com/atproto/identity/resolveDid.ts b/packages/ozone/src/lexicon/types/com/atproto/identity/resolveDid.ts
new file mode 100644
index 00000000000..78862549432
--- /dev/null
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/resolveDid.ts
@@ -0,0 +1,52 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.resolveDid'
+
+export interface QueryParams {
+  /** DID to resolve. */
+  did: string
+}
+
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  /** The complete DID document for the identity. */
+  didDoc: { [_ in string]: unknown }
+}
+
+export type HandlerInput = undefined
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+  error?: 'DidNotFound' | 'DidDeactivated'
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+  resetRouteRateLimits: () => Promise<void>
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput
diff --git a/packages/ozone/src/lexicon/types/com/atproto/identity/resolveHandle.ts b/packages/ozone/src/lexicon/types/com/atproto/identity/resolveHandle.ts
index 7c7fd5fe225..935094e5d25 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/identity/resolveHandle.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/resolveHandle.ts
@@ -34,6 +34,7 @@ export interface HandlerSuccess {
 export interface HandlerError {
   status: number
   message?: string
+  error?: 'HandleNotFound'
 }
 
 export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
diff --git a/packages/ozone/src/lexicon/types/com/atproto/identity/resolveIdentity.ts b/packages/ozone/src/lexicon/types/com/atproto/identity/resolveIdentity.ts
new file mode 100644
index 00000000000..2a6b3fbf400
--- /dev/null
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/resolveIdentity.ts
@@ -0,0 +1,48 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+import type * as ComAtprotoIdentityDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.resolveIdentity'
+
+export interface QueryParams {
+  /** Handle or DID to resolve. */
+  identifier: string
+}
+
+export type InputSchema = undefined
+export type OutputSchema = ComAtprotoIdentityDefs.IdentityInfo
+export type HandlerInput = undefined
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+  error?: 'HandleNotFound' | 'DidNotFound' | 'DidDeactivated'
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+  resetRouteRateLimits: () => Promise<void>
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput
diff --git a/packages/pds/src/lexicon/index.ts b/packages/pds/src/lexicon/index.ts
index 028452a5f1e..b9985b5f42e 100644
--- a/packages/pds/src/lexicon/index.ts
+++ b/packages/pds/src/lexicon/index.ts
@@ -24,8 +24,11 @@ import * as ComAtprotoAdminUpdateAccountHandle from './types/com/atproto/admin/u
 import * as ComAtprotoAdminUpdateAccountPassword from './types/com/atproto/admin/updateAccountPassword.js'
 import * as ComAtprotoAdminUpdateSubjectStatus from './types/com/atproto/admin/updateSubjectStatus.js'
 import * as ComAtprotoIdentityGetRecommendedDidCredentials from './types/com/atproto/identity/getRecommendedDidCredentials.js'
+import * as ComAtprotoIdentityRefreshIdentity from './types/com/atproto/identity/refreshIdentity.js'
 import * as ComAtprotoIdentityRequestPlcOperationSignature from './types/com/atproto/identity/requestPlcOperationSignature.js'
+import * as ComAtprotoIdentityResolveDid from './types/com/atproto/identity/resolveDid.js'
 import * as ComAtprotoIdentityResolveHandle from './types/com/atproto/identity/resolveHandle.js'
+import * as ComAtprotoIdentityResolveIdentity from './types/com/atproto/identity/resolveIdentity.js'
 import * as ComAtprotoIdentitySignPlcOperation from './types/com/atproto/identity/signPlcOperation.js'
 import * as ComAtprotoIdentitySubmitPlcOperation from './types/com/atproto/identity/submitPlcOperation.js'
 import * as ComAtprotoIdentityUpdateHandle from './types/com/atproto/identity/updateHandle.js'
@@ -480,6 +483,17 @@ export class ComAtprotoIdentityNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
+  refreshIdentity<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ComAtprotoIdentityRefreshIdentity.Handler<ExtractAuth<AV>>,
+      ComAtprotoIdentityRefreshIdentity.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'com.atproto.identity.refreshIdentity' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   requestPlcOperationSignature<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,
@@ -493,6 +507,17 @@ export class ComAtprotoIdentityNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
+  resolveDid<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ComAtprotoIdentityResolveDid.Handler<ExtractAuth<AV>>,
+      ComAtprotoIdentityResolveDid.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'com.atproto.identity.resolveDid' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   resolveHandle<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,
@@ -504,6 +529,17 @@ export class ComAtprotoIdentityNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
+  resolveIdentity<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ComAtprotoIdentityResolveIdentity.Handler<ExtractAuth<AV>>,
+      ComAtprotoIdentityResolveIdentity.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'com.atproto.identity.resolveIdentity' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   signPlcOperation<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,
diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
index 23b00b79fb5..6463e7c6ec3 100644
--- a/packages/pds/src/lexicon/lexicons.ts
+++ b/packages/pds/src/lexicon/lexicons.ts
@@ -637,6 +637,32 @@ export const schemaDict = {
       },
     },
   },
+  ComAtprotoIdentityDefs: {
+    lexicon: 1,
+    id: 'com.atproto.identity.defs',
+    defs: {
+      identityInfo: {
+        type: 'object',
+        required: ['did', 'handle', 'didDoc'],
+        properties: {
+          did: {
+            type: 'string',
+            format: 'did',
+          },
+          handle: {
+            type: 'string',
+            format: 'handle',
+            description:
+              "The validated handle of the account; or 'handle.invalid' if the handle did not bi-directionally match the DID document.",
+          },
+          didDoc: {
+            type: 'unknown',
+            description: 'The complete DID document for the identity.',
+          },
+        },
+      },
+    },
+  },
   ComAtprotoIdentityGetRecommendedDidCredentials: {
     lexicon: 1,
     id: 'com.atproto.identity.getRecommendedDidCredentials',
@@ -676,6 +702,54 @@ export const schemaDict = {
       },
     },
   },
+  ComAtprotoIdentityRefreshIdentity: {
+    lexicon: 1,
+    id: 'com.atproto.identity.refreshIdentity',
+    defs: {
+      main: {
+        type: 'procedure',
+        description:
+          'Request that the server re-resolve an identity (DID and handle). The server may ignore this request, or require authentication, depending on the role, implementation, and policy of the server.',
+        input: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['identifier'],
+            properties: {
+              identifier: {
+                type: 'string',
+                format: 'at-identifier',
+              },
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'ref',
+            ref: 'lex:com.atproto.identity.defs#identityInfo',
+          },
+        },
+        errors: [
+          {
+            name: 'HandleNotFound',
+            description:
+              'The resolution process confirmed that the handle does not resolve to any DID.',
+          },
+          {
+            name: 'DidNotFound',
+            description:
+              'The DID resolution process confirmed that there is no current DID.',
+          },
+          {
+            name: 'DidDeactivated',
+            description:
+              'The DID previously existed, but has been deactivated.',
+          },
+        ],
+      },
+    },
+  },
   ComAtprotoIdentityRequestPlcOperationSignature: {
     lexicon: 1,
     id: 'com.atproto.identity.requestPlcOperationSignature',
@@ -687,13 +761,61 @@ export const schemaDict = {
       },
     },
   },
+  ComAtprotoIdentityResolveDid: {
+    lexicon: 1,
+    id: 'com.atproto.identity.resolveDid',
+    defs: {
+      main: {
+        type: 'query',
+        description:
+          'Resolves DID to DID document. Does not bi-directionally verify handle.',
+        parameters: {
+          type: 'params',
+          required: ['did'],
+          properties: {
+            did: {
+              type: 'string',
+              format: 'did',
+              description: 'DID to resolve.',
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['didDoc'],
+            properties: {
+              didDoc: {
+                type: 'unknown',
+                description: 'The complete DID document for the identity.',
+              },
+            },
+          },
+        },
+        errors: [
+          {
+            name: 'DidNotFound',
+            description:
+              'The DID resolution process confirmed that there is no current DID.',
+          },
+          {
+            name: 'DidDeactivated',
+            description:
+              'The DID previously existed, but has been deactivated.',
+          },
+        ],
+      },
+    },
+  },
   ComAtprotoIdentityResolveHandle: {
     lexicon: 1,
     id: 'com.atproto.identity.resolveHandle',
     defs: {
       main: {
         type: 'query',
-        description: 'Resolves a handle (domain name) to a DID.',
+        description:
+          'Resolves an atproto handle (hostname) to a DID. Does not necessarily bi-directionally verify against the the DID document.',
         parameters: {
           type: 'params',
           required: ['handle'],
@@ -718,6 +840,59 @@ export const schemaDict = {
             },
           },
         },
+        errors: [
+          {
+            name: 'HandleNotFound',
+            description:
+              'The resolution process confirmed that the handle does not resolve to any DID.',
+          },
+        ],
+      },
+    },
+  },
+  ComAtprotoIdentityResolveIdentity: {
+    lexicon: 1,
+    id: 'com.atproto.identity.resolveIdentity',
+    defs: {
+      main: {
+        type: 'query',
+        description:
+          'Resolves an identity (DID or Handle) to a full identity (DID document and verified handle).',
+        parameters: {
+          type: 'params',
+          required: ['identifier'],
+          properties: {
+            identifier: {
+              type: 'string',
+              format: 'at-identifier',
+              description: 'Handle or DID to resolve.',
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'ref',
+            ref: 'lex:com.atproto.identity.defs#identityInfo',
+          },
+        },
+        errors: [
+          {
+            name: 'HandleNotFound',
+            description:
+              'The resolution process confirmed that the handle does not resolve to any DID.',
+          },
+          {
+            name: 'DidNotFound',
+            description:
+              'The DID resolution process confirmed that there is no current DID.',
+          },
+          {
+            name: 'DidDeactivated',
+            description:
+              'The DID previously existed, but has been deactivated.',
+          },
+        ],
       },
     },
   },
@@ -14394,11 +14569,15 @@ export const ids = {
   ComAtprotoAdminUpdateAccountPassword:
     'com.atproto.admin.updateAccountPassword',
   ComAtprotoAdminUpdateSubjectStatus: 'com.atproto.admin.updateSubjectStatus',
+  ComAtprotoIdentityDefs: 'com.atproto.identity.defs',
   ComAtprotoIdentityGetRecommendedDidCredentials:
     'com.atproto.identity.getRecommendedDidCredentials',
+  ComAtprotoIdentityRefreshIdentity: 'com.atproto.identity.refreshIdentity',
   ComAtprotoIdentityRequestPlcOperationSignature:
     'com.atproto.identity.requestPlcOperationSignature',
+  ComAtprotoIdentityResolveDid: 'com.atproto.identity.resolveDid',
   ComAtprotoIdentityResolveHandle: 'com.atproto.identity.resolveHandle',
+  ComAtprotoIdentityResolveIdentity: 'com.atproto.identity.resolveIdentity',
   ComAtprotoIdentitySignPlcOperation: 'com.atproto.identity.signPlcOperation',
   ComAtprotoIdentitySubmitPlcOperation:
     'com.atproto.identity.submitPlcOperation',
diff --git a/packages/pds/src/lexicon/types/com/atproto/identity/defs.ts b/packages/pds/src/lexicon/types/com/atproto/identity/defs.ts
new file mode 100644
index 00000000000..30b400f4fd3
--- /dev/null
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/defs.ts
@@ -0,0 +1,30 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.defs'
+
+export interface IdentityInfo {
+  $type?: 'com.atproto.identity.defs#identityInfo'
+  did: string
+  /** The validated handle of the account; or 'handle.invalid' if the handle did not bi-directionally match the DID document. */
+  handle: string
+  /** The complete DID document for the identity. */
+  didDoc: { [_ in string]: unknown }
+}
+
+const hashIdentityInfo = 'identityInfo'
+
+export function isIdentityInfo<V>(v: V) {
+  return is$typed(v, id, hashIdentityInfo)
+}
+
+export function validateIdentityInfo<V>(v: V) {
+  return validate<IdentityInfo & V>(v, id, hashIdentityInfo)
+}
diff --git a/packages/pds/src/lexicon/types/com/atproto/identity/refreshIdentity.ts b/packages/pds/src/lexicon/types/com/atproto/identity/refreshIdentity.ts
new file mode 100644
index 00000000000..8ee156bdbbd
--- /dev/null
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/refreshIdentity.ts
@@ -0,0 +1,52 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+import type * as ComAtprotoIdentityDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.refreshIdentity'
+
+export interface QueryParams {}
+
+export interface InputSchema {
+  identifier: string
+}
+
+export type OutputSchema = ComAtprotoIdentityDefs.IdentityInfo
+
+export interface HandlerInput {
+  encoding: 'application/json'
+  body: InputSchema
+}
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+  error?: 'HandleNotFound' | 'DidNotFound' | 'DidDeactivated'
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+  resetRouteRateLimits: () => Promise<void>
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput
diff --git a/packages/pds/src/lexicon/types/com/atproto/identity/resolveDid.ts b/packages/pds/src/lexicon/types/com/atproto/identity/resolveDid.ts
new file mode 100644
index 00000000000..78862549432
--- /dev/null
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/resolveDid.ts
@@ -0,0 +1,52 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.resolveDid'
+
+export interface QueryParams {
+  /** DID to resolve. */
+  did: string
+}
+
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  /** The complete DID document for the identity. */
+  didDoc: { [_ in string]: unknown }
+}
+
+export type HandlerInput = undefined
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+  error?: 'DidNotFound' | 'DidDeactivated'
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+  resetRouteRateLimits: () => Promise<void>
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput
diff --git a/packages/pds/src/lexicon/types/com/atproto/identity/resolveHandle.ts b/packages/pds/src/lexicon/types/com/atproto/identity/resolveHandle.ts
index 7c7fd5fe225..935094e5d25 100644
--- a/packages/pds/src/lexicon/types/com/atproto/identity/resolveHandle.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/resolveHandle.ts
@@ -34,6 +34,7 @@ export interface HandlerSuccess {
 export interface HandlerError {
   status: number
   message?: string
+  error?: 'HandleNotFound'
 }
 
 export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
diff --git a/packages/pds/src/lexicon/types/com/atproto/identity/resolveIdentity.ts b/packages/pds/src/lexicon/types/com/atproto/identity/resolveIdentity.ts
new file mode 100644
index 00000000000..2a6b3fbf400
--- /dev/null
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/resolveIdentity.ts
@@ -0,0 +1,48 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import { $Typed, is$typed as _is$typed, OmitKey } from '../../../../util'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+import type * as ComAtprotoIdentityDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.identity.resolveIdentity'
+
+export interface QueryParams {
+  /** Handle or DID to resolve. */
+  identifier: string
+}
+
+export type InputSchema = undefined
+export type OutputSchema = ComAtprotoIdentityDefs.IdentityInfo
+export type HandlerInput = undefined
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+  error?: 'HandleNotFound' | 'DidNotFound' | 'DidDeactivated'
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+  resetRouteRateLimits: () => Promise<void>
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput